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

Juan Lang : crypt32: Free memory using the correct function on failure.
by Alexandre Julliard Aug. 19, 2008

Aug. 19, 2008

Module: wine Branch: master Commit: 1799ceb8c1a0764d9ae8077207f661ec55c01c07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1799ceb8c1a0764d9ae807720… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 15 16:39:09 2008 -0700 crypt32: Free memory using the correct function on failure. --- dlls/crypt32/encode.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index ee42a3d..0d62b02 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -1561,6 +1561,14 @@ static BOOL CRYPT_AsnEncodeUnicodeStringCoerce(const CERT_NAME_VALUE *value, return ret; } +static void CRYPT_FreeSpace(PCRYPT_ENCODE_PARA pEncodePara, LPVOID pv) +{ + if (pEncodePara && pEncodePara->pfnFree) + pEncodePara->pfnFree(pv); + else + LocalFree(pv); +} + static BOOL CRYPT_AsnEncodeNumericString(const CERT_NAME_VALUE *value, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) @@ -1602,7 +1610,7 @@ static BOOL CRYPT_AsnEncodeNumericString(const CERT_NAME_VALUE *value, } } if (!ret && (dwFlags & CRYPT_ENCODE_ALLOC_FLAG)) - CryptMemFree(*(BYTE **)pbEncoded); + CRYPT_FreeSpace(pEncodePara, *(BYTE **)pbEncoded); } } return ret; @@ -1656,7 +1664,7 @@ static BOOL CRYPT_AsnEncodePrintableString(const CERT_NAME_VALUE *value, } } if (!ret && (dwFlags & CRYPT_ENCODE_ALLOC_FLAG)) - CryptMemFree(*(BYTE **)pbEncoded); + CRYPT_FreeSpace(pEncodePara, *(BYTE **)pbEncoded); } } return ret; @@ -1703,7 +1711,7 @@ static BOOL CRYPT_AsnEncodeIA5String(const CERT_NAME_VALUE *value, } } if (!ret && (dwFlags & CRYPT_ENCODE_ALLOC_FLAG)) - CryptMemFree(*(BYTE **)pbEncoded); + CRYPT_FreeSpace(pEncodePara, *(BYTE **)pbEncoded); } } return ret;

1 0

Juan Lang : crypt32: Set *pcbStructInfo on more success paths.
by Alexandre Julliard Aug. 19, 2008

Aug. 19, 2008

Module: wine Branch: master Commit: 802770299dc03228e8aaa8097107e9cd8517881d URL: http://source.winehq.org/git/wine.git/?a=commit;h=802770299dc03228e8aaa8097… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 14 12:48:59 2008 -0700 crypt32: Set *pcbStructInfo on more success paths. --- dlls/crypt32/decode.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 3ac3ebb..a5df225 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -2285,6 +2285,7 @@ static BOOL CRYPT_AsnDecodeBool(const BYTE *pbEncoded, DWORD cbEncoded, } else { + *pcbStructInfo = sizeof(BOOL); *(BOOL *)pvStructInfo = pbEncoded[2] ? TRUE : FALSE; ret = TRUE; } @@ -2761,6 +2762,7 @@ static BOOL CRYPT_AsnDecodePathLenConstraint(const BYTE *pbEncoded, struct PATH_LEN_CONSTRAINT *constraint = (struct PATH_LEN_CONSTRAINT *)pvStructInfo; + *pcbStructInfo = bytesNeeded; size = sizeof(constraint->dwPathLenConstraint); ret = CRYPT_AsnDecodeIntInternal(pbEncoded, cbEncoded, dwFlags, &constraint->dwPathLenConstraint, &size, pcbDecoded); @@ -2962,6 +2964,7 @@ static BOOL CRYPT_AsnDecodeOctetsInternal(const BYTE *pbEncoded, { CRYPT_DATA_BLOB *blob; + *pcbStructInfo = bytesNeeded; blob = (CRYPT_DATA_BLOB *)pvStructInfo; blob->cbData = dataLen; if (dwFlags & CRYPT_DECODE_NOCOPY_FLAG) @@ -3063,6 +3066,7 @@ static BOOL CRYPT_AsnDecodeBitsInternal(const BYTE *pbEncoded, DWORD cbEncoded, { CRYPT_BIT_BLOB *blob; + *pcbStructInfo = bytesNeeded; blob = (CRYPT_BIT_BLOB *)pvStructInfo; blob->cbData = dataLen - 1; blob->cUnusedBits = *(pbEncoded + 1 + lenBytes); @@ -3250,6 +3254,7 @@ static BOOL CRYPT_AsnDecodeIntegerInternal(const BYTE *pbEncoded, { CRYPT_INTEGER_BLOB *blob = (CRYPT_INTEGER_BLOB *)pvStructInfo; + *pcbStructInfo = bytesNeeded; blob->cbData = dataLen; assert(blob->pbData); if (blob->cbData) @@ -3343,6 +3348,7 @@ static BOOL CRYPT_AsnDecodeUnsignedIntegerInternal(const BYTE *pbEncoded, { CRYPT_INTEGER_BLOB *blob = (CRYPT_INTEGER_BLOB *)pvStructInfo; + *pcbStructInfo = bytesNeeded; blob->cbData = dataLen; assert(blob->pbData); /* remove leading zero byte if it exists */ @@ -3939,6 +3945,7 @@ static BOOL CRYPT_AsnDecodeDistPointName(const BYTE *pbEncoded, { CRL_DIST_POINT_NAME *name = (CRL_DIST_POINT_NAME *)pvStructInfo; + *pcbStructInfo = bytesNeeded; if (dataLen) { name->dwDistPointNameChoice = CRL_DIST_POINT_FULL_NAME;

1 0

Juan Lang : crypt32: Implement CERT_SIGNATURE_HASH_PROP_ID.
by Alexandre Julliard Aug. 19, 2008

Aug. 19, 2008

Module: wine Branch: master Commit: e763923b07569a0e735df1c00137301c45515a83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e763923b07569a0e735df1c00… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 8 10:36:45 2008 -0700 crypt32: Implement CERT_SIGNATURE_HASH_PROP_ID. --- dlls/crypt32/cert.c | 11 +++++- dlls/crypt32/tests/cert.c | 73 +++++++++++++++++++++++++++++--------------- 2 files changed, 57 insertions(+), 27 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 7eedd52..4d5d5e4 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -239,8 +239,15 @@ static BOOL WINAPI CertContext_GetProperty(void *context, DWORD dwPropId, pvData, pcbData); break; case CERT_SIGNATURE_HASH_PROP_ID: - FIXME("CERT_SIGNATURE_HASH_PROP_ID unimplemented\n"); - SetLastError(CRYPT_E_NOT_FOUND); + ret = CryptHashToBeSigned(0, pCertContext->dwCertEncodingType, + pCertContext->pbCertEncoded, pCertContext->cbCertEncoded, pvData, + pcbData); + if (ret && pvData) + { + CRYPT_DATA_BLOB blob = { *pcbData, pvData }; + + ret = CertContext_SetProperty(context, dwPropId, 0, &blob); + } break; case CERT_KEY_IDENTIFIER_PROP_ID: { diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 118b6b0..515098a 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -372,6 +372,32 @@ static const BYTE v1CertWithSubjectKeyId[] = { 0x4c,0x61,0x6e,0x67,0x00 }; static const BYTE subjectKeyId[] = { 0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e,0x67,0x00 }; +static const BYTE selfSignedCert[] = { + 0x30, 0x82, 0x01, 0x1f, 0x30, 0x81, 0xce, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, + 0x10, 0xeb, 0x0d, 0x57, 0x2a, 0x9c, 0x09, 0xba, 0xa4, 0x4a, 0xb7, 0x25, 0x49, + 0xd9, 0x3e, 0xb5, 0x73, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03, 0x02, 0x1d, + 0x05, 0x00, 0x30, 0x15, 0x31, 0x13, 0x30, 0x11, 0x06, 0x03, 0x55, 0x04, 0x03, + 0x13, 0x0a, 0x4a, 0x75, 0x61, 0x6e, 0x20, 0x4c, 0x61, 0x6e, 0x67, 0x00, 0x30, + 0x1e, 0x17, 0x0d, 0x30, 0x36, 0x30, 0x36, 0x32, 0x39, 0x30, 0x35, 0x30, 0x30, + 0x34, 0x36, 0x5a, 0x17, 0x0d, 0x30, 0x37, 0x30, 0x36, 0x32, 0x39, 0x31, 0x31, + 0x30, 0x30, 0x34, 0x36, 0x5a, 0x30, 0x15, 0x31, 0x13, 0x30, 0x11, 0x06, 0x03, + 0x55, 0x04, 0x03, 0x13, 0x0a, 0x4a, 0x75, 0x61, 0x6e, 0x20, 0x4c, 0x61, 0x6e, + 0x67, 0x00, 0x30, 0x5c, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, + 0x0d, 0x01, 0x01, 0x01, 0x05, 0x00, 0x03, 0x4b, 0x00, 0x30, 0x48, 0x02, 0x41, + 0x00, 0xe2, 0x54, 0x3a, 0xa7, 0x83, 0xb1, 0x27, 0x14, 0x3e, 0x59, 0xbb, 0xb4, + 0x53, 0xe6, 0x1f, 0xe7, 0x5d, 0xf1, 0x21, 0x68, 0xad, 0x85, 0x53, 0xdb, 0x6b, + 0x1e, 0xeb, 0x65, 0x97, 0x03, 0x86, 0x60, 0xde, 0xf3, 0x6c, 0x38, 0x75, 0xe0, + 0x4c, 0x61, 0xbb, 0xbc, 0x62, 0x17, 0xa9, 0xcd, 0x79, 0x3f, 0x21, 0x4e, 0x96, + 0xcb, 0x0e, 0xdc, 0x61, 0x94, 0x30, 0x18, 0x10, 0x6b, 0xd0, 0x1c, 0x10, 0x79, + 0x02, 0x03, 0x01, 0x00, 0x01, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03, 0x02, + 0x1d, 0x05, 0x00, 0x03, 0x41, 0x00, 0x25, 0x90, 0x53, 0x34, 0xd9, 0x56, 0x41, + 0x5e, 0xdb, 0x7e, 0x01, 0x36, 0xec, 0x27, 0x61, 0x5e, 0xb7, 0x4d, 0x90, 0x66, + 0xa2, 0xe1, 0x9d, 0x58, 0x76, 0xd4, 0x9c, 0xba, 0x2c, 0x84, 0xc6, 0x83, 0x7a, + 0x22, 0x0d, 0x03, 0x69, 0x32, 0x1a, 0x6d, 0xcb, 0x0c, 0x15, 0xb3, 0x6b, 0xc7, + 0x0a, 0x8c, 0xb4, 0x5c, 0x34, 0x78, 0xe0, 0x3c, 0x9c, 0xe9, 0xf3, 0x30, 0x9f, + 0xa8, 0x76, 0x57, 0x92, 0x36 }; +static const BYTE selfSignedSignatureHash[] = { 0x07,0x5a,0x3e,0xfd,0x0d,0xf6, + 0x88,0xeb,0x00,0x64,0xbd,0xc9,0xd6,0xea,0x0a,0x7c,0xcc,0x24,0xdb,0x5d }; static void testCertProperties(void) { @@ -481,6 +507,13 @@ static void testCertProperties(void) checkHash(bigCert, sizeof(bigCert), CALG_MD5, context, CERT_MD5_HASH_PROP_ID); + /* Getting the signature hash fails with this bogus certificate */ + size = 0; + ret = CertGetCertificateContextProperty(context, + CERT_SIGNATURE_HASH_PROP_ID, NULL, &size); + ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG, + "Expected CRYPT_E_ASN1_BADTAG, got %08x\n", GetLastError()); + /* Test key contexts and handles and such */ size = 0; ret = CertGetCertificateContextProperty(context, CERT_KEY_CONTEXT_PROP_ID, @@ -574,6 +607,21 @@ static void testCertProperties(void) } } CertFreeCertificateContext(context); + + context = CertCreateCertificateContext(X509_ASN_ENCODING, + selfSignedCert, sizeof(selfSignedCert)); + /* Getting the signature hash of a valid (self-signed) cert succeeds */ + size = 0; + ret = CertGetCertificateContextProperty(context, + CERT_SIGNATURE_HASH_PROP_ID, NULL, &size); + ok(ret, "CertGetCertificateContextProperty failed: %08x\n", GetLastError()); + ok(size == sizeof(selfSignedSignatureHash), "unexpected size %d\n", size); + ret = CertGetCertificateContextProperty(context, + CERT_SIGNATURE_HASH_PROP_ID, hashProperty, &size); + if (ret) + ok(!memcmp(hashProperty, selfSignedSignatureHash, size), + "unexpected value\n"); + CertFreeCertificateContext(context); } static void testDupCert(void) @@ -2746,31 +2794,6 @@ static BYTE privKey[] = { 0x93, 0x32, 0x16, 0xec, 0x69, 0x51, 0x1a, 0x4e, 0xc3, 0xf1, 0x72, 0x80, 0x78, 0x5e, 0x66, 0x4a, 0x8d, 0x85, 0x2f, 0x3f, 0xb2, 0xa7 }; -static const BYTE selfSignedCert[] = { - 0x30, 0x82, 0x01, 0x1f, 0x30, 0x81, 0xce, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, - 0x10, 0xeb, 0x0d, 0x57, 0x2a, 0x9c, 0x09, 0xba, 0xa4, 0x4a, 0xb7, 0x25, 0x49, - 0xd9, 0x3e, 0xb5, 0x73, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03, 0x02, 0x1d, - 0x05, 0x00, 0x30, 0x15, 0x31, 0x13, 0x30, 0x11, 0x06, 0x03, 0x55, 0x04, 0x03, - 0x13, 0x0a, 0x4a, 0x75, 0x61, 0x6e, 0x20, 0x4c, 0x61, 0x6e, 0x67, 0x00, 0x30, - 0x1e, 0x17, 0x0d, 0x30, 0x36, 0x30, 0x36, 0x32, 0x39, 0x30, 0x35, 0x30, 0x30, - 0x34, 0x36, 0x5a, 0x17, 0x0d, 0x30, 0x37, 0x30, 0x36, 0x32, 0x39, 0x31, 0x31, - 0x30, 0x30, 0x34, 0x36, 0x5a, 0x30, 0x15, 0x31, 0x13, 0x30, 0x11, 0x06, 0x03, - 0x55, 0x04, 0x03, 0x13, 0x0a, 0x4a, 0x75, 0x61, 0x6e, 0x20, 0x4c, 0x61, 0x6e, - 0x67, 0x00, 0x30, 0x5c, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, - 0x0d, 0x01, 0x01, 0x01, 0x05, 0x00, 0x03, 0x4b, 0x00, 0x30, 0x48, 0x02, 0x41, - 0x00, 0xe2, 0x54, 0x3a, 0xa7, 0x83, 0xb1, 0x27, 0x14, 0x3e, 0x59, 0xbb, 0xb4, - 0x53, 0xe6, 0x1f, 0xe7, 0x5d, 0xf1, 0x21, 0x68, 0xad, 0x85, 0x53, 0xdb, 0x6b, - 0x1e, 0xeb, 0x65, 0x97, 0x03, 0x86, 0x60, 0xde, 0xf3, 0x6c, 0x38, 0x75, 0xe0, - 0x4c, 0x61, 0xbb, 0xbc, 0x62, 0x17, 0xa9, 0xcd, 0x79, 0x3f, 0x21, 0x4e, 0x96, - 0xcb, 0x0e, 0xdc, 0x61, 0x94, 0x30, 0x18, 0x10, 0x6b, 0xd0, 0x1c, 0x10, 0x79, - 0x02, 0x03, 0x01, 0x00, 0x01, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03, 0x02, - 0x1d, 0x05, 0x00, 0x03, 0x41, 0x00, 0x25, 0x90, 0x53, 0x34, 0xd9, 0x56, 0x41, - 0x5e, 0xdb, 0x7e, 0x01, 0x36, 0xec, 0x27, 0x61, 0x5e, 0xb7, 0x4d, 0x90, 0x66, - 0xa2, 0xe1, 0x9d, 0x58, 0x76, 0xd4, 0x9c, 0xba, 0x2c, 0x84, 0xc6, 0x83, 0x7a, - 0x22, 0x0d, 0x03, 0x69, 0x32, 0x1a, 0x6d, 0xcb, 0x0c, 0x15, 0xb3, 0x6b, 0xc7, - 0x0a, 0x8c, 0xb4, 0x5c, 0x34, 0x78, 0xe0, 0x3c, 0x9c, 0xe9, 0xf3, 0x30, 0x9f, - 0xa8, 0x76, 0x57, 0x92, 0x36 }; - static const BYTE exportedPublicKeyBlob[] = { 0x06,0x02,0x00,0x00,0x00,0xa4,0x00,0x00,0x52,0x53,0x41,0x31,0x00,0x02,0x00,0x00, 0x01,0x00,0x01,0x00,0x79,0x10,0x1c,0xd0,0x6b,0x10,0x18,0x30,0x94,0x61,0xdc,0x0e,

1 0

Juan Lang : crypt32: Implement CryptHashToBeSigned.
by Alexandre Julliard Aug. 19, 2008

Aug. 19, 2008

Module: wine Branch: master Commit: d8da3e83ff5bcb0e406c508de58cd081a7434bad URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8da3e83ff5bcb0e406c508de… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 8 10:25:43 2008 -0700 crypt32: Implement CryptHashToBeSigned. --- dlls/crypt32/cert.c | 40 ++++++++++++++++++++++++++++++++++++++-- dlls/crypt32/tests/cert.c | 5 ----- 2 files changed, 38 insertions(+), 7 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 0dc10c0..7eedd52 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1534,9 +1534,45 @@ BOOL WINAPI CryptHashToBeSigned(HCRYPTPROV_LEGACY hCryptProv, DWORD dwCertEncodingType, const BYTE *pbEncoded, DWORD cbEncoded, BYTE *pbComputedHash, DWORD *pcbComputedHash) { - FIXME("(%08lx, %08x, %p, %d, %p, %d): stub\n", hCryptProv, dwCertEncodingType, + BOOL ret; + CERT_SIGNED_CONTENT_INFO *info; + DWORD size; + + TRACE("(%08lx, %08x, %p, %d, %p, %d)\n", hCryptProv, dwCertEncodingType, pbEncoded, cbEncoded, pbComputedHash, *pcbComputedHash); - return FALSE; + + ret = CryptDecodeObjectEx(dwCertEncodingType, X509_CERT, + pbEncoded, cbEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL, (void *)&info, &size); + if (ret) + { + PCCRYPT_OID_INFO oidInfo; + HCRYPTHASH hHash; + + if (!hCryptProv) + hCryptProv = CRYPT_GetDefaultProvider(); + oidInfo = CryptFindOIDInfo(CRYPT_OID_INFO_OID_KEY, + info->SignatureAlgorithm.pszObjId, 0); + if (!oidInfo) + { + SetLastError(NTE_BAD_ALGID); + ret = FALSE; + } + else + { + ret = CryptCreateHash(hCryptProv, oidInfo->u.Algid, 0, 0, &hHash); + if (ret) + { + ret = CryptHashData(hHash, info->ToBeSigned.pbData, + info->ToBeSigned.cbData, 0); + if (ret) + ret = CryptGetHashParam(hHash, HP_HASHVAL, pbComputedHash, + pcbComputedHash, 0); + CryptDestroyHash(hHash); + } + } + LocalFree(info); + } + return ret; } BOOL WINAPI CryptSignCertificate(HCRYPTPROV_OR_NCRYPT_KEY_HANDLE hCryptProv, diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index ce3bf88..118b6b0 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -2575,33 +2575,28 @@ static void testHashToBeSigned(void) "expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); SetLastError(0xdeadbeef); ret = CryptHashToBeSigned(0, X509_ASN_ENCODING, NULL, 0, NULL, &size); - todo_wine ok(!ret && GetLastError() == CRYPT_E_ASN1_EOD, "expected CRYPT_E_ASN1_EOD, got %08x\n", GetLastError()); /* Can't sign anything: has to be asn.1 encoded, at least */ SetLastError(0xdeadbeef); ret = CryptHashToBeSigned(0, X509_ASN_ENCODING, int1, sizeof(int1), NULL, &size); - todo_wine ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG, "expected CRYPT_E_ASN1_BADTAG, got %08x\n", GetLastError()); /* Can't be empty, either */ SetLastError(0xdeadbeef); ret = CryptHashToBeSigned(0, X509_ASN_ENCODING, emptyCert, sizeof(emptyCert), NULL, &size); - todo_wine ok(!ret && GetLastError() == CRYPT_E_ASN1_CORRUPT, "expected CRYPT_E_ASN1_CORRUPT, got %08x\n", GetLastError()); /* Signing a cert works */ ret = CryptHashToBeSigned(0, X509_ASN_ENCODING, md5SignedEmptyCert, sizeof(md5SignedEmptyCert), NULL, &size); - todo_wine { ok(ret, "CryptHashToBeSigned failed: %08x\n", GetLastError()); ok(size == sizeof(md5SignedEmptyCertHash), "unexpected size %d\n", size); ret = CryptHashToBeSigned(0, X509_ASN_ENCODING, md5SignedEmptyCert, sizeof(md5SignedEmptyCert), hash, &size); ok(!memcmp(hash, md5SignedEmptyCertHash, size), "unexpected value\n"); - } } static void testCompareCert(void)

1 0

Juan Lang : crypt32: Add tests for CryptHashToBeSigned.
by Alexandre Julliard Aug. 19, 2008

Aug. 19, 2008

Module: wine Branch: master Commit: b18919bef7c3201bd673b04e1af7590b8744e3d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b18919bef7c3201bd673b04e1… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 8 10:04:50 2008 -0700 crypt32: Add tests for CryptHashToBeSigned. --- dlls/crypt32/tests/cert.c | 51 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 2217da7..ce3bf88 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -2554,6 +2554,56 @@ static void testHashPublicKeyInfo(void) } } +static const BYTE md5SignedEmptyCertHash[] = { 0xfb,0x0f,0x66,0x82,0x66,0xd9, + 0xe5,0xf8,0xd8,0xa2,0x55,0x2b,0xe1,0xa5,0xd9,0x04 }; + +static void testHashToBeSigned(void) +{ + BOOL ret; + DWORD size; + BYTE hash[16]; + + /* Crash */ + if (0) + { + ret = CryptHashToBeSigned(0, 0, NULL, 0, NULL, NULL); + } + SetLastError(0xdeadbeef); + ret = CryptHashToBeSigned(0, 0, NULL, 0, NULL, &size); + todo_wine + ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, + "expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = CryptHashToBeSigned(0, X509_ASN_ENCODING, NULL, 0, NULL, &size); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_ASN1_EOD, + "expected CRYPT_E_ASN1_EOD, got %08x\n", GetLastError()); + /* Can't sign anything: has to be asn.1 encoded, at least */ + SetLastError(0xdeadbeef); + ret = CryptHashToBeSigned(0, X509_ASN_ENCODING, int1, sizeof(int1), + NULL, &size); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG, + "expected CRYPT_E_ASN1_BADTAG, got %08x\n", GetLastError()); + /* Can't be empty, either */ + SetLastError(0xdeadbeef); + ret = CryptHashToBeSigned(0, X509_ASN_ENCODING, emptyCert, + sizeof(emptyCert), NULL, &size); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_ASN1_CORRUPT, + "expected CRYPT_E_ASN1_CORRUPT, got %08x\n", GetLastError()); + /* Signing a cert works */ + ret = CryptHashToBeSigned(0, X509_ASN_ENCODING, md5SignedEmptyCert, + sizeof(md5SignedEmptyCert), NULL, &size); + todo_wine { + ok(ret, "CryptHashToBeSigned failed: %08x\n", GetLastError()); + ok(size == sizeof(md5SignedEmptyCertHash), "unexpected size %d\n", size); + ret = CryptHashToBeSigned(0, X509_ASN_ENCODING, md5SignedEmptyCert, + sizeof(md5SignedEmptyCert), hash, &size); + ok(!memcmp(hash, md5SignedEmptyCertHash, size), "unexpected value\n"); + } +} + static void testCompareCert(void) { CERT_INFO info1 = { 0 }, info2 = { 0 }; @@ -3031,6 +3081,7 @@ START_TEST(cert) testCompareIntegerBlob(); testComparePublicKeyInfo(); testHashPublicKeyInfo(); + testHashToBeSigned(); testCompareCert(); testVerifySubjectCert(); testVerifyRevocation();

1 0

Juan Lang : crypt32: Add stub for CryptHashToBeSigned.
by Alexandre Julliard Aug. 19, 2008

Aug. 19, 2008

Module: wine Branch: master Commit: f5eb6caf05467413f1a6c4c0d68232c76aa3ca0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5eb6caf05467413f1a6c4c0d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 8 10:02:21 2008 -0700 crypt32: Add stub for CryptHashToBeSigned. --- dlls/crypt32/cert.c | 9 +++++++++ dlls/crypt32/crypt32.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 2ab147a..0dc10c0 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1530,6 +1530,15 @@ BOOL WINAPI CryptHashPublicKeyInfo(HCRYPTPROV_LEGACY hCryptProv, ALG_ID Algid, return ret; } +BOOL WINAPI CryptHashToBeSigned(HCRYPTPROV_LEGACY hCryptProv, + DWORD dwCertEncodingType, const BYTE *pbEncoded, DWORD cbEncoded, + BYTE *pbComputedHash, DWORD *pcbComputedHash) +{ + FIXME("(%08lx, %08x, %p, %d, %p, %d): stub\n", hCryptProv, dwCertEncodingType, + pbEncoded, cbEncoded, pbComputedHash, *pcbComputedHash); + return FALSE; +} + BOOL WINAPI CryptSignCertificate(HCRYPTPROV_OR_NCRYPT_KEY_HANDLE hCryptProv, DWORD dwKeySpec, DWORD dwCertEncodingType, const BYTE *pbEncodedToBeSigned, DWORD cbEncodedToBeSigned, PCRYPT_ALGORITHM_IDENTIFIER pSignatureAlgorithm, diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index 6db95ab..fab52a0 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -131,7 +131,7 @@ @ stdcall CryptHashCertificate(long long long ptr long ptr ptr) @ stdcall CryptHashMessage(ptr long long ptr ptr ptr ptr ptr ptr) @ stdcall CryptHashPublicKeyInfo(long long long long ptr ptr ptr) -@ stub CryptHashToBeSigned +@ stdcall CryptHashToBeSigned(ptr long ptr long ptr ptr) @ stub CryptImportPKCS8 @ stdcall CryptImportPublicKeyInfo(long long ptr ptr) @ stdcall CryptImportPublicKeyInfoEx(long long ptr long long ptr ptr)

1 0

Juan Lang : crypt32: Add stub for CryptMsgVerifyCountersignatureEncodedEx.
by Alexandre Julliard Aug. 19, 2008

Aug. 19, 2008

Module: wine Branch: master Commit: 8f74b60f87e190680dcbcb32772ab11c047c2ec8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f74b60f87e190680dcbcb327… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 8 08:59:59 2008 -0700 crypt32: Add stub for CryptMsgVerifyCountersignatureEncodedEx. --- dlls/crypt32/crypt32.spec | 1 + dlls/crypt32/msg.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index 485421f..6db95ab 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -155,6 +155,7 @@ @ stub CryptMsgSignCTL @ stdcall CryptMsgUpdate(ptr ptr long long) @ stub CryptMsgVerifyCountersignatureEncoded +@ stdcall CryptMsgVerifyCountersignatureEncodedEx(ptr long ptr long ptr long long ptr long ptr) @ stdcall CryptProtectData(ptr wstr ptr ptr ptr long ptr) @ stdcall CryptQueryObject(long ptr long long long ptr ptr ptr ptr ptr ptr) @ stdcall CryptRegisterDefaultOIDFunction(long str long wstr) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index ff4e0f4..63121fd 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -2561,3 +2561,14 @@ BOOL WINAPI CryptMsgGetAndVerifySigner(HCRYPTMSG hCryptMsg, DWORD cSignerStore, CertCloseStore(store, 0); return ret; } + +BOOL WINAPI CryptMsgVerifyCountersignatureEncodedEx(HCRYPTPROV_LEGACY hCryptProv, + DWORD dwEncodingType, PBYTE pbSignerInfo, DWORD cbSignerInfo, + PBYTE pbSignerInfoCountersignature, DWORD cbSignerInfoCountersignature, + DWORD dwSignerType, void *pvSigner, DWORD dwFlags, void *pvReserved) +{ + FIXME("(%08lx, %08x, %p, %d, %p, %d, %d, %p, %08x, %p): stub\n", hCryptProv, + dwEncodingType, pbSignerInfo, cbSignerInfo, pbSignerInfoCountersignature, + cbSignerInfoCountersignature, dwSignerType, pvSigner, dwFlags, pvReserved); + return FALSE; +}

1 0

Christian Costa : winealsa.drv: Improve midi port names.
by Alexandre Julliard Aug. 19, 2008

Aug. 19, 2008

Module: wine Branch: master Commit: 9a82c8071d5cdbe4cba9df056dfbb2cecc103d27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a82c8071d5cdbe4cba9df056… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Aug 18 17:26:48 2008 +0200 winealsa.drv: Improve midi port names. --- dlls/winealsa.drv/midi.c | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 3e791d5..7c51d34 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -1115,6 +1115,8 @@ static DWORD modReset(WORD wDevID) */ static void ALSA_AddMidiPort(snd_seq_client_info_t* cinfo, snd_seq_port_info_t* pinfo, int cap, int type) { + char midiPortName[MAXPNAMELEN]; + if (cap & SND_SEQ_PORT_CAP_WRITE) { TRACE("OUT (%d:%s:%s:%d:%s:%x)\n",snd_seq_client_info_get_client(cinfo), snd_seq_client_info_get_name(cinfo), @@ -1146,7 +1148,17 @@ static void ALSA_AddMidiPort(snd_seq_client_info_t* cinfo, snd_seq_port_info_t* * not MIDICAPS_CACHE. */ MidiOutDev[MODM_NumDevs].caps.dwSupport = MIDICAPS_VOLUME|MIDICAPS_LRVOLUME; - MultiByteToWideChar(CP_ACP, 0, snd_seq_client_info_get_name(cinfo), -1, + + /* Try to use both client and port names, if this is too long take the port name only. + In the second case the port name should be explicit enough due to its big size. + */ + if ( (strlen(snd_seq_client_info_get_name(cinfo)) + strlen(snd_seq_port_info_get_name(pinfo)) + 3) < MAXPNAMELEN ) { + sprintf(midiPortName, "%s - %s", snd_seq_client_info_get_name(cinfo), snd_seq_port_info_get_name(pinfo)); + } else { + lstrcpynA(midiPortName, snd_seq_port_info_get_name(pinfo), MAXPNAMELEN-1); + midiPortName[MAXPNAMELEN-1] = 0; + } + MultiByteToWideChar(CP_ACP, 0, midiPortName, -1, MidiOutDev[MODM_NumDevs].caps.szPname, sizeof(MidiOutDev[MODM_NumDevs].caps.szPname) / sizeof(WCHAR)); @@ -1201,7 +1213,17 @@ static void ALSA_AddMidiPort(snd_seq_client_info_t* cinfo, snd_seq_port_info_t* * not MIDICAPS_CACHE. */ MidiInDev[MIDM_NumDevs].caps.dwSupport = MIDICAPS_VOLUME|MIDICAPS_LRVOLUME; - MultiByteToWideChar(CP_ACP, 0, snd_seq_client_info_get_name(cinfo), -1, + + /* Try to use both client and port names, if this is too long take the port name only. + In the second case the port name should be explicit enough due to its big size. + */ + if ( (strlen(snd_seq_client_info_get_name(cinfo)) + strlen(snd_seq_port_info_get_name(pinfo)) + 3) < MAXPNAMELEN ) { + sprintf(midiPortName, "%s - %s", snd_seq_client_info_get_name(cinfo), snd_seq_port_info_get_name(pinfo)); + } else { + lstrcpynA(midiPortName, snd_seq_port_info_get_name(pinfo), MAXPNAMELEN-1); + midiPortName[MAXPNAMELEN-1] = 0; + } + MultiByteToWideChar(CP_ACP, 0, midiPortName, -1, MidiInDev[MIDM_NumDevs].caps.szPname, sizeof(MidiInDev[MIDM_NumDevs].caps.szPname) / sizeof(WCHAR)); MidiInDev[MIDM_NumDevs].state = 0;

1 0

Jacek Caban : mshtml: Use heap_alloc_zero for HTMLWindow allocation.
by Alexandre Julliard Aug. 19, 2008

Aug. 19, 2008

Module: wine Branch: master Commit: 984bff499edcd915cbd8ae6e9f7529ef3c89b0fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=984bff499edcd915cbd8ae6e9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 18 15:53:57 2008 +0200 mshtml: Use heap_alloc_zero for HTMLWindow allocation. It's needed by DispatchEx implementation. --- dlls/mshtml/htmlwindow.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 043e4e9..76efb9d 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1281,7 +1281,7 @@ void setup_nswindow(HTMLWindow *This) HTMLWindow *HTMLWindow_Create(HTMLDocument *doc) { - HTMLWindow *ret = heap_alloc(sizeof(HTMLWindow)); + HTMLWindow *ret = heap_alloc_zero(sizeof(HTMLWindow)); ret->lpHTMLWindow2Vtbl = &HTMLWindow2Vtbl; ret->lpHTMLWindow3Vtbl = &HTMLWindow3Vtbl;

1 0

Rob Shearman : kernel32: Fix a typo in the leadin check in WaitNamedPipeW.
by Alexandre Julliard Aug. 18, 2008

Aug. 18, 2008

Module: wine Branch: master Commit: e1e6caf81cd7edd15c7e68b1f885d429cabbbfb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1e6caf81cd7edd15c7e68b1f… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Aug 17 18:34:09 2008 +0100 kernel32: Fix a typo in the leadin check in WaitNamedPipeW. --- dlls/kernel32/sync.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 5291904..bd6dd05 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1342,7 +1342,7 @@ BOOL WINAPI WaitNamedPipeW (LPCWSTR name, DWORD nTimeOut) if (nt_name.Length >= MAX_PATH * sizeof(WCHAR) || nt_name.Length < sizeof(leadin) || - strncmpiW( nt_name.Buffer, leadin, sizeof(leadin)/sizeof(WCHAR) != 0)) + strncmpiW( nt_name.Buffer, leadin, sizeof(leadin)/sizeof(WCHAR)) != 0) { RtlFreeUnicodeString( &nt_name ); SetLastError( ERROR_PATH_NOT_FOUND );

1 0