ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

crypt32: Allow messages to be opened when compiled with CMSG_SIGNER_ENCODE_INFO_HAS_CMS_FIELDS if CMS fields aren't actually used.

Browse Source
This commit is contained in:
Juan Lang 2008-08-14 17:19:19 -07:00 committed by Alexandre Julliard
parent 9b953c5f1e
commit 427b3fbd5d
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/crypt32/msg.c
View File

@ -632,11 +632,6 @@ static BOOL CRYPT_IsValidSigner(CMSG_SIGNER_ENCODE_INFO_WITH_CMS *signer)
SetLastError(E_INVALIDARG); SetLastError(E_INVALIDARG);
return FALSE; 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) if (!signer->pCertInfo->SerialNumber.cbData)
{ {
SetLastError(E_INVALIDARG); SetLastError(E_INVALIDARG);
@ -657,6 +652,19 @@ static BOOL CRYPT_IsValidSigner(CMSG_SIGNER_ENCODE_INFO_WITH_CMS *signer)
SetLastError(CRYPT_E_UNKNOWN_ALGO); SetLastError(CRYPT_E_UNKNOWN_ALGO);
return FALSE; 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; return TRUE;
} }

1
dlls/crypt32/tests/msg.c
View File

@ -23,6 +23,7 @@
#include <windef.h> #include <windef.h>
#include <winbase.h> #include <winbase.h>
#include <winerror.h> #include <winerror.h>
#define CMSG_SIGNER_ENCODE_INFO_HAS_CMS_FIELDS
#include <wincrypt.h> #include <wincrypt.h>
#include "wine/test.h" #include "wine/test.h"