August 2008 - Wine-commits - list.winehq.org

Juan Lang : crypt32: Remove an unneeded helper.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: a36d8ce61160dd7895b1441b2ba6e1997132a0d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a36d8ce61160dd7895b1441b2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 20 12:07:29 2008 -0700 crypt32: Remove an unneeded helper. --- dlls/crypt32/msg.c | 21 ++------------------- 1 files changed, 2 insertions(+), 19 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 6c59845..8ac4b14 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1424,23 +1424,6 @@ static HCRYPTMSG CSignedEncodeMsg_Open(DWORD dwFlags, return msg; } -static inline const char *MSG_TYPE_STR(DWORD type) -{ - switch (type) - { -#define _x(x) case (x): return #x - _x(CMSG_DATA); - _x(CMSG_SIGNED); - _x(CMSG_ENVELOPED); - _x(CMSG_SIGNED_AND_ENVELOPED); - _x(CMSG_HASHED); - _x(CMSG_ENCRYPTED); -#undef _x - default: - return wine_dbg_sprintf("unknown (%d)", type); - } -} - HCRYPTMSG WINAPI CryptMsgOpenToEncode(DWORD dwMsgEncodingType, DWORD dwFlags, DWORD dwMsgType, const void *pvMsgEncodeInfo, LPSTR pszInnerContentObjID, PCMSG_STREAM_INFO pStreamInfo) @@ -1470,7 +1453,7 @@ HCRYPTMSG WINAPI CryptMsgOpenToEncode(DWORD dwMsgEncodingType, DWORD dwFlags, pszInnerContentObjID, pStreamInfo); break; case CMSG_ENVELOPED: - FIXME("unimplemented for type %s\n", MSG_TYPE_STR(dwMsgType)); + FIXME("unimplemented for type CMSG_ENVELOPED\n"); break; case CMSG_SIGNED_AND_ENVELOPED: case CMSG_ENCRYPTED: @@ -1720,7 +1703,7 @@ static BOOL CDecodeMsg_DecodeContent(CDecodeMsg *msg, CRYPT_DER_BLOB *blob, msg->type = CMSG_HASHED; break; case CMSG_ENVELOPED: - FIXME("unimplemented for type %s\n", MSG_TYPE_STR(type)); + FIXME("unimplemented for type CMSG_ENVELOPED\n"); ret = TRUE; break; case CMSG_SIGNED:

1 0

Juan Lang : crypt32: Reduce excessive indenting.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: a203640b5a44aad7b8fbf35db32d6e738faddd72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a203640b5a44aad7b8fbf35db… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 20 12:10:27 2008 -0700 crypt32: Reduce excessive indenting. --- dlls/crypt32/message.c | 87 ++++++++++++++++++++++------------------------- 1 files changed, 41 insertions(+), 46 deletions(-) diff --git a/dlls/crypt32/message.c b/dlls/crypt32/message.c index fe4d4ec..2aeb3cf 100644 --- a/dlls/crypt32/message.c +++ b/dlls/crypt32/message.c @@ -131,6 +131,7 @@ BOOL WINAPI CryptVerifyMessageSignature(PCRYPT_VERIFY_MESSAGE_PARA pVerifyPara, BOOL ret = FALSE; DWORD size; CRYPT_CONTENT_INFO *contentInfo; + HCRYPTMSG msg; TRACE("(%p, %d, %p, %d, %p, %p, %p)\n", pVerifyPara, dwSignerIndex, pbSignedBlob, cbSignedBlob, @@ -149,66 +150,60 @@ BOOL WINAPI CryptVerifyMessageSignature(PCRYPT_VERIFY_MESSAGE_PARA pVerifyPara, return FALSE; } - ret = CryptDecodeObjectEx(pVerifyPara->dwMsgAndCertEncodingType, + if (!CryptDecodeObjectEx(pVerifyPara->dwMsgAndCertEncodingType, PKCS_CONTENT_INFO, pbSignedBlob, cbSignedBlob, CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_NOCOPY_FLAG, NULL, - (LPBYTE)&contentInfo, &size); - if (ret) + (LPBYTE)&contentInfo, &size)) + return FALSE; + if (strcmp(contentInfo->pszObjId, szOID_RSA_signedData)) { - if (strcmp(contentInfo->pszObjId, szOID_RSA_signedData)) - { - SetLastError(CRYPT_E_UNEXPECTED_MSG_TYPE); - ret = FALSE; - } - else + LocalFree(contentInfo); + SetLastError(CRYPT_E_UNEXPECTED_MSG_TYPE); + return FALSE; + } + msg = CryptMsgOpenToDecode(pVerifyPara->dwMsgAndCertEncodingType, 0, + CMSG_SIGNED, pVerifyPara->hCryptProv, NULL, NULL); + if (msg) + { + ret = CryptMsgUpdate(msg, contentInfo->Content.pbData, + contentInfo->Content.cbData, TRUE); + if (ret && pcbDecoded) + ret = CRYPT_CopyParam(pbDecoded, pcbDecoded, + contentInfo->Content.pbData, contentInfo->Content.cbData); + if (ret) { - HCRYPTMSG msg = CryptMsgOpenToDecode( - pVerifyPara->dwMsgAndCertEncodingType, 0, CMSG_SIGNED, - pVerifyPara->hCryptProv, NULL, NULL); + CERT_INFO *certInfo = CRYPT_GetSignerCertInfoFromMsg(msg, + dwSignerIndex); - if (msg) + ret = FALSE; + if (certInfo) { - ret = CryptMsgUpdate(msg, contentInfo->Content.pbData, - contentInfo->Content.cbData, TRUE); - if (ret && pcbDecoded) - ret = CRYPT_CopyParam(pbDecoded, pcbDecoded, - contentInfo->Content.pbData, contentInfo->Content.cbData); - if (ret) + HCERTSTORE store = CertOpenStore(CERT_STORE_PROV_MSG, + pVerifyPara->dwMsgAndCertEncodingType, + pVerifyPara->hCryptProv, 0, msg); + + if (store) { - CERT_INFO *certInfo = CRYPT_GetSignerCertInfoFromMsg(msg, - dwSignerIndex); + PCCERT_CONTEXT cert = CRYPT_GetSignerCertificate( + msg, pVerifyPara, certInfo, store); - ret = FALSE; - if (certInfo) + if (cert) { - HCERTSTORE store = CertOpenStore(CERT_STORE_PROV_MSG, - pVerifyPara->dwMsgAndCertEncodingType, - pVerifyPara->hCryptProv, 0, msg); - - if (store) - { - PCCERT_CONTEXT cert = CRYPT_GetSignerCertificate( - msg, pVerifyPara, certInfo, store); - - if (cert) - { - ret = CryptMsgControl(msg, 0, - CMSG_CTRL_VERIFY_SIGNATURE, cert->pCertInfo); - if (ret && ppSignerCert) - *ppSignerCert = cert; - else - CertFreeCertificateContext(cert); - } - CertCloseStore(store, 0); - } + ret = CryptMsgControl(msg, 0, + CMSG_CTRL_VERIFY_SIGNATURE, cert->pCertInfo); + if (ret && ppSignerCert) + *ppSignerCert = cert; + else + CertFreeCertificateContext(cert); } - CryptMemFree(certInfo); + CertCloseStore(store, 0); } - CryptMsgClose(msg); } + CryptMemFree(certInfo); } - LocalFree(contentInfo); + CryptMsgClose(msg); } + LocalFree(contentInfo); TRACE("returning %d\n", ret); return ret; }

1 0

Juan Lang : crypt32: Add tests for encoding/ decoding PKCS_SMIME_CAPABILITIES. With help from Huw Davies.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: 70744f07d11d09114b66d67f29ed5463f888e135 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70744f07d11d09114b66d67f2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 20 12:10:57 2008 -0700 crypt32: Add tests for encoding/decoding PKCS_SMIME_CAPABILITIES. With help from Huw Davies. --- dlls/crypt32/tests/encode.c | 166 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 166 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 28542aa..efb72f3 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -5160,6 +5160,170 @@ static void test_decodePKCSAttributes(DWORD dwEncoding) } } +static const BYTE singleCapability[] = { +0x30,0x06,0x30,0x04,0x06,0x02,0x2d,0x06 }; +static const BYTE twoCapabilities[] = { +0x30,0x0c,0x30,0x04,0x06,0x02,0x2d,0x06,0x30,0x04,0x06,0x02,0x2a,0x03 }; +static const BYTE singleCapabilitywithNULL[] = { +0x30,0x08,0x30,0x06,0x06,0x02,0x2d,0x06,0x05,0x00 }; + +static void test_encodePKCSSMimeCapabilities(DWORD dwEncoding) +{ + static char oid1[] = "1.5.6", oid2[] = "1.2.3"; + BOOL ret; + LPBYTE buf = NULL; + DWORD size = 0; + CRYPT_SMIME_CAPABILITY capability[2]; + CRYPT_SMIME_CAPABILITIES capabilities; + + /* An empty capabilities is allowed */ + capabilities.cCapability = 0; + ret = CryptEncodeObjectEx(dwEncoding, PKCS_SMIME_CAPABILITIES, + &capabilities, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + todo_wine + ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + if (buf) + { + ok(size == sizeof(emptySequence), "unexpected size %d\n", size); + ok(!memcmp(buf, emptySequence, size), "unexpected value\n"); + LocalFree(buf); + } + /* A non-empty capabilities with an empty capability (lacking an OID) is + * not allowed + */ + capability[0].pszObjId = NULL; + capability[0].Parameters.cbData = 0; + capabilities.cCapability = 1; + capabilities.rgCapability = capability; + SetLastError(0xdeadbeef); + ret = CryptEncodeObjectEx(dwEncoding, PKCS_SMIME_CAPABILITIES, + &capabilities, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + todo_wine + ok(!ret && GetLastError() == E_INVALIDARG, + "expected E_INVALIDARG, got %08x\n", GetLastError()); + capability[0].pszObjId = oid1; + ret = CryptEncodeObjectEx(dwEncoding, PKCS_SMIME_CAPABILITIES, + &capabilities, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + todo_wine + ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + if (buf) + { + ok(size == sizeof(singleCapability), "unexpected size %d\n", size); + ok(!memcmp(buf, singleCapability, size), "unexpected value\n"); + LocalFree(buf); + } + capability[1].pszObjId = oid2; + capability[1].Parameters.cbData = 0; + capabilities.cCapability = 2; + ret = CryptEncodeObjectEx(dwEncoding, PKCS_SMIME_CAPABILITIES, + &capabilities, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + todo_wine + ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + if (buf) + { + ok(size == sizeof(twoCapabilities), "unexpected size %d\n", size); + ok(!memcmp(buf, twoCapabilities, size), "unexpected value\n"); + LocalFree(buf); + } +} + +static void compareSMimeCapabilities(LPCSTR header, + const CRYPT_SMIME_CAPABILITIES *expected, const CRYPT_SMIME_CAPABILITIES *got) +{ + DWORD i; + + ok(got->cCapability == expected->cCapability, + "%s: expected %d capabilities, got %d\n", header, expected->cCapability, + got->cCapability); + for (i = 0; i < expected->cCapability; i++) + { + ok(!strcmp(expected->rgCapability[i].pszObjId, + got->rgCapability[i].pszObjId), "%s[%d]: expected %s, got %s\n", + header, i, expected->rgCapability[i].pszObjId, + got->rgCapability[i].pszObjId); + ok(expected->rgCapability[i].Parameters.cbData == + got->rgCapability[i].Parameters.cbData, + "%s[%d]: expected %d bytes, got %d\n", header, i, + expected->rgCapability[i].Parameters.cbData, + got->rgCapability[i].Parameters.cbData); + if (expected->rgCapability[i].Parameters.cbData) + ok(!memcmp(expected->rgCapability[i].Parameters.pbData, + got->rgCapability[i].Parameters.pbData, + expected->rgCapability[i].Parameters.cbData), + "%s[%d]: unexpected value\n", header, i); + } +} + +static void test_decodePKCSSMimeCapabilities(DWORD dwEncoding) +{ + static char oid1[] = "1.5.6", oid2[] = "1.2.3"; + BOOL ret; + DWORD size = 0; + CRYPT_SMIME_CAPABILITY capability[2]; + CRYPT_SMIME_CAPABILITIES capabilities, *ptr; + + SetLastError(0xdeadbeef); + ret = CryptDecodeObjectEx(dwEncoding, PKCS_SMIME_CAPABILITIES, + emptySequence, sizeof(emptySequence), + CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&ptr, &size); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + capabilities.cCapability = 0; + compareSMimeCapabilities("empty capabilities", &capabilities, ptr); + LocalFree(ptr); + } + SetLastError(0xdeadbeef); + ret = CryptDecodeObjectEx(dwEncoding, PKCS_SMIME_CAPABILITIES, + singleCapability, sizeof(singleCapability), CRYPT_DECODE_ALLOC_FLAG, NULL, + (BYTE *)&ptr, &size); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + capability[0].pszObjId = oid1; + capability[0].Parameters.cbData = 0; + capabilities.cCapability = 1; + capabilities.rgCapability = capability; + compareSMimeCapabilities("single capability", &capabilities, ptr); + LocalFree(ptr); + } + SetLastError(0xdeadbeef); + ret = CryptDecodeObjectEx(dwEncoding, PKCS_SMIME_CAPABILITIES, + singleCapabilitywithNULL, sizeof(singleCapabilitywithNULL), + CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&ptr, &size); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + BYTE NULLparam[] = {0x05, 0x00}; + capability[0].pszObjId = oid1; + capability[0].Parameters.cbData = 2; + capability[0].Parameters.pbData = NULLparam; + capabilities.cCapability = 1; + capabilities.rgCapability = capability; + compareSMimeCapabilities("single capability with NULL", &capabilities, + ptr); + LocalFree(ptr); + } + SetLastError(0xdeadbeef); + ret = CryptDecodeObjectEx(dwEncoding, PKCS_SMIME_CAPABILITIES, + twoCapabilities, sizeof(twoCapabilities), CRYPT_DECODE_ALLOC_FLAG, NULL, + (BYTE *)&ptr, &size); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + capability[0].Parameters.cbData = 0; + capability[1].pszObjId = oid2; + capability[1].Parameters.cbData = 0; + capabilities.cCapability = 2; + compareSMimeCapabilities("two capabilities", &capabilities, ptr); + LocalFree(ptr); + } +} + static BYTE encodedCommonNameNoNull[] = { 0x30,0x14,0x31,0x12,0x30,0x10, 0x06,0x03,0x55,0x04,0x03,0x13,0x09,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e, 0x67 }; @@ -6283,6 +6447,8 @@ START_TEST(encode) test_decodePKCSAttribute(encodings[i]); test_encodePKCSAttributes(encodings[i]); test_decodePKCSAttributes(encodings[i]); + test_encodePKCSSMimeCapabilities(encodings[i]); + test_decodePKCSSMimeCapabilities(encodings[i]); test_encodePKCSSignerInfo(encodings[i]); test_decodePKCSSignerInfo(encodings[i]); test_encodeCMSSignerInfo(encodings[i]);

1 0

Juan Lang : crypt32: Add support for encoding PKCS_SMIME_CAPABILITIES.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: db6c8e23b6abc13dafcaeae001203d51c9288a76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db6c8e23b6abc13dafcaeae00… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 20 12:11:15 2008 -0700 crypt32: Add support for encoding PKCS_SMIME_CAPABILITIES. --- dlls/crypt32/encode.c | 95 +++++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/encode.c | 4 -- 2 files changed, 95 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 5658ba2..c935396 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -1404,6 +1404,96 @@ static BOOL WINAPI CRYPT_AsnEncodeUnicodeName(DWORD dwCertEncodingType, return ret; } +static BOOL WINAPI CRYPT_AsnEncodeSMIMECapability(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, + PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) +{ + BOOL ret = FALSE; + + __TRY + { + const CRYPT_SMIME_CAPABILITY *capability = + (const CRYPT_SMIME_CAPABILITY *)pvStructInfo; + + if (!capability->pszObjId) + SetLastError(E_INVALIDARG); + else + { + struct AsnEncodeSequenceItem items[] = { + { capability->pszObjId, CRYPT_AsnEncodeOid, 0 }, + { &capability->Parameters, CRYPT_CopyEncodedBlob, 0 }, + }; + + ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, + sizeof(items) / sizeof(items[0]), dwFlags, pEncodePara, pbEncoded, + pcbEncoded); + } + } + __EXCEPT_PAGE_FAULT + { + SetLastError(STATUS_ACCESS_VIOLATION); + } + __ENDTRY + return ret; +} + +static BOOL WINAPI CRYPT_AsnEncodeSMIMECapabilities(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, + PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) +{ + BOOL ret = FALSE; + + __TRY + { + DWORD bytesNeeded, dataLen, lenBytes, i; + const CRYPT_SMIME_CAPABILITIES *capabilities = + (const CRYPT_SMIME_CAPABILITIES *)pvStructInfo; + + ret = TRUE; + for (i = 0, dataLen = 0; ret && i < capabilities->cCapability; i++) + { + DWORD size; + + ret = CRYPT_AsnEncodeSMIMECapability(dwCertEncodingType, NULL, + &capabilities->rgCapability[i], 0, NULL, NULL, &size); + if (ret) + dataLen += size; + } + CRYPT_EncodeLen(dataLen, NULL, &lenBytes); + bytesNeeded = 1 + lenBytes + dataLen; + if (!pbEncoded) + *pcbEncoded = bytesNeeded; + else + { + if ((ret = CRYPT_EncodeEnsureSpace(dwFlags, pEncodePara, pbEncoded, + pcbEncoded, bytesNeeded))) + { + if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG) + pbEncoded = *(BYTE **)pbEncoded; + *pbEncoded++ = ASN_SEQUENCEOF; + CRYPT_EncodeLen(dataLen, pbEncoded, &lenBytes); + pbEncoded += lenBytes; + for (i = 0; i < capabilities->cCapability; i++) + { + DWORD size = dataLen; + + ret = CRYPT_AsnEncodeSMIMECapability(dwCertEncodingType, + NULL, &capabilities->rgCapability[i], 0, NULL, pbEncoded, + &size); + pbEncoded += size; + dataLen -= size; + } + } + } + } + __EXCEPT_PAGE_FAULT + { + SetLastError(STATUS_ACCESS_VIOLATION); + } + __ENDTRY + return ret; +} + static BOOL WINAPI CRYPT_AsnEncodePKCSAttribute(DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) @@ -3684,6 +3774,9 @@ static CryptEncodeObjectExFunc CRYPT_GetBuiltinEncoder(DWORD dwCertEncodingType, case LOWORD(X509_ENHANCED_KEY_USAGE): encodeFunc = CRYPT_AsnEncodeEnhancedKeyUsage; break; + case LOWORD(PKCS_SMIME_CAPABILITIES): + encodeFunc = CRYPT_AsnEncodeSMIMECapabilities; + break; case LOWORD(PKCS_ATTRIBUTES): encodeFunc = CRYPT_AsnEncodePKCSAttributes; break; @@ -3705,6 +3798,8 @@ static CryptEncodeObjectExFunc CRYPT_GetBuiltinEncoder(DWORD dwCertEncodingType, encodeFunc = CRYPT_AsnEncodeExtensions; else if (!strcmp(lpszStructType, szOID_RSA_signingTime)) encodeFunc = CRYPT_AsnEncodeUtcTime; + else if (!strcmp(lpszStructType, szOID_RSA_SMIMECapabilities)) + encodeFunc = CRYPT_AsnEncodeUtcTime; else if (!strcmp(lpszStructType, szOID_AUTHORITY_KEY_IDENTIFIER)) encodeFunc = CRYPT_AsnEncodeAuthorityKeyId; else if (!strcmp(lpszStructType, szOID_AUTHORITY_KEY_IDENTIFIER2)) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index efb72f3..9214609 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -5180,7 +5180,6 @@ static void test_encodePKCSSMimeCapabilities(DWORD dwEncoding) capabilities.cCapability = 0; ret = CryptEncodeObjectEx(dwEncoding, PKCS_SMIME_CAPABILITIES, &capabilities, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); - todo_wine ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); if (buf) { @@ -5198,13 +5197,11 @@ static void test_encodePKCSSMimeCapabilities(DWORD dwEncoding) SetLastError(0xdeadbeef); ret = CryptEncodeObjectEx(dwEncoding, PKCS_SMIME_CAPABILITIES, &capabilities, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", GetLastError()); capability[0].pszObjId = oid1; ret = CryptEncodeObjectEx(dwEncoding, PKCS_SMIME_CAPABILITIES, &capabilities, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); - todo_wine ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); if (buf) { @@ -5217,7 +5214,6 @@ static void test_encodePKCSSMimeCapabilities(DWORD dwEncoding) capabilities.cCapability = 2; ret = CryptEncodeObjectEx(dwEncoding, PKCS_SMIME_CAPABILITIES, &capabilities, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); - todo_wine ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); if (buf) {

1 0

Juan Lang : crypt32: Implement CMSG_CMS_SIGNER_INFO_PARAM.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: 57a85f0d6bf99eb7043d66bf5d307c266d579258 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57a85f0d6bf99eb7043d66bf5… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 20 12:02:02 2008 -0700 crypt32: Implement CMSG_CMS_SIGNER_INFO_PARAM. --- dlls/crypt32/msg.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/msg.c | 2 - 2 files changed, 82 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 1740135..44e8a1f 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -2047,6 +2047,76 @@ static BOOL CRYPT_CopySignerInfo(void *pvData, DWORD *pcbData, return ret; } +static BOOL CRYPT_CopyCMSSignerInfo(void *pvData, DWORD *pcbData, + const CMSG_CMS_SIGNER_INFO *in) +{ + DWORD size = sizeof(CMSG_CMS_SIGNER_INFO); + BOOL ret; + + TRACE("(%p, %d, %p)\n", pvData, pvData ? *pcbData : 0, in); + + if (in->SignerId.dwIdChoice == CERT_ID_ISSUER_SERIAL_NUMBER) + { + size += in->SignerId.IssuerSerialNumber.Issuer.cbData; + size += in->SignerId.IssuerSerialNumber.SerialNumber.cbData; + } + else + size += in->SignerId.KeyId.cbData; + if (in->HashAlgorithm.pszObjId) + size += strlen(in->HashAlgorithm.pszObjId) + 1; + size += in->HashAlgorithm.Parameters.cbData; + if (in->HashEncryptionAlgorithm.pszObjId) + size += strlen(in->HashEncryptionAlgorithm.pszObjId) + 1; + size += in->HashEncryptionAlgorithm.Parameters.cbData; + size += in->EncryptedHash.cbData; + /* align pointer */ + if (size % sizeof(DWORD_PTR)) + size += size % sizeof(DWORD_PTR); + size += CRYPT_SizeOfAttributes(&in->AuthAttrs); + size += CRYPT_SizeOfAttributes(&in->UnauthAttrs); + if (!pvData) + { + *pcbData = size; + ret = TRUE; + } + else if (*pcbData < size) + { + *pcbData = size; + SetLastError(ERROR_MORE_DATA); + ret = FALSE; + } + else + { + LPBYTE nextData = (BYTE *)pvData + sizeof(CMSG_CMS_SIGNER_INFO); + CMSG_CMS_SIGNER_INFO *out = (CMSG_CMS_SIGNER_INFO *)pvData; + + out->dwVersion = in->dwVersion; + out->SignerId.dwIdChoice = in->SignerId.dwIdChoice; + if (in->SignerId.dwIdChoice == CERT_ID_ISSUER_SERIAL_NUMBER) + { + CRYPT_CopyBlob(&out->SignerId.IssuerSerialNumber.Issuer, + &in->SignerId.IssuerSerialNumber.Issuer, &nextData); + CRYPT_CopyBlob(&out->SignerId.IssuerSerialNumber.SerialNumber, + &in->SignerId.IssuerSerialNumber.SerialNumber, &nextData); + } + else + CRYPT_CopyBlob(&out->SignerId.KeyId, &in->SignerId.KeyId, &nextData); + CRYPT_CopyAlgorithmId(&out->HashAlgorithm, &in->HashAlgorithm, + &nextData); + CRYPT_CopyAlgorithmId(&out->HashEncryptionAlgorithm, + &in->HashEncryptionAlgorithm, &nextData); + CRYPT_CopyBlob(&out->EncryptedHash, &in->EncryptedHash, &nextData); + /* align pointer */ + if ((nextData - (LPBYTE)0) % sizeof(DWORD_PTR)) + nextData += (nextData - (LPBYTE)0) % sizeof(DWORD_PTR); + CRYPT_CopyAttributes(&out->AuthAttrs, &in->AuthAttrs, &nextData); + CRYPT_CopyAttributes(&out->UnauthAttrs, &in->UnauthAttrs, &nextData); + ret = TRUE; + } + TRACE("returning %d\n", ret); + return ret; +} + static BOOL CRYPT_CopySignerCertInfo(void *pvData, DWORD *pcbData, const CMSG_CMS_SIGNER_INFO *in) { @@ -2239,6 +2309,18 @@ static BOOL CDecodeSignedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType, else SetLastError(CRYPT_E_INVALID_MSG_TYPE); break; + case CMSG_CMS_SIGNER_INFO_PARAM: + if (msg->u.signed_data.info) + { + if (dwIndex >= msg->u.signed_data.info->cSignerInfo) + SetLastError(CRYPT_E_INVALID_INDEX); + else + ret = CRYPT_CopyCMSSignerInfo(pvData, pcbData, + &msg->u.signed_data.info->rgSignerInfo[dwIndex]); + } + else + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + break; default: FIXME("unimplemented for %d\n", dwParamType); SetLastError(CRYPT_E_INVALID_MSG_TYPE); diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 4b080ee..8df7c69 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -2404,7 +2404,6 @@ static void test_decode_msg_get_param(void) /* Getting the CMS signer info of a PKCS7 message is possible. */ size = 0; ret = CryptMsgGetParam(msg, CMSG_CMS_SIGNER_INFO_PARAM, 0, NULL, &size); - todo_wine ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); if (ret) buf = CryptMemAlloc(size); @@ -2498,7 +2497,6 @@ static void test_decode_msg_get_param(void) } size = 0; ret = CryptMsgGetParam(msg, CMSG_CMS_SIGNER_INFO_PARAM, 0, NULL, &size); - todo_wine ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); if (ret) buf = CryptMemAlloc(size);

1 0

Juan Lang : crypt32: Support the KeyId type of signer in CMSG_SIGNER_INFO_PARAM.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: 51b16fb85724c783f1afc109fc0e387a006315dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=51b16fb85724c783f1afc109f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 20 12:02:25 2008 -0700 crypt32: Support the KeyId type of signer in CMSG_SIGNER_INFO_PARAM. --- dlls/crypt32/msg.c | 82 ++++++++++++++++++++++++++++++++++++++-------- dlls/crypt32/tests/msg.c | 1 - 2 files changed, 68 insertions(+), 15 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 44e8a1f..0ec75af 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1977,10 +1977,58 @@ static DWORD CRYPT_SizeOfAttributes(const CRYPT_ATTRIBUTES *attr) return size; } +static DWORD CRYPT_SizeOfKeyIdAsIssuerAndSerial(const CRYPT_DATA_BLOB *keyId) +{ + static char oid_key_rdn[] = szOID_KEYID_RDN; + DWORD size = 0; + CERT_RDN_ATTR attr; + CERT_RDN rdn = { 1, &attr }; + CERT_NAME_INFO name = { 1, &rdn }; + + attr.pszObjId = oid_key_rdn; + attr.dwValueType = CERT_RDN_OCTET_STRING; + attr.Value.cbData = keyId->cbData; + attr.Value.pbData = keyId->pbData; + if (CryptEncodeObject(X509_ASN_ENCODING, X509_NAME, &name, NULL, &size)) + size++; /* Only include size of special zero serial number on success */ + return size; +} + +static BOOL CRYPT_CopyKeyIdAsIssuerAndSerial(CERT_NAME_BLOB *issuer, + CRYPT_INTEGER_BLOB *serialNumber, const CRYPT_DATA_BLOB *keyId, DWORD encodedLen, + LPBYTE *nextData) +{ + static char oid_key_rdn[] = szOID_KEYID_RDN; + CERT_RDN_ATTR attr; + CERT_RDN rdn = { 1, &attr }; + CERT_NAME_INFO name = { 1, &rdn }; + BOOL ret; + + /* Encode special zero serial number */ + serialNumber->cbData = 1; + serialNumber->pbData = *nextData; + **nextData = 0; + (*nextData)++; + /* Encode issuer */ + issuer->pbData = *nextData; + attr.pszObjId = oid_key_rdn; + attr.dwValueType = CERT_RDN_OCTET_STRING; + attr.Value.cbData = keyId->cbData; + attr.Value.pbData = keyId->pbData; + ret = CryptEncodeObject(X509_ASN_ENCODING, X509_NAME, &name, *nextData, + &encodedLen); + if (ret) + { + *nextData += encodedLen; + issuer->cbData = encodedLen; + } + return ret; +} + static BOOL CRYPT_CopySignerInfo(void *pvData, DWORD *pcbData, const CMSG_CMS_SIGNER_INFO *in) { - DWORD size = sizeof(CMSG_SIGNER_INFO); + DWORD size = sizeof(CMSG_SIGNER_INFO), rdnSize; BOOL ret; TRACE("(%p, %d, %p)\n", pvData, pvData ? *pcbData : 0, in); @@ -1992,8 +2040,8 @@ static BOOL CRYPT_CopySignerInfo(void *pvData, DWORD *pcbData, } else { - FIXME("unsupported for key id\n"); - return FALSE; + rdnSize = CRYPT_SizeOfKeyIdAsIssuerAndSerial(&in->SignerId.KeyId); + size += rdnSize; } if (in->HashAlgorithm.pszObjId) size += strlen(in->HashAlgorithm.pszObjId) + 1; @@ -2023,6 +2071,7 @@ static BOOL CRYPT_CopySignerInfo(void *pvData, DWORD *pcbData, LPBYTE nextData = (BYTE *)pvData + sizeof(CMSG_SIGNER_INFO); CMSG_SIGNER_INFO *out = (CMSG_SIGNER_INFO *)pvData; + ret = TRUE; out->dwVersion = in->dwVersion; if (in->SignerId.dwIdChoice == CERT_ID_ISSUER_SERIAL_NUMBER) { @@ -2031,17 +2080,22 @@ static BOOL CRYPT_CopySignerInfo(void *pvData, DWORD *pcbData, CRYPT_CopyBlob(&out->SerialNumber, &in->SignerId.IssuerSerialNumber.SerialNumber, &nextData); } - CRYPT_CopyAlgorithmId(&out->HashAlgorithm, &in->HashAlgorithm, - &nextData); - CRYPT_CopyAlgorithmId(&out->HashEncryptionAlgorithm, - &in->HashEncryptionAlgorithm, &nextData); - CRYPT_CopyBlob(&out->EncryptedHash, &in->EncryptedHash, &nextData); - /* align pointer */ - if ((nextData - (LPBYTE)0) % sizeof(DWORD_PTR)) - nextData += (nextData - (LPBYTE)0) % sizeof(DWORD_PTR); - CRYPT_CopyAttributes(&out->AuthAttrs, &in->AuthAttrs, &nextData); - CRYPT_CopyAttributes(&out->UnauthAttrs, &in->UnauthAttrs, &nextData); - ret = TRUE; + else + ret = CRYPT_CopyKeyIdAsIssuerAndSerial(&out->Issuer, &out->SerialNumber, + &in->SignerId.KeyId, rdnSize, &nextData); + if (ret) + { + CRYPT_CopyAlgorithmId(&out->HashAlgorithm, &in->HashAlgorithm, + &nextData); + CRYPT_CopyAlgorithmId(&out->HashEncryptionAlgorithm, + &in->HashEncryptionAlgorithm, &nextData); + CRYPT_CopyBlob(&out->EncryptedHash, &in->EncryptedHash, &nextData); + /* align pointer */ + if ((nextData - (LPBYTE)0) % sizeof(DWORD_PTR)) + nextData += (nextData - (LPBYTE)0) % sizeof(DWORD_PTR); + CRYPT_CopyAttributes(&out->AuthAttrs, &in->AuthAttrs, &nextData); + CRYPT_CopyAttributes(&out->UnauthAttrs, &in->UnauthAttrs, &nextData); + } } TRACE("returning %d\n", ret); return ret; diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 8df7c69..410a180 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -2469,7 +2469,6 @@ static void test_decode_msg_get_param(void) */ size = 0; ret = CryptMsgGetParam(msg, CMSG_SIGNER_INFO_PARAM, 0, NULL, &size); - todo_wine ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); if (ret) buf = CryptMemAlloc(size);

1 0

Juan Lang : crypt32: Support the KeyId type of signer in CMSG_SIGNER_CERT_INFO_PARAM.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: 1b7121e7ad2ec9087547797c5b37e50aa0528c14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b7121e7ad2ec9087547797c5… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 20 12:02:46 2008 -0700 crypt32: Support the KeyId type of signer in CMSG_SIGNER_CERT_INFO_PARAM. --- dlls/crypt32/msg.c | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 0ec75af..22d740e 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -2174,7 +2174,7 @@ static BOOL CRYPT_CopyCMSSignerInfo(void *pvData, DWORD *pcbData, static BOOL CRYPT_CopySignerCertInfo(void *pvData, DWORD *pcbData, const CMSG_CMS_SIGNER_INFO *in) { - DWORD size = sizeof(CERT_INFO); + DWORD size = sizeof(CERT_INFO), rdnSize; BOOL ret; TRACE("(%p, %d, %p)\n", pvData, pvData ? *pcbData : 0, in); @@ -2186,8 +2186,8 @@ static BOOL CRYPT_CopySignerCertInfo(void *pvData, DWORD *pcbData, } else { - FIXME("unimplemented for key id\n"); - return FALSE; + rdnSize = CRYPT_SizeOfKeyIdAsIssuerAndSerial(&in->SignerId.KeyId); + size += rdnSize; } if (!pvData) { @@ -2206,11 +2206,17 @@ static BOOL CRYPT_CopySignerCertInfo(void *pvData, DWORD *pcbData, CERT_INFO *out = (CERT_INFO *)pvData; memset(out, 0, sizeof(CERT_INFO)); - CRYPT_CopyBlob(&out->Issuer, - &in->SignerId.IssuerSerialNumber.Issuer, &nextData); - CRYPT_CopyBlob(&out->SerialNumber, - &in->SignerId.IssuerSerialNumber.SerialNumber, &nextData); - ret = TRUE; + if (in->SignerId.dwIdChoice == CERT_ID_ISSUER_SERIAL_NUMBER) + { + CRYPT_CopyBlob(&out->Issuer, + &in->SignerId.IssuerSerialNumber.Issuer, &nextData); + CRYPT_CopyBlob(&out->SerialNumber, + &in->SignerId.IssuerSerialNumber.SerialNumber, &nextData); + ret = TRUE; + } + else + ret = CRYPT_CopyKeyIdAsIssuerAndSerial(&out->Issuer, &out->SerialNumber, + &in->SignerId.KeyId, rdnSize, &nextData); } TRACE("returning %d\n", ret); return ret;

1 0

Juan Lang : crypt32: Pass address of blob to store data rather than message to CDecodeMsg_CopyData .
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: d3c8b59e027bda8f5eb06c31670db4e017eff500 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3c8b59e027bda8f5eb06c316… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 20 12:03:12 2008 -0700 crypt32: Pass address of blob to store data rather than message to CDecodeMsg_CopyData. --- dlls/crypt32/msg.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 22d740e..be12218 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1518,22 +1518,22 @@ static void CDecodeMsg_Close(HCRYPTMSG hCryptMsg) ContextPropertyList_Free(msg->properties); } -static BOOL CDecodeMsg_CopyData(CDecodeMsg *msg, const BYTE *pbData, +static BOOL CDecodeMsg_CopyData(CRYPT_DATA_BLOB *blob, const BYTE *pbData, DWORD cbData) { BOOL ret = TRUE; if (cbData) { - if (msg->msg_data.cbData) - msg->msg_data.pbData = CryptMemRealloc(msg->msg_data.pbData, - msg->msg_data.cbData + cbData); + if (blob->cbData) + blob->pbData = CryptMemRealloc(blob->pbData, + blob->cbData + cbData); else - msg->msg_data.pbData = CryptMemAlloc(cbData); - if (msg->msg_data.pbData) + blob->pbData = CryptMemAlloc(cbData); + if (blob->pbData) { - memcpy(msg->msg_data.pbData + msg->msg_data.cbData, pbData, cbData); - msg->msg_data.cbData += cbData; + memcpy(blob->pbData + blob->cbData, pbData, cbData); + blob->cbData += cbData; } else ret = FALSE; @@ -1768,7 +1768,7 @@ static BOOL CDecodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, if (msg->base.open_flags & CMSG_DETACHED_FLAG && msg->base.state != MsgStateDataFinalized) { - ret = CDecodeMsg_CopyData(msg, pbData, cbData); + ret = CDecodeMsg_CopyData(&msg->msg_data, pbData, cbData); msg->base.state = MsgStateDataFinalized; if (ret) ret = CDecodeMsg_DecodeContent(msg, &msg->msg_data, @@ -1784,7 +1784,7 @@ static BOOL CDecodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, } else { - ret = CDecodeMsg_CopyData(msg, pbData, cbData); + ret = CDecodeMsg_CopyData(&msg->msg_data, pbData, cbData); if (msg->base.state == MsgStateInit) msg->base.state = MsgStateUpdated; } @@ -1797,7 +1797,7 @@ static BOOL CDecodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, { if (msg->base.state == MsgStateInit) { - ret = CDecodeMsg_CopyData(msg, pbData, cbData); + ret = CDecodeMsg_CopyData(&msg->msg_data, pbData, cbData); if (ret) ret = CDecodeMsg_DecodeContent(msg, &msg->msg_data, msg->type);

1 0

Juan Lang : crypt32: Test and correct encoding of signed CMS messages.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: 595bae3ef3dea8fd362cfabefd7d2e398dbec614 URL: http://source.winehq.org/git/wine.git/?a=commit;h=595bae3ef3dea8fd362cfabef… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 20 12:00:35 2008 -0700 crypt32: Test and correct encoding of signed CMS messages. --- dlls/crypt32/msg.c | 3 +++ dlls/crypt32/tests/msg.c | 23 +++++++++++++++++++++++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 3fd1888..1740135 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1381,6 +1381,9 @@ static HCRYPTMSG CSignedEncodeMsg_Open(DWORD dwFlags, ret = CSignedMsgData_AllocateHandles(&msg->msg_data); for (i = 0; ret && i < msg->msg_data.info->cSignerInfo; i++) { + if (info->rgSigners[i].SignerId.dwIdChoice == + CERT_ID_KEY_IDENTIFIER) + msg->msg_data.info->version = CMSG_SIGNED_DATA_V3; ret = CSignerInfo_Construct( &msg->msg_data.info->rgSignerInfo[i], &info->rgSigners[i]); diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 00b4bac..3c57f06 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -1341,6 +1341,12 @@ static const BYTE signedContent[] = { static const BYTE signedHash[] = { 0x08,0xd6,0xc0,0x5a,0x21,0x51,0x2a,0x79,0xa1,0xdf,0xeb,0x9d,0x2a,0x8f,0x26, 0x2f }; +static const BYTE signedKeyIdEmptyContent[] = { +0x30,0x46,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x07,0x02,0xa0,0x39, +0x30,0x37,0x02,0x01,0x03,0x31,0x0e,0x30,0x0c,0x06,0x08,0x2a,0x86,0x48,0x86, +0xf7,0x0d,0x02,0x05,0x05,0x00,0x30,0x02,0x06,0x00,0x31,0x1e,0x30,0x1c,0x02, +0x01,0x03,0x80,0x01,0x01,0x30,0x0c,0x06,0x08,0x2a,0x86,0x48,0x86,0xf7,0x0d, +0x02,0x05,0x05,0x00,0x30,0x04,0x06,0x00,0x05,0x00,0x04,0x00 }; static const BYTE signedEncodedSigner[] = { 0x30,0x75,0x02,0x01,0x01,0x30,0x1a,0x30,0x15,0x31,0x13,0x30,0x11,0x06,0x03, 0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e,0x67,0x00, @@ -1652,6 +1658,23 @@ static void test_signed_msg_encoding(void) CryptMsgClose(msg); + certInfo.SerialNumber.cbData = 0; + certInfo.Issuer.cbData = 0; + signer.SignerId.dwIdChoice = CERT_ID_KEY_IDENTIFIER; + signer.SignerId.KeyId.cbData = sizeof(serialNum); + signer.SignerId.KeyId.pbData = (BYTE *)serialNum; + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_SIGNED, &signInfo, + NULL, NULL); + ok(msg != NULL, "CryptMsgOpenToEncode failed: %x\n", GetLastError()); + check_param("signed key id empty content", msg, CMSG_CONTENT_PARAM, + signedKeyIdEmptyContent, sizeof(signedKeyIdEmptyContent)); + CryptMsgClose(msg); + + certInfo.SerialNumber.cbData = sizeof(serialNum); + certInfo.SerialNumber.pbData = serialNum; + certInfo.Issuer.cbData = sizeof(encodedCommonName); + certInfo.Issuer.pbData = encodedCommonName; + signer.SignerId.dwIdChoice = 0; msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_SIGNED, &signInfo, NULL, NULL); ok(msg != NULL, "CryptMsgOpenToEncode failed: %x\n", GetLastError());

1 0

Juan Lang : crypt32: Add more tests for the version of encoded signed CMS messages.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: ca94a1cc0d1bd84fbc52ac5cd028eed719c346a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca94a1cc0d1bd84fbc52ac5cd… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 20 12:01:05 2008 -0700 crypt32: Add more tests for the version of encoded signed CMS messages. --- dlls/crypt32/tests/msg.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 81 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 3c57f06..86ce6b1 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -1884,6 +1884,87 @@ static void test_signed_msg_get_param(void) CryptMsgClose(msg); + /* Opening the message using the CMS fields.. */ + certInfo.SerialNumber.cbData = 0; + certInfo.Issuer.cbData = 0; + signer.SignerId.dwIdChoice = CERT_ID_ISSUER_SERIAL_NUMBER; + signer.SignerId.IssuerSerialNumber.Issuer.cbData = + sizeof(encodedCommonName); + signer.SignerId.IssuerSerialNumber.Issuer.pbData = + (BYTE *)encodedCommonName; + signer.SignerId.IssuerSerialNumber.SerialNumber.cbData = + sizeof(serialNum); + signer.SignerId.IssuerSerialNumber.SerialNumber.pbData = (BYTE *)serialNum; + ret = pCryptAcquireContextA(&signer.hCryptProv, cspNameA, NULL, + PROV_RSA_FULL, CRYPT_NEWKEYSET); + if (!ret && GetLastError() == NTE_EXISTS) + ret = pCryptAcquireContextA(&signer.hCryptProv, cspNameA, NULL, + PROV_RSA_FULL, 0); + ok(ret, "CryptAcquireContextW failed: %x\n", GetLastError()); + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, + CMSG_CRYPT_RELEASE_CONTEXT_FLAG, CMSG_SIGNED, &signInfo, NULL, NULL); + ok(msg != NULL, "CryptMsgOpenToEncode failed: %x\n", GetLastError()); + /* still results in the version being 1 when the issuer and serial number + * are used and no additional CMS fields are used. + */ + size = sizeof(value); + ret = CryptMsgGetParam(msg, CMSG_VERSION_PARAM, 0, (LPBYTE)&value, &size); + ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); + ok(value == CMSG_SIGNED_DATA_V1, "expected version 1, got %d\n", value); + /* Apparently the encoded signer can be retrieved.. */ + ret = CryptMsgGetParam(msg, CMSG_ENCODED_SIGNER, 0, NULL, &size); + ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); + /* but the signer info, CMS signer info, and cert ID can't be. */ + SetLastError(0xdeadbeef); + ret = CryptMsgGetParam(msg, CMSG_SIGNER_INFO_PARAM, 0, NULL, &size); + ok(!ret && GetLastError() == CRYPT_E_INVALID_MSG_TYPE, + "expected CRYPT_E_INVALID_MSG_TYPE, got %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = CryptMsgGetParam(msg, CMSG_CMS_SIGNER_INFO_PARAM, 0, NULL, &size); + ok(!ret && GetLastError() == CRYPT_E_INVALID_MSG_TYPE, + "expected CRYPT_E_INVALID_MSG_TYPE, got %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = CryptMsgGetParam(msg, CMSG_SIGNER_CERT_ID_PARAM, 0, NULL, &size); + ok(!ret && GetLastError() == CRYPT_E_INVALID_MSG_TYPE, + "expected CRYPT_E_INVALID_MSG_TYPE, got %08x\n", GetLastError()); + CryptMsgClose(msg); + + /* Using the KeyId field of the SignerId results in the version becoming + * the CMS version. + */ + signer.SignerId.dwIdChoice = CERT_ID_KEY_IDENTIFIER; + signer.SignerId.KeyId.cbData = sizeof(serialNum); + signer.SignerId.KeyId.pbData = (BYTE *)serialNum; + ret = CryptAcquireContextW(&signer.hCryptProv, cspNameW, NULL, + PROV_RSA_FULL, CRYPT_NEWKEYSET); + if (!ret && GetLastError() == NTE_EXISTS) + ret = CryptAcquireContextW(&signer.hCryptProv, cspNameW, NULL, + PROV_RSA_FULL, 0); + ok(ret, "CryptAcquireContextW failed: %x\n", GetLastError()); + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, + CMSG_CRYPT_RELEASE_CONTEXT_FLAG, CMSG_SIGNED, &signInfo, NULL, NULL); + ok(msg != NULL, "CryptMsgOpenToEncode failed: %x\n", GetLastError()); + size = sizeof(value); + ret = CryptMsgGetParam(msg, CMSG_VERSION_PARAM, 0, (LPBYTE)&value, &size); + ok(value == CMSG_SIGNED_DATA_V3, "expected version 3, got %d\n", value); + /* Even for a CMS message, the signer can be retrieved.. */ + ret = CryptMsgGetParam(msg, CMSG_ENCODED_SIGNER, 0, NULL, &size); + ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); + /* but the signer info, CMS signer info, and cert ID can't be. */ + SetLastError(0xdeadbeef); + ret = CryptMsgGetParam(msg, CMSG_SIGNER_INFO_PARAM, 0, NULL, &size); + ok(!ret && GetLastError() == CRYPT_E_INVALID_MSG_TYPE, + "expected CRYPT_E_INVALID_MSG_TYPE, got %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = CryptMsgGetParam(msg, CMSG_CMS_SIGNER_INFO_PARAM, 0, NULL, &size); + ok(!ret && GetLastError() == CRYPT_E_INVALID_MSG_TYPE, + "expected CRYPT_E_INVALID_MSG_TYPE, got %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = CryptMsgGetParam(msg, CMSG_SIGNER_CERT_ID_PARAM, 0, NULL, &size); + ok(!ret && GetLastError() == CRYPT_E_INVALID_MSG_TYPE, + "expected CRYPT_E_INVALID_MSG_TYPE, got %08x\n", GetLastError()); + CryptMsgClose(msg); + CryptReleaseContext(signer.hCryptProv, 0); pCryptAcquireContextA(&signer.hCryptProv, cspNameA, MS_DEF_PROV_A, PROV_RSA_FULL, CRYPT_DELETEKEYSET);

1 0