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

Juan Lang : crypt32: Allow CMS fields to be set when opening a signed message to encode.
by Alexandre Julliard Aug. 20, 2008

Aug. 20, 2008

Module: wine Branch: master Commit: 4fa4e5a793fa4d48246434c96a3e1381bcfc452c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fa4e5a793fa4d48246434c96… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 14 17:34:07 2008 -0700 crypt32: Allow CMS fields to be set when opening a signed message to encode. --- dlls/crypt32/msg.c | 72 +++++++++++++++++++++++++++++++++------------ dlls/crypt32/tests/msg.c | 18 +++++++++++ 2 files changed, 71 insertions(+), 19 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index ad4ba95..12ee8a3 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -632,15 +632,62 @@ static BOOL CRYPT_IsValidSigner(CMSG_SIGNER_ENCODE_INFO_WITH_CMS *signer) SetLastError(E_INVALIDARG); return FALSE; } - if (!signer->pCertInfo->SerialNumber.cbData) + if (signer->cbSize == sizeof(CMSG_SIGNER_ENCODE_INFO)) { - SetLastError(E_INVALIDARG); - return FALSE; + if (!signer->pCertInfo->SerialNumber.cbData) + { + SetLastError(E_INVALIDARG); + return FALSE; + } + if (!signer->pCertInfo->Issuer.cbData) + { + SetLastError(E_INVALIDARG); + return FALSE; + } } - if (!signer->pCertInfo->Issuer.cbData) + else if (signer->cbSize == sizeof(CMSG_SIGNER_ENCODE_INFO_WITH_CMS)) { - SetLastError(E_INVALIDARG); - return FALSE; + switch (signer->SignerId.dwIdChoice) + { + case 0: + if (!signer->pCertInfo->SerialNumber.cbData) + { + SetLastError(E_INVALIDARG); + return FALSE; + } + if (!signer->pCertInfo->Issuer.cbData) + { + SetLastError(E_INVALIDARG); + return FALSE; + } + break; + case CERT_ID_ISSUER_SERIAL_NUMBER: + if (!signer->SignerId.IssuerSerialNumber.SerialNumber.cbData) + { + SetLastError(E_INVALIDARG); + return FALSE; + } + if (!signer->SignerId.IssuerSerialNumber.Issuer.cbData) + { + SetLastError(E_INVALIDARG); + return FALSE; + } + break; + case CERT_ID_KEY_IDENTIFIER: + if (!signer->SignerId.KeyId.cbData) + { + SetLastError(E_INVALIDARG); + return FALSE; + } + break; + default: + SetLastError(E_INVALIDARG); + } + if (signer->HashEncryptionAlgorithm.pszObjId) + { + FIXME("CMSG_SIGNER_ENCODE_INFO with CMS fields unsupported\n"); + return FALSE; + } } if (!signer->hCryptProv) { @@ -652,19 +699,6 @@ 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; } diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 0f69190..00b4bac 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -1106,6 +1106,24 @@ static void test_signed_msg_open(void) CryptMsgClose(msg); } + /* pCertInfo must still be set, but can be empty if the SignerId's issuer + * and serial number are set. + */ + certInfo.Issuer.cbData = 0; + certInfo.SerialNumber.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; + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_SIGNED, &signInfo, + NULL, NULL); + ok(msg != NULL, "CryptMsgOpenToEncode failed: %x\n", GetLastError()); + CryptMsgClose(msg); + CryptReleaseContext(signer.hCryptProv, 0); pCryptAcquireContextA(&signer.hCryptProv, cspNameA, MS_DEF_PROV_A, PROV_RSA_FULL, CRYPT_DELETEKEYSET);

1 0

Juan Lang : crypt32: Allow messages to be opened when compiled with CMSG_SIGNED_ENCODE_INFO_HAS_CMS_FIELDS if CMS fields aren 't actually used.
by Alexandre Julliard Aug. 20, 2008

Aug. 20, 2008

Module: wine Branch: master Commit: 3297080045de9d2917b089483c7b0039dd78c8c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3297080045de9d2917b089483… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 14 17:21:41 2008 -0700 crypt32: Allow messages to be opened when compiled with CMSG_SIGNED_ENCODE_INFO_HAS_CMS_FIELDS if CMS fields aren't actually used. --- dlls/crypt32/msg.c | 3 ++- dlls/crypt32/tests/msg.c | 1 + 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 6e78409..ad4ba95 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1259,7 +1259,8 @@ static HCRYPTMSG CSignedEncodeMsg_Open(DWORD dwFlags, SetLastError(E_INVALIDARG); return NULL; } - if (info->cbSize == sizeof(CMSG_SIGNED_ENCODE_INFO_WITH_CMS)) + if (info->cbSize == sizeof(CMSG_SIGNED_ENCODE_INFO_WITH_CMS) && + info->rgAttrCertEncoded) { FIXME("CMSG_SIGNED_ENCODE_INFO with CMS fields unsupported\n"); return NULL; diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index b8c40f9..0f69190 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -24,6 +24,7 @@ #include <winbase.h> #include <winerror.h> #define CMSG_SIGNER_ENCODE_INFO_HAS_CMS_FIELDS +#define CMSG_SIGNED_ENCODE_INFO_HAS_CMS_FIELDS #include <wincrypt.h> #include "wine/test.h"

1 0

Juan Lang : crypt32: Implement decoding CMSG_CMS_SIGNER_INFO.
by Alexandre Julliard Aug. 20, 2008

Aug. 20, 2008

Module: wine Branch: master Commit: 9b953c5f1e253bf9bc62c9188ce873797449ca0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b953c5f1e253bf9bc62c9188… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 14 12:51:37 2008 -0700 crypt32: Implement decoding CMSG_CMS_SIGNER_INFO. --- dlls/crypt32/decode.c | 129 ++++++++++++++++++++++++++++++++++++++++++- dlls/crypt32/tests/encode.c | 6 -- 2 files changed, 128 insertions(+), 7 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 89c62ee..3f9a243 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -1,5 +1,5 @@ /* - * Copyright 2005-2007 Juan Lang + * Copyright 2005-2008 Juan Lang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -4321,6 +4321,130 @@ static BOOL WINAPI CRYPT_AsnDecodePKCSSignerInfo(DWORD dwCertEncodingType, return ret; } +static BOOL CRYPT_AsnDecodeCMSSignerId(const BYTE *pbEncoded, + DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, + DWORD *pcbDecoded) +{ + CERT_ID *id = (CERT_ID *)pvStructInfo; + BOOL ret = FALSE; + + if (*pbEncoded == ASN_SEQUENCEOF) + { + ret = CRYPT_AsnDecodeIssuerSerialNumber(pbEncoded, cbEncoded, dwFlags, + id ? &id->u.IssuerSerialNumber : NULL, pcbStructInfo, pcbDecoded); + if (ret) + { + if (id) + id->dwIdChoice = CERT_ID_ISSUER_SERIAL_NUMBER; + if (*pcbStructInfo > sizeof(CERT_ISSUER_SERIAL_NUMBER)) + *pcbStructInfo = sizeof(CERT_ID) + *pcbStructInfo - + sizeof(CERT_ISSUER_SERIAL_NUMBER); + else + *pcbStructInfo = sizeof(CERT_ID); + } + } + else if (*pbEncoded == (ASN_CONTEXT | 0)) + { + ret = CRYPT_AsnDecodeOctetsInternal(pbEncoded, cbEncoded, dwFlags, + id ? &id->u.KeyId : NULL, pcbStructInfo, pcbDecoded); + if (ret) + { + if (id) + id->dwIdChoice = CERT_ID_KEY_IDENTIFIER; + if (*pcbStructInfo > sizeof(CRYPT_DATA_BLOB)) + *pcbStructInfo = sizeof(CERT_ID) + *pcbStructInfo - + sizeof(CRYPT_DATA_BLOB); + else + *pcbStructInfo = sizeof(CERT_ID); + } + } + else + SetLastError(CRYPT_E_ASN1_BADTAG); + return ret; +} + +static BOOL CRYPT_AsnDecodeCMSSignerInfoInternal(const BYTE *pbEncoded, + DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, + DWORD *pcbDecoded) +{ + CMSG_CMS_SIGNER_INFO *info = (CMSG_CMS_SIGNER_INFO *)pvStructInfo; + struct AsnDecodeSequenceItem items[] = { + { ASN_INTEGER, offsetof(CMSG_CMS_SIGNER_INFO, dwVersion), + CRYPT_AsnDecodeIntInternal, sizeof(DWORD), FALSE, FALSE, 0, 0 }, + { 0, offsetof(CMSG_CMS_SIGNER_INFO, SignerId), + CRYPT_AsnDecodeCMSSignerId, sizeof(CERT_ID), FALSE, TRUE, + offsetof(CMSG_CMS_SIGNER_INFO, SignerId.u.KeyId.pbData), 0 }, + { ASN_SEQUENCEOF, offsetof(CMSG_CMS_SIGNER_INFO, HashAlgorithm), + CRYPT_AsnDecodeAlgorithmId, sizeof(CRYPT_ALGORITHM_IDENTIFIER), + FALSE, TRUE, offsetof(CMSG_CMS_SIGNER_INFO, HashAlgorithm.pszObjId), 0 }, + { ASN_CONSTRUCTOR | ASN_CONTEXT | 0, + offsetof(CMSG_CMS_SIGNER_INFO, AuthAttrs), + CRYPT_AsnDecodePKCSAttributesInternal, sizeof(CRYPT_ATTRIBUTES), + TRUE, TRUE, offsetof(CMSG_CMS_SIGNER_INFO, AuthAttrs.rgAttr), 0 }, + { ASN_SEQUENCEOF, offsetof(CMSG_CMS_SIGNER_INFO, HashEncryptionAlgorithm), + CRYPT_AsnDecodeAlgorithmId, sizeof(CRYPT_ALGORITHM_IDENTIFIER), + FALSE, TRUE, offsetof(CMSG_CMS_SIGNER_INFO, + HashEncryptionAlgorithm.pszObjId), 0 }, + { ASN_OCTETSTRING, offsetof(CMSG_CMS_SIGNER_INFO, EncryptedHash), + CRYPT_AsnDecodeOctetsInternal, sizeof(CRYPT_DER_BLOB), + FALSE, TRUE, offsetof(CMSG_CMS_SIGNER_INFO, EncryptedHash.pbData), 0 }, + { ASN_CONSTRUCTOR | ASN_CONTEXT | 1, + offsetof(CMSG_CMS_SIGNER_INFO, UnauthAttrs), + CRYPT_AsnDecodePKCSAttributesInternal, sizeof(CRYPT_ATTRIBUTES), + TRUE, TRUE, offsetof(CMSG_CMS_SIGNER_INFO, UnauthAttrs.rgAttr), 0 }, + }; + BOOL ret; + + TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags, + pvStructInfo, *pcbStructInfo); + + ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), + pbEncoded, cbEncoded, dwFlags, NULL, pvStructInfo, pcbStructInfo, + pcbDecoded, info ? info->SignerId.u.KeyId.pbData : NULL); + return ret; +} + +static BOOL WINAPI CRYPT_AsnDecodeCMSSignerInfo(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, + PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) +{ + BOOL ret = FALSE; + + TRACE("%p, %d, %08x, %p, %p, %d\n", pbEncoded, cbEncoded, dwFlags, + pDecodePara, pvStructInfo, *pcbStructInfo); + + __TRY + { + ret = CRYPT_AsnDecodeCMSSignerInfoInternal(pbEncoded, cbEncoded, + dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, pcbStructInfo, NULL); + if (ret && pvStructInfo) + { + ret = CRYPT_DecodeEnsureSpace(dwFlags, pDecodePara, pvStructInfo, + pcbStructInfo, *pcbStructInfo); + if (ret) + { + CMSG_CMS_SIGNER_INFO *info; + + if (dwFlags & CRYPT_DECODE_ALLOC_FLAG) + pvStructInfo = *(BYTE **)pvStructInfo; + info = (CMSG_CMS_SIGNER_INFO *)pvStructInfo; + info->SignerId.u.KeyId.pbData = ((BYTE *)info + + sizeof(CMSG_CMS_SIGNER_INFO)); + ret = CRYPT_AsnDecodeCMSSignerInfoInternal(pbEncoded, + cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, pvStructInfo, + pcbStructInfo, NULL); + } + } + } + __EXCEPT_PAGE_FAULT + { + SetLastError(STATUS_ACCESS_VIOLATION); + } + __ENDTRY + TRACE("returning %d\n", ret); + return ret; +} + static BOOL CRYPT_DecodeSignerArray(const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded) { @@ -4489,6 +4613,9 @@ static CryptDecodeObjectExFunc CRYPT_GetBuiltinDecoder(DWORD dwCertEncodingType, case LOWORD(PKCS7_SIGNER_INFO): decodeFunc = CRYPT_AsnDecodePKCSSignerInfo; break; + case LOWORD(CMS_SIGNER_INFO): + decodeFunc = CRYPT_AsnDecodeCMSSignerInfo; + break; } } else if (!strcmp(lpszStructType, szOID_CERT_EXTENSIONS)) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 10128ad..28542aa 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -5658,13 +5658,11 @@ static void test_decodeCMSSignerInfo(DWORD dwEncoding) ret = CryptDecodeObjectEx(dwEncoding, CMS_SIGNER_INFO, minimalPKCSSigner, sizeof(minimalPKCSSigner), CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); - todo_wine ok(!ret && GetLastError() == CRYPT_E_ASN1_CORRUPT, "Expected CRYPT_E_ASN1_CORRUPT, got %x\n", GetLastError()); ret = CryptDecodeObjectEx(dwEncoding, CMS_SIGNER_INFO, PKCSSignerWithSerial, sizeof(PKCSSignerWithSerial), CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); - todo_wine ok(ret, "CryptDecodeObjectEx failed: %x\n", GetLastError()); if (buf) { @@ -5691,7 +5689,6 @@ static void test_decodeCMSSignerInfo(DWORD dwEncoding) ret = CryptDecodeObjectEx(dwEncoding, CMS_SIGNER_INFO, PKCSSignerWithHashAlgo, sizeof(PKCSSignerWithHashAlgo), CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); - todo_wine ok(ret, "CryptDecodeObjectEx failed: %x\n", GetLastError()); if (buf) { @@ -5721,7 +5718,6 @@ static void test_decodeCMSSignerInfo(DWORD dwEncoding) PKCSSignerWithHashAndEncryptionAlgo, sizeof(PKCSSignerWithHashAndEncryptionAlgo), CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); - todo_wine ok(ret, "CryptDecodeObjectEx failed: %x\n", GetLastError()); if (buf) { @@ -5752,7 +5748,6 @@ static void test_decodeCMSSignerInfo(DWORD dwEncoding) ret = CryptDecodeObjectEx(dwEncoding, CMS_SIGNER_INFO, PKCSSignerWithHash, sizeof(PKCSSignerWithHash), CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); - todo_wine ok(ret, "CryptDecodeObjectEx failed: %x\n", GetLastError()); if (buf) { @@ -5787,7 +5782,6 @@ static void test_decodeCMSSignerInfo(DWORD dwEncoding) ret = CryptDecodeObjectEx(dwEncoding, CMS_SIGNER_INFO, CMSSignerWithKeyId, sizeof(CMSSignerWithKeyId), CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); - todo_wine ok(ret, "CryptDecodeObjectEx failed: %x\n", GetLastError()); if (buf) {

1 0

Juan Lang : crypt32: Implement CMSG_CMS_SIGNER_INFO encoding.
by Alexandre Julliard Aug. 20, 2008

Aug. 20, 2008

Module: wine Branch: master Commit: 817adc5599d541f2effcdaf403c7a2bd0af012c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=817adc5599d541f2effcdaf40… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 14 12:50:57 2008 -0700 crypt32: Implement CMSG_CMS_SIGNER_INFO encoding. --- dlls/crypt32/encode.c | 94 ++++++++++++++++++++++++++++++++++++++++++- dlls/crypt32/tests/encode.c | 15 ------- 2 files changed, 93 insertions(+), 16 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 0d62b02..16b4bb8 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -1,5 +1,5 @@ /* - * Copyright 2005-2007 Juan Lang + * Copyright 2005-2008 Juan Lang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -3419,6 +3419,95 @@ static BOOL WINAPI CRYPT_AsnEncodePKCSSignerInfo(DWORD dwCertEncodingType, return ret; } +static BOOL WINAPI CRYPT_AsnEncodeCMSSignerInfo(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, + PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) +{ + BOOL ret = FALSE; + + if (!(dwCertEncodingType & PKCS_7_ASN_ENCODING)) + { + SetLastError(E_INVALIDARG); + return FALSE; + } + + __TRY + { + const CMSG_CMS_SIGNER_INFO *info = (const CMSG_CMS_SIGNER_INFO *)pvStructInfo; + + if (info->SignerId.dwIdChoice != CERT_ID_ISSUER_SERIAL_NUMBER && + info->SignerId.dwIdChoice != CERT_ID_KEY_IDENTIFIER) + SetLastError(E_INVALIDARG); + else if (info->SignerId.dwIdChoice == CERT_ID_ISSUER_SERIAL_NUMBER && + !info->SignerId.u.IssuerSerialNumber.Issuer.cbData) + SetLastError(E_INVALIDARG); + else + { + struct AsnEncodeSequenceItem items[7] = { + { &info->dwVersion, CRYPT_AsnEncodeInt, 0 }, + }; + struct AsnEncodeTagSwappedItem swapped[3] = { { 0 } }; + DWORD cItem = 1, cSwapped = 0; + + if (info->SignerId.dwIdChoice == CERT_ID_ISSUER_SERIAL_NUMBER) + { + items[cItem].pvStructInfo = + &info->SignerId.u.IssuerSerialNumber.Issuer; + items[cItem].encodeFunc = + CRYPT_AsnEncodeIssuerSerialNumber; + cItem++; + } + else + { + swapped[cSwapped].tag = ASN_CONTEXT | 0; + swapped[cSwapped].pvStructInfo = &info->SignerId.u.KeyId; + swapped[cSwapped].encodeFunc = CRYPT_AsnEncodeOctets; + items[cItem].pvStructInfo = &swapped[cSwapped]; + items[cItem].encodeFunc = CRYPT_AsnEncodeSwapTag; + cSwapped++; + cItem++; + } + items[cItem].pvStructInfo = &info->HashAlgorithm; + items[cItem].encodeFunc = CRYPT_AsnEncodeAlgorithmIdWithNullParams; + cItem++; + if (info->AuthAttrs.cAttr) + { + swapped[cSwapped].tag = ASN_CONTEXT | ASN_CONSTRUCTOR | 0; + swapped[cSwapped].pvStructInfo = &info->AuthAttrs; + swapped[cSwapped].encodeFunc = CRYPT_AsnEncodePKCSAttributes; + items[cItem].pvStructInfo = &swapped[cSwapped]; + items[cItem].encodeFunc = CRYPT_AsnEncodeSwapTag; + cSwapped++; + cItem++; + } + items[cItem].pvStructInfo = &info->HashEncryptionAlgorithm; + items[cItem].encodeFunc = CRYPT_AsnEncodeAlgorithmIdWithNullParams; + cItem++; + items[cItem].pvStructInfo = &info->EncryptedHash; + items[cItem].encodeFunc = CRYPT_AsnEncodeOctets; + cItem++; + if (info->UnauthAttrs.cAttr) + { + swapped[cSwapped].tag = ASN_CONTEXT | ASN_CONSTRUCTOR | 1; + swapped[cSwapped].pvStructInfo = &info->UnauthAttrs; + swapped[cSwapped].encodeFunc = CRYPT_AsnEncodePKCSAttributes; + items[cItem].pvStructInfo = &swapped[cSwapped]; + items[cItem].encodeFunc = CRYPT_AsnEncodeSwapTag; + cSwapped++; + cItem++; + } + ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, cItem, + dwFlags, pEncodePara, pbEncoded, pcbEncoded); + } + } + __EXCEPT_PAGE_FAULT + { + SetLastError(STATUS_ACCESS_VIOLATION); + } + __ENDTRY + return ret; +} + BOOL CRYPT_AsnEncodePKCSSignedInfo(CRYPT_SIGNED_INFO *signedInfo, void *pvData, DWORD *pcbData) { @@ -3607,6 +3696,9 @@ static CryptEncodeObjectExFunc CRYPT_GetBuiltinEncoder(DWORD dwCertEncodingType, case LOWORD(PKCS7_SIGNER_INFO): encodeFunc = CRYPT_AsnEncodePKCSSignerInfo; break; + case LOWORD(CMS_SIGNER_INFO): + encodeFunc = CRYPT_AsnEncodeCMSSignerInfo; + break; } } else if (!strcmp(lpszStructType, szOID_CERT_EXTENSIONS)) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 027bfe8..10128ad 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -5498,14 +5498,12 @@ static void test_encodeCMSSignerInfo(DWORD dwEncoding) SetLastError(0xdeadbeef); ret = CryptEncodeObjectEx(dwEncoding, CMS_SIGNER_INFO, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", GetLastError()); info.SignerId.dwIdChoice = CERT_ID_ISSUER_SERIAL_NUMBER; SetLastError(0xdeadbeef); ret = CryptEncodeObjectEx(dwEncoding, CMS_SIGNER_INFO, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", GetLastError()); /* To be encoded, a signer must have a valid cert ID, where a valid ID may @@ -5519,7 +5517,6 @@ static void test_encodeCMSSignerInfo(DWORD dwEncoding) SetLastError(0xdeadbeef); ret = CryptEncodeObjectEx(dwEncoding, CMS_SIGNER_INFO, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); - todo_wine { if (!(dwEncoding & PKCS_7_ASN_ENCODING)) ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", GetLastError()); @@ -5533,13 +5530,11 @@ static void test_encodeCMSSignerInfo(DWORD dwEncoding) LocalFree(buf); } } - } info.SignerId.IssuerSerialNumber.SerialNumber.cbData = sizeof(serialNum); info.SignerId.IssuerSerialNumber.SerialNumber.pbData = (BYTE *)serialNum; SetLastError(0xdeadbeef); ret = CryptEncodeObjectEx(dwEncoding, CMS_SIGNER_INFO, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); - todo_wine { if (!(dwEncoding & PKCS_7_ASN_ENCODING)) ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", GetLastError()); @@ -5554,14 +5549,12 @@ static void test_encodeCMSSignerInfo(DWORD dwEncoding) LocalFree(buf); } } - } info.SignerId.dwIdChoice = CERT_ID_KEY_IDENTIFIER; info.SignerId.KeyId.cbData = sizeof(serialNum); info.SignerId.KeyId.pbData = (BYTE *)serialNum; SetLastError(0xdeadbeef); ret = CryptEncodeObjectEx(dwEncoding, CMS_SIGNER_INFO, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); - todo_wine { if (!(dwEncoding & PKCS_7_ASN_ENCODING)) ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", GetLastError()); @@ -5576,7 +5569,6 @@ static void test_encodeCMSSignerInfo(DWORD dwEncoding) LocalFree(buf); } } - } /* While a CERT_ID can have a hash type, that's not allowed in CMS, where * only the IssuerAndSerialNumber and SubjectKeyIdentifier types are allowed * (see RFC 3852, section 5.3.) @@ -5587,7 +5579,6 @@ static void test_encodeCMSSignerInfo(DWORD dwEncoding) SetLastError(0xdeadbeef); ret = CryptEncodeObjectEx(dwEncoding, CMS_SIGNER_INFO, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", GetLastError()); /* Now with a hash algo */ @@ -5599,7 +5590,6 @@ static void test_encodeCMSSignerInfo(DWORD dwEncoding) SetLastError(0xdeadbeef); ret = CryptEncodeObjectEx(dwEncoding, CMS_SIGNER_INFO, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); - todo_wine { if (!(dwEncoding & PKCS_7_ASN_ENCODING)) ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", GetLastError()); @@ -5615,12 +5605,10 @@ static void test_encodeCMSSignerInfo(DWORD dwEncoding) LocalFree(buf); } } - } info.HashEncryptionAlgorithm.pszObjId = oid2; SetLastError(0xdeadbeef); ret = CryptEncodeObjectEx(dwEncoding, CMS_SIGNER_INFO, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); - todo_wine { if (!(dwEncoding & PKCS_7_ASN_ENCODING)) ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", GetLastError()); @@ -5636,13 +5624,11 @@ static void test_encodeCMSSignerInfo(DWORD dwEncoding) LocalFree(buf); } } - } info.EncryptedHash.cbData = sizeof(hash); info.EncryptedHash.pbData = (BYTE *)hash; SetLastError(0xdeadbeef); ret = CryptEncodeObjectEx(dwEncoding, CMS_SIGNER_INFO, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); - todo_wine { if (!(dwEncoding & PKCS_7_ASN_ENCODING)) ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", GetLastError()); @@ -5657,7 +5643,6 @@ static void test_encodeCMSSignerInfo(DWORD dwEncoding) LocalFree(buf); } } - } } static void test_decodeCMSSignerInfo(DWORD dwEncoding)

1 0

Juan Lang : crypt32: Allow messages to be opened when compiled with CMSG_SIGNER_ENCODE_INFO_HAS_CMS_FIELDS if CMS fields aren 't actually used.
by Alexandre Julliard Aug. 20, 2008

Aug. 20, 2008

Module: wine Branch: master Commit: 427b3fbd5d8127ede4b2e7bce19de724d68c0624 URL: http://source.winehq.org/git/wine.git/?a=commit;h=427b3fbd5d8127ede4b2e7bce… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 14 17:19:19 2008 -0700 crypt32: Allow messages to be opened when compiled with CMSG_SIGNER_ENCODE_INFO_HAS_CMS_FIELDS if CMS fields aren't actually used. --- dlls/crypt32/msg.c | 18 +++++++++++++----- dlls/crypt32/tests/msg.c | 1 + 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 63121fd..6e78409 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -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; } diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 0f7dcb6..b8c40f9 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -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"

1 0

Juan Lang : crypt32: Add tests for encoding/decoding CMSG_CMS_SIGNER_INFO.
by Alexandre Julliard Aug. 20, 2008

Aug. 20, 2008

Module: wine Branch: master Commit: d71e6e96dd7091b6b1a2fe5fb23f28352ee35479 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d71e6e96dd7091b6b1a2fe5fb… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 14 12:50:18 2008 -0700 crypt32: Add tests for encoding/decoding CMSG_CMS_SIGNER_INFO. --- dlls/crypt32/tests/encode.c | 339 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 339 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d71e6e96dd7091b6b1a2f…

1 0

Alexander Morozov : kernel32: Fix a typo.
by Alexandre Julliard Aug. 20, 2008

Aug. 20, 2008

Module: wine Branch: master Commit: ea1e7555a9712ed94e152085b21ded21dfb5f001 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea1e7555a9712ed94e152085b… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Thu Aug 14 15:05:40 2008 +0400 kernel32: Fix a typo. --- dlls/kernel32/comm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/comm.c b/dlls/kernel32/comm.c index 9eeed3d..d83eacb 100644 --- a/dlls/kernel32/comm.c +++ b/dlls/kernel32/comm.c @@ -824,7 +824,7 @@ BOOL WINAPI SetCommState( HANDLE handle, LPDCB lpdcb) SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - switch (lpdcb->fDtrControl) + switch (lpdcb->fRtsControl) { case RTS_CONTROL_DISABLE: break; case RTS_CONTROL_ENABLE: shf.FlowReplace |= SERIAL_RTS_CONTROL; break;

1 0

Juan Lang : wincrypt.h: Add more missing definitions.
by Alexandre Julliard Aug. 20, 2008

Aug. 20, 2008

Module: wine Branch: master Commit: d4e5d62b2ff5a509a13384a950255869b250fbb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4e5d62b2ff5a509a13384a95… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 14 08:24:38 2008 -0700 wincrypt.h: Add more missing definitions. --- include/wincrypt.h | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 67 insertions(+), 0 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index 11ad77f..0f0cec6 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -3629,6 +3629,18 @@ typedef struct _CMSG_CTRL_VERIFY_SIGNATURE_EX_PARA { #define CMSG_SIGNER_CERT_ID_PARAM 38 #define CMSG_CMS_SIGNER_INFO_PARAM 39 +typedef struct _CMSG_CMS_SIGNER_INFO { + DWORD dwVersion; + CERT_ID SignerId; + CRYPT_ALGORITHM_IDENTIFIER HashAlgorithm; + CRYPT_ALGORITHM_IDENTIFIER HashEncryptionAlgorithm; + CRYPT_DATA_BLOB EncryptedHash; + CRYPT_ATTRIBUTES AuthAttrs; + CRYPT_ATTRIBUTES UnauthAttrs; +} CMSG_CMS_SIGNER_INFO, *PCMSG_CMS_SIGNER_INFO; + +typedef CRYPT_ATTRIBUTES CMSG_ATTR, *PCMSG_ATTR; + #define CMSG_SIGNED_DATA_V1 1 #define CMSG_SIGNED_DATA_V3 3 #define CMSG_SIGNED_DATA_PKCS_1_5_VERSION CMSG_SIGNED_DATA_V1 @@ -3649,6 +3661,61 @@ typedef struct _CMSG_CTRL_VERIFY_SIGNATURE_EX_PARA { #define CMSG_ENVELOPED_DATA_PKCS_1_5_VERSION CMSG_ENVELOPED_DATA_V0 #define CMSG_ENVELOPED_DATA_CMS_VERSION CMSG_ENVELOPED_DATA_V2 +typedef struct _CMSG_KEY_TRANS_RECIPIENT_INFO { + DWORD dwVersion; + CERT_ID RecipientId; + CRYPT_ALGORITHM_IDENTIFIER KeyEncryptionAlgorithm; + CRYPT_DATA_BLOB EncryptedKey; +} CMSG_KEY_TRANS_RECIPIENT_INFO, *PCMSG_KEY_TRANS_RECIPIENT_INFO; + +typedef struct _CMSG_RECIPIENT_ENCRYPTED_KEY_INFO { + CERT_ID RecipientId; + CRYPT_DATA_BLOB EncryptedKey; + PCRYPT_ATTRIBUTE_TYPE_VALUE pOtherAttr; +} CMSG_RECIPIENT_ENCRYPTED_KEY_INFO, *PCMSG_RECIPIENT_ENCRYPTED_KEY_INFO; + +typedef struct _CMSG_KEY_AGREE_RECIPIENT_INFO { + DWORD dwVersion; + DWORD dwOriginatorChoice; + union { + CERT_ID OriginatorCertId; + CERT_PUBLIC_KEY_INFO OriginatorPublicKeyInfo; + } DUMMYUNIONNAME; + CRYPT_ALGORITHM_IDENTIFIER UserKeyingMaterial; + DWORD cRecipientEncryptedKeys; + PCMSG_RECIPIENT_ENCRYPTED_KEY_INFO *rgpRecipientEncryptedKeys; +} CMSG_KEY_AGREE_RECIPIENT_INFO, *PCMSG_KEY_AGREE_RECIPIENT_INFO; + +#define CMSG_KEY_AGREE_ORIGINATOR_CERT 1 +#define CMSG_KEY_AGREE_ORIGINATOR_PUBLIC_KEY 2 + +typedef struct _CMSG_MAIL_LIST_RECIPIENT_INFO { + DWORD dwVersion; + CRYPT_DATA_BLOB KeyId; + CRYPT_ALGORITHM_IDENTIFIER KeyEncryptionAlgorithm; + CRYPT_DATA_BLOB EncryptedKey; + FILETIME Date; + PCRYPT_ATTRIBUTE_TYPE_VALUE pOtherAttr; +} CMSG_MAIL_LIST_RECIPIENT_INFO, *PCMSG_MAIL_LIST_RECIPIENT_INFO; + +typedef struct _CMSG_CMS_RECIPIENT_INFO { + DWORD dwRecipientChoice; + union { + PCMSG_KEY_TRANS_RECIPIENT_INFO pKeyTrans; + PCMSG_KEY_AGREE_RECIPIENT_INFO pKeyAgree; + PCMSG_MAIL_LIST_RECIPIENT_INFO pMailList; + } DUMMYUNIONNAME; +} CMSG_CMS_RECIPIENT_INFO, *PCMSG_CMS_RECIPIENT_INFO; + +#define CMSG_ENVELOPED_RECIPIENT_V0 0 +#define CMSG_ENVELOPED_RECIPIENT_V2 2 +#define CMSG_ENVELOPED_RECIPIENT_V3 3 +#define CMSG_ENVELOPED_RECIPIENT_V4 4 +#define CMSG_KEY_TRANS_PKCS_1_5_VERSION CMSG_ENVELOPED_RECIPIENT_V0 +#define CMSG_KEY_TRANS_CMS_VERSION CMSG_ENVELOPED_RECIPIENT_V2 +#define CMSG_KEY_AGREE_VERSION CMSG_ENVELOPED_RECIPIENT_V3 +#define CMSG_MAIL_LIST_VERSION CMSG_ENVELOPED_RECIPIENT_V4 + /* CryptMsgGetAndVerifySigner flags */ #define CMSG_TRUSTED_SIGNER_FLAG 0x1 #define CMSG_SIGNER_ONLY_FLAG 0x2

1 0

Huw Davies : include: Fix CRYPT_SMIME_CAPABILITIES definition.
by Alexandre Julliard Aug. 20, 2008

Aug. 20, 2008

Module: wine Branch: master Commit: 395a4e50ed5342d9b9fd6f8e12c8c27fb4812d24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=395a4e50ed5342d9b9fd6f8e1… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Aug 19 18:15:36 2008 +0100 include: Fix CRYPT_SMIME_CAPABILITIES definition. --- include/wincrypt.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index 5d8b203..11ad77f 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -675,7 +675,7 @@ typedef struct _CRYPT_SMIME_CAPABILITY { typedef struct _CRYPT_SMIME_CAPABILITIES { DWORD cCapability; - CRYPT_SMIME_CAPABILITY rgCapability; + PCRYPT_SMIME_CAPABILITY rgCapability; } CRYPT_SMIME_CAPABILITIES, *PCRYPT_SMIME_CAPABILITIES; typedef struct _VTableProvStruc {

1 0

Roy Shea : mstask: Stub implementation of Activate.
by Alexandre Julliard Aug. 19, 2008

Aug. 19, 2008

Module: wine Branch: master Commit: 77ea6ef814a2dff8c9ccc43b7de1af1140e2081c URL: http://source.winehq.org/git/wine.git/?a=commit;h=77ea6ef814a2dff8c9ccc43b7… Author: Roy Shea <royshea(a)gmail.com> Date: Mon Aug 18 17:23:42 2008 -0700 mstask: Stub implementation of Activate. --- dlls/mstask/task_scheduler.c | 6 ++++-- dlls/mstask/tests/task_scheduler.c | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/mstask/task_scheduler.c b/dlls/mstask/task_scheduler.c index bd4cc1d..5efa086 100644 --- a/dlls/mstask/task_scheduler.c +++ b/dlls/mstask/task_scheduler.c @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "corerror.h" #include "mstask_private.h" #include "wine/debug.h" @@ -99,9 +100,10 @@ static HRESULT WINAPI MSTASK_ITaskScheduler_Activate( REFIID riid, IUnknown **ppunk) { - FIXME("%p, %s, %s, %p: stub\n", iface, debugstr_w(pwszName), + TRACE("%p, %s, %s, %p: stub\n", iface, debugstr_w(pwszName), debugstr_guid(riid), ppunk); - return E_NOTIMPL; + FIXME("Partial stub always returning COR_E_FILENOTFOUND\n"); + return COR_E_FILENOTFOUND; } static HRESULT WINAPI MSTASK_ITaskScheduler_Delete( diff --git a/dlls/mstask/tests/task_scheduler.c b/dlls/mstask/tests/task_scheduler.c index d115dd2..af3a565 100644 --- a/dlls/mstask/tests/task_scheduler.c +++ b/dlls/mstask/tests/task_scheduler.c @@ -96,7 +96,7 @@ static void test_Activate(void) /* Attempt to Activate a non-existant task */ hres = ITaskScheduler_Activate(test_task_scheduler, not_task_name, &IID_ITask, (IUnknown**)&task); - todo_wine ok(hres == COR_E_FILENOTFOUND, "Expected COR_E_FILENOTFOUND: %08x\n", hres); + ok(hres == COR_E_FILENOTFOUND, "Expected COR_E_FILENOTFOUND: %08x\n", hres); ITaskScheduler_Release(test_task_scheduler); return;

1 0