crypt32: Allow messages to be opened when compiled with CMSG_SIGNER_ENCODE_INFO_HAS_CMS_FIELDS if CMS fields aren't actually used.
This commit is contained in:
parent
9b953c5f1e
commit
427b3fbd5d
|
@ -632,11 +632,6 @@ static BOOL CRYPT_IsValidSigner(CMSG_SIGNER_ENCODE_INFO_WITH_CMS *signer)
|
|||
SetLastError(E_INVALIDARG);
|
||||
return FALSE;
|
||||
}
|
||||
if (signer->cbSize == sizeof(CMSG_SIGNER_ENCODE_INFO_WITH_CMS))
|
||||
{
|
||||
FIXME("CMSG_SIGNER_ENCODE_INFO with CMS fields unsupported\n");
|
||||
return FALSE;
|
||||
}
|
||||
if (!signer->pCertInfo->SerialNumber.cbData)
|
||||
{
|
||||
SetLastError(E_INVALIDARG);
|
||||
|
@ -657,6 +652,19 @@ static BOOL CRYPT_IsValidSigner(CMSG_SIGNER_ENCODE_INFO_WITH_CMS *signer)
|
|||
SetLastError(CRYPT_E_UNKNOWN_ALGO);
|
||||
return FALSE;
|
||||
}
|
||||
if (signer->cbSize == sizeof(CMSG_SIGNER_ENCODE_INFO_WITH_CMS))
|
||||
{
|
||||
if (signer->SignerId.dwIdChoice)
|
||||
{
|
||||
FIXME("CMSG_SIGNER_ENCODE_INFO with CMS fields unsupported\n");
|
||||
return FALSE;
|
||||
}
|
||||
if (signer->HashEncryptionAlgorithm.pszObjId)
|
||||
{
|
||||
FIXME("CMSG_SIGNER_ENCODE_INFO with CMS fields unsupported\n");
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
#include <windef.h>
|
||||
#include <winbase.h>
|
||||
#include <winerror.h>
|
||||
#define CMSG_SIGNER_ENCODE_INFO_HAS_CMS_FIELDS
|
||||
#include <wincrypt.h>
|
||||
|
||||
#include "wine/test.h"
|
||||
|
|
Loading…
Reference in New Issue