September 2007 - Wine-commits

Juan Lang : crypt32: Introduce a helper function to get encoded length that allows indefinite-length encoding .
by Alexandre Julliard 18 Sep '07

18 Sep '07

Module: wine Branch: master Commit: 7ecf5becbd9ce7f62a80cc4294db1f44a62a17c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ecf5becbd9ce7f62a80cc429… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 17 15:09:16 2007 -0700 crypt32: Introduce a helper function to get encoded length that allows indefinite-length encoding. --- dlls/crypt32/decode.c | 25 ++++++++++++++++++++----- 1 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 0421bd0..67f79d5 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -135,9 +135,11 @@ static BOOL WINAPI CRYPT_AsnDecodeUnsignedIntegerInternal( /* Helper function to get the encoded length of the data starting at pbEncoded, * where pbEncoded[0] is the tag. If the data are too short to contain a * length or if the length is too large for cbEncoded, sets an appropriate - * error code and returns FALSE. + * error code and returns FALSE. If the encoded length is unknown due to + * indefinite length encoding, *len is set to CMSG_INDEFINITE_LENGTH. */ -static BOOL CRYPT_GetLen(const BYTE *pbEncoded, DWORD cbEncoded, DWORD *len) +static BOOL CRYPT_GetLengthIndefinite(const BYTE *pbEncoded, DWORD cbEncoded, + DWORD *len) { BOOL ret; @@ -161,9 +163,8 @@ static BOOL CRYPT_GetLen(const BYTE *pbEncoded, DWORD cbEncoded, DWORD *len) } else if (pbEncoded[1] == 0x80) { - FIXME("unimplemented for indefinite-length encoding\n"); - SetLastError(CRYPT_E_ASN1_CORRUPT); - ret = FALSE; + *len = CMSG_INDEFINITE_LENGTH; + ret = TRUE; } else { @@ -204,6 +205,20 @@ static BOOL CRYPT_GetLen(const BYTE *pbEncoded, DWORD cbEncoded, DWORD *len) return ret; } +/* Like CRYPT_GetLengthIndefinite, but disallows indefinite-length encoding. */ +static BOOL CRYPT_GetLen(const BYTE *pbEncoded, DWORD cbEncoded, DWORD *len) +{ + BOOL ret; + + if ((ret = CRYPT_GetLengthIndefinite(pbEncoded, cbEncoded, len)) && + *len == CMSG_INDEFINITE_LENGTH) + { + SetLastError(CRYPT_E_ASN1_CORRUPT); + ret = FALSE; + } + return ret; +} + /* Helper function to check *pcbStructInfo, set it to the required size, and * optionally to allocate memory. Assumes pvStructInfo is not NULL. * If CRYPT_DECODE_ALLOC_FLAG is set in dwFlags, *pvStructInfo will be set to a

1 0

Juan Lang : crypt32: Pass bytes decoded pointer to AsnDecodeArray.
by Alexandre Julliard 18 Sep '07

18 Sep '07

Module: wine Branch: master Commit: b2f02f3bf778412b747d70ed91ce5fe3cb7d1390 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2f02f3bf778412b747d70ed9… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 17 15:07:31 2007 -0700 crypt32: Pass bytes decoded pointer to AsnDecodeArray. --- dlls/crypt32/decode.c | 40 +++++++++++++++++++++++----------------- 1 files changed, 23 insertions(+), 17 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index d684887..323a942 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -510,7 +510,7 @@ struct AsnArrayItemSize static BOOL CRYPT_AsnDecodeArray(const struct AsnArrayDescriptor *arrayDesc, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo, - void *startingPointer) + DWORD *pcbDecoded, void *startingPointer) { BOOL ret = TRUE; @@ -989,7 +989,7 @@ static BOOL WINAPI CRYPT_AsnDecodeCRLEntries(DWORD dwCertEncodingType, pDecodePara, pvStructInfo, *pcbStructInfo); ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags, - pDecodePara, pvStructInfo, pcbStructInfo, + pDecodePara, pvStructInfo, pcbStructInfo, NULL, entries ? entries->rgItems : NULL); TRACE("Returning %d (%08x)\n", ret, GetLastError()); return ret; @@ -1261,7 +1261,8 @@ static BOOL WINAPI CRYPT_AsnDecodeExtensionsInternal(DWORD dwCertEncodingType, pDecodePara, pvStructInfo, *pcbStructInfo); ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags, - pDecodePara, pvStructInfo, pcbStructInfo, exts ? exts->rgExtension : NULL); + pDecodePara, pvStructInfo, pcbStructInfo, NULL, + exts ? exts->rgExtension : NULL); return ret; } @@ -1704,7 +1705,8 @@ static BOOL CRYPT_AsnDecodeRdn(const BYTE *pbEncoded, DWORD cbEncoded, PCERT_RDN rdn = (PCERT_RDN)pvStructInfo; ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags, - NULL, pvStructInfo, pcbStructInfo, rdn ? rdn->rgRDNAttr : NULL); + NULL, pvStructInfo, pcbStructInfo, pcbDecoded, + rdn ? rdn->rgRDNAttr : NULL); return ret; } @@ -1721,7 +1723,7 @@ static BOOL WINAPI CRYPT_AsnDecodeName(DWORD dwCertEncodingType, offsetof(CERT_RDN, rgRDNAttr) }; ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags, - pDecodePara, pvStructInfo, pcbStructInfo, NULL); + pDecodePara, pvStructInfo, pcbStructInfo, NULL, NULL); } __EXCEPT_PAGE_FAULT { @@ -1775,7 +1777,8 @@ static BOOL CRYPT_AsnDecodeUnicodeRdn(const BYTE *pbEncoded, DWORD cbEncoded, PCERT_RDN rdn = (PCERT_RDN)pvStructInfo; ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags, - NULL, pvStructInfo, pcbStructInfo, rdn ? rdn->rgRDNAttr : NULL); + NULL, pvStructInfo, pcbStructInfo, pcbDecoded, + rdn ? rdn->rgRDNAttr : NULL); return ret; } @@ -1792,7 +1795,7 @@ static BOOL WINAPI CRYPT_AsnDecodeUnicodeName(DWORD dwCertEncodingType, offsetof(CERT_RDN, rgRDNAttr) }; ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags, - pDecodePara, pvStructInfo, pcbStructInfo, NULL); + pDecodePara, pvStructInfo, pcbStructInfo, NULL, NULL); } __EXCEPT_PAGE_FAULT { @@ -1855,7 +1858,8 @@ static BOOL WINAPI CRYPT_DecodeDERArray(DWORD dwCertEncodingType, pDecodePara, pvStructInfo, *pcbStructInfo); ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags, - pDecodePara, pvStructInfo, pcbStructInfo, array ? array->rgItems : NULL); + pDecodePara, pvStructInfo, pcbStructInfo, NULL, + array ? array->rgItems : NULL); return ret; } @@ -1941,7 +1945,7 @@ static BOOL WINAPI CRYPT_AsnDecodePKCSAttributesInternal( BOOL ret; ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags, - pDecodePara, pvStructInfo, pcbStructInfo, attrs ? attrs->rgAttr : + pDecodePara, pvStructInfo, pcbStructInfo, NULL, attrs ? attrs->rgAttr : NULL); return ret; } @@ -2304,7 +2308,8 @@ static BOOL WINAPI CRYPT_AsnDecodeAltNameInternal(DWORD dwCertEncodingType, if (info) TRACE("info->rgAltEntry is %p\n", info->rgAltEntry); ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags, - pDecodePara, pvStructInfo, pcbStructInfo, info ? info->rgAltEntry : NULL); + pDecodePara, pvStructInfo, pcbStructInfo, NULL, + info ? info->rgAltEntry : NULL); return ret; } @@ -2559,7 +2564,7 @@ static BOOL WINAPI CRYPT_AsnDecodeAltName(DWORD dwCertEncodingType, offsetof(CERT_ALT_NAME_ENTRY, u.pwszURL) }; ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags, - pDecodePara, pvStructInfo, pcbStructInfo, NULL); + pDecodePara, pvStructInfo, pcbStructInfo, NULL, NULL); } __EXCEPT_PAGE_FAULT { @@ -2638,7 +2643,7 @@ static BOOL WINAPI CRYPT_AsnDecodeSubtreeConstraints(DWORD dwCertEncodingType, pDecodePara, pvStructInfo, *pcbStructInfo); ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags, - pDecodePara, pvStructInfo, pcbStructInfo, + pDecodePara, pvStructInfo, pcbStructInfo, NULL, entries ? entries->rgItems : NULL); TRACE("Returning %d (%08x)\n", ret, GetLastError()); return ret; @@ -3741,7 +3746,7 @@ static BOOL WINAPI CRYPT_AsnDecodeDistPointName(DWORD dwCertEncodingType, ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded + 1 + lenBytes, cbEncoded - 1 - lenBytes, - 0, NULL, NULL, &nameLen, NULL); + 0, NULL, NULL, &nameLen, NULL, NULL); bytesNeeded = sizeof(CRL_DIST_POINT_NAME) + nameLen; } else @@ -3763,7 +3768,7 @@ static BOOL WINAPI CRYPT_AsnDecodeDistPointName(DWORD dwCertEncodingType, name->dwDistPointNameChoice = CRL_DIST_POINT_FULL_NAME; ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded + 1 + lenBytes, cbEncoded - 1 - lenBytes, - 0, NULL, &name->u.FullName, pcbStructInfo, + 0, NULL, &name->u.FullName, pcbStructInfo, NULL, name->u.FullName.rgAltEntry); } else @@ -3818,7 +3823,7 @@ static BOOL WINAPI CRYPT_AsnDecodeCRLDistPoints(DWORD dwCertEncodingType, offsetof(CRL_DIST_POINT, DistPointName.u.FullName.rgAltEntry) }; ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags, - pDecodePara, pvStructInfo, pcbStructInfo, NULL); + pDecodePara, pvStructInfo, pcbStructInfo, NULL, NULL); } __EXCEPT_PAGE_FAULT { @@ -3844,7 +3849,7 @@ static BOOL WINAPI CRYPT_AsnDecodeEnhancedKeyUsage(DWORD dwCertEncodingType, CRYPT_AsnDecodeOidInternal, sizeof(LPSTR), TRUE, 0 }; ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags, - pDecodePara, pvStructInfo, pcbStructInfo, NULL); + pDecodePara, pvStructInfo, pcbStructInfo, NULL, NULL); } __EXCEPT_PAGE_FAULT { @@ -4028,7 +4033,8 @@ static BOOL WINAPI CRYPT_DecodeSignerArray(DWORD dwCertEncodingType, pDecodePara, pvStructInfo, *pcbStructInfo); ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags, - pDecodePara, pvStructInfo, pcbStructInfo, array ? array->rgItems : NULL); + pDecodePara, pvStructInfo, pcbStructInfo, NULL, + array ? array->rgItems : NULL); return ret; }

1 0

Juan Lang : crypt32: Return bytes decoded from AsnDecodeArray.
by Alexandre Julliard 18 Sep '07

18 Sep '07

Module: wine Branch: master Commit: deb07ccb1c5258e2097b591263cd6993a893bba3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=deb07ccb1c5258e2097b59126… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 17 15:07:58 2007 -0700 crypt32: Return bytes decoded from AsnDecodeArray. --- dlls/crypt32/decode.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 323a942..21383ba 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -524,12 +524,13 @@ static BOOL CRYPT_AsnDecodeArray(const struct AsnArrayDescriptor *arrayDesc, if ((ret = CRYPT_GetLen(pbEncoded, cbEncoded, &dataLen))) { - DWORD bytesNeeded, cItems = 0; + DWORD bytesNeeded, cItems = 0, decoded; BYTE lenBytes = GET_LEN_BYTES(pbEncoded[1]); /* There can be arbitrarily many items, but there is often only one. */ struct AsnArrayItemSize itemSize = { 0 }, *itemSizes = &itemSize; + decoded = 1 + lenBytes; bytesNeeded = sizeof(struct GenericArray); if (dataLen) { @@ -538,7 +539,7 @@ static BOOL CRYPT_AsnDecodeArray(const struct AsnArrayDescriptor *arrayDesc, for (ptr = pbEncoded + 1 + lenBytes; ret && ptr - pbEncoded - 1 - lenBytes < dataLen; ) { - DWORD itemLenBytes, itemDataLen, size = 0; + DWORD itemLenBytes, itemDataLen, itemDecoded, size = 0; itemLenBytes = GET_LEN_BYTES(ptr[1]); /* Each item decoded may not tolerate extraneous bytes, so @@ -549,7 +550,8 @@ static BOOL CRYPT_AsnDecodeArray(const struct AsnArrayDescriptor *arrayDesc, if (ret) ret = arrayDesc->decodeFunc(ptr, 1 + itemLenBytes + itemDataLen, - dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, &size, NULL); + dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, &size, + &itemDecoded); if (ret) { DWORD nextLen; @@ -568,6 +570,7 @@ static BOOL CRYPT_AsnDecodeArray(const struct AsnArrayDescriptor *arrayDesc, } if (itemSizes) { + decoded += itemDecoded; itemSizes[cItems - 1].encodedLen = 1 + itemLenBytes + itemDataLen; itemSizes[cItems - 1].size = size; @@ -594,6 +597,8 @@ static BOOL CRYPT_AsnDecodeArray(const struct AsnArrayDescriptor *arrayDesc, const BYTE *ptr; struct GenericArray *array; + if (pcbDecoded) + *pcbDecoded = decoded; if (dwFlags & CRYPT_DECODE_ALLOC_FLAG) pvStructInfo = *(BYTE **)pvStructInfo; array = (struct GenericArray *)pvStructInfo;

1 0

Juan Lang : crypt32: Return bytes decoded when copying DER-encoded bytes.
by Alexandre Julliard 18 Sep '07

18 Sep '07

Module: wine Branch: master Commit: d7e8eed94464649c270a592b209b13f2cdf702eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7e8eed94464649c270a592b2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 17 15:05:15 2007 -0700 crypt32: Return bytes decoded when copying DER-encoded bytes. --- dlls/crypt32/decode.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 6370d81..78bc365 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -1836,6 +1836,8 @@ static BOOL CRYPT_AsnDecodeCopyBytesInternal(const BYTE *pbEncoded, assert(blob->pbData); memcpy(blob->pbData, pbEncoded, blob->cbData); } + if (pcbDecoded) + *pcbDecoded = cbEncoded; } return ret; }

1 0

Juan Lang : crypt32: Return bytes decoded when decoding an alt name entry.
by Alexandre Julliard 18 Sep '07

18 Sep '07

Module: wine Branch: master Commit: 1f4bcb4a3dd9dba6c4fa92ac880d62efb7a31cfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f4bcb4a3dd9dba6c4fa92ac8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 17 15:06:27 2007 -0700 crypt32: Return bytes decoded when decoding an alt name entry. --- dlls/crypt32/decode.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 78bc365..d684887 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -2232,6 +2232,8 @@ static BOOL CRYPT_AsnDecodeAltNameEntry(const BYTE *pbEncoded, DWORD cbEncoded, } if (ret) { + if (pcbDecoded) + *pcbDecoded = 1 + lenBytes + dataLen; if (!entry) *pcbStructInfo = bytesNeeded; else if (*pcbStructInfo < bytesNeeded)

1 0

Juan Lang : crypt32: Add a decoded parameter to AsnDecodeSequence.
by Alexandre Julliard 18 Sep '07

18 Sep '07

Module: wine Branch: master Commit: f3490f3ed8bcbf80aba08916a349ba34541d1eb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3490f3ed8bcbf80aba08916a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 17 15:03:28 2007 -0700 crypt32: Add a decoded parameter to AsnDecodeSequence. --- dlls/crypt32/decode.c | 53 ++++++++++++++++++++++++++---------------------- 1 files changed, 29 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f3490f3ed8bcbf80aba08…

1 0

Juan Lang : crypt32: Make a decode OID function that returns the number of bytes decoded.
by Alexandre Julliard 18 Sep '07

18 Sep '07

Module: wine Branch: master Commit: 1dd1c6c2c89bd9afae39a2405ce3663025dd0e30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dd1c6c2c89bd9afae39a2405… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 17 15:04:04 2007 -0700 crypt32: Make a decode OID function that returns the number of bytes decoded. --- dlls/crypt32/decode.c | 44 ++++++++++++++++++++++++++------------------ 1 files changed, 26 insertions(+), 18 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 312112b..814f6b4 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -1080,15 +1080,14 @@ static BOOL WINAPI CRYPT_AsnDecodeCRL(DWORD dwCertEncodingType, return ret; } -static BOOL WINAPI CRYPT_AsnDecodeOidIgnoreTag(DWORD dwCertEncodingType, - LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, - PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) +static BOOL CRYPT_AsnDecodeOidIgnoreTag(const BYTE *pbEncoded, DWORD cbEncoded, + DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded) { BOOL ret = TRUE; DWORD dataLen; - TRACE("%p, %d, %08x, %p, %p, %d\n", pbEncoded, cbEncoded, dwFlags, - pDecodePara, pvStructInfo, *pcbStructInfo); + TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags, + pvStructInfo, *pcbStructInfo); if ((ret = CRYPT_GetLen(pbEncoded, cbEncoded, &dataLen))) { @@ -1178,11 +1177,21 @@ static BOOL WINAPI CRYPT_AsnDecodeOidIgnoreTag(DWORD dwCertEncodingType, else *(LPSTR *)pvStructInfo = NULL; *pcbStructInfo = bytesNeeded; + if (pcbDecoded) + *pcbDecoded = 1 + lenBytes + dataLen; } } return ret; } +static BOOL WINAPI CRYPT_AsnDecodeOidIgnoreTagWrap(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, + PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) +{ + return CRYPT_AsnDecodeOidIgnoreTag(pbEncoded, cbEncoded, dwFlags, + pvStructInfo, pcbStructInfo, NULL); +} + static BOOL CRYPT_AsnDecodeOidInternal(const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded) { @@ -1192,8 +1201,8 @@ static BOOL CRYPT_AsnDecodeOidInternal(const BYTE *pbEncoded, DWORD cbEncoded, pvStructInfo, *pcbStructInfo); if (pbEncoded[0] == ASN_OBJECTIDENTIFIER) - ret = CRYPT_AsnDecodeOidIgnoreTag(X509_ASN_ENCODING, NULL, - pbEncoded, cbEncoded, dwFlags, NULL, pvStructInfo, pcbStructInfo); + ret = CRYPT_AsnDecodeOidIgnoreTag(pbEncoded, cbEncoded, dwFlags, + pvStructInfo, pcbStructInfo, pcbDecoded); else { SetLastError(CRYPT_E_ASN1_BADTAG); @@ -1210,7 +1219,7 @@ static BOOL CRYPT_AsnDecodeExtension(const BYTE *pbEncoded, DWORD cbEncoded, { struct AsnDecodeSequenceItem items[] = { { ASN_OBJECTIDENTIFIER, offsetof(CERT_EXTENSION, pszObjId), - CRYPT_AsnDecodeOidIgnoreTag, sizeof(LPSTR), FALSE, TRUE, + CRYPT_AsnDecodeOidIgnoreTagWrap, sizeof(LPSTR), FALSE, TRUE, offsetof(CERT_EXTENSION, pszObjId), 0 }, { ASN_BOOL, offsetof(CERT_EXTENSION, fCritical), CRYPT_AsnDecodeBool, sizeof(BOOL), TRUE, FALSE, 0, 0 }, @@ -1657,7 +1666,7 @@ static BOOL CRYPT_AsnDecodeRdnAttr(const BYTE *pbEncoded, DWORD cbEncoded, BOOL ret; struct AsnDecodeSequenceItem items[] = { { ASN_OBJECTIDENTIFIER, offsetof(CERT_RDN_ATTR, pszObjId), - CRYPT_AsnDecodeOidIgnoreTag, sizeof(LPSTR), FALSE, TRUE, + CRYPT_AsnDecodeOidIgnoreTagWrap, sizeof(LPSTR), FALSE, TRUE, offsetof(CERT_RDN_ATTR, pszObjId), 0 }, { 0, offsetof(CERT_RDN_ATTR, dwValueType), CRYPT_AsnDecodeNameValueInternal, sizeof(CERT_NAME_VALUE), @@ -1728,7 +1737,7 @@ static BOOL CRYPT_AsnDecodeUnicodeRdnAttr(const BYTE *pbEncoded, BOOL ret; struct AsnDecodeSequenceItem items[] = { { ASN_OBJECTIDENTIFIER, offsetof(CERT_RDN_ATTR, pszObjId), - CRYPT_AsnDecodeOidIgnoreTag, sizeof(LPSTR), FALSE, TRUE, + CRYPT_AsnDecodeOidIgnoreTagWrap, sizeof(LPSTR), FALSE, TRUE, offsetof(CERT_RDN_ATTR, pszObjId), 0 }, { 0, offsetof(CERT_RDN_ATTR, dwValueType), CRYPT_AsnDecodeUnicodeNameValueInternal, sizeof(CERT_NAME_VALUE), @@ -1853,7 +1862,7 @@ static BOOL CRYPT_AsnDecodePKCSAttributeInternal(const BYTE *pbEncoded, BOOL ret; struct AsnDecodeSequenceItem items[] = { { ASN_OBJECTIDENTIFIER, offsetof(CRYPT_ATTRIBUTE, pszObjId), - CRYPT_AsnDecodeOidIgnoreTag, sizeof(LPSTR), FALSE, TRUE, + CRYPT_AsnDecodeOidIgnoreTagWrap, sizeof(LPSTR), FALSE, TRUE, offsetof(CRYPT_ATTRIBUTE, pszObjId), 0 }, { ASN_CONSTRUCTOR | ASN_SETOF, offsetof(CRYPT_ATTRIBUTE, cValue), CRYPT_DecodeDERArray, sizeof(struct GenericArray), FALSE, TRUE, @@ -2028,7 +2037,7 @@ static BOOL WINAPI CRYPT_AsnDecodeAlgorithmId(DWORD dwCertEncodingType, BOOL ret = TRUE; struct AsnDecodeSequenceItem items[] = { { ASN_OBJECTIDENTIFIER, offsetof(CRYPT_ALGORITHM_IDENTIFIER, pszObjId), - CRYPT_AsnDecodeOidIgnoreTag, sizeof(LPSTR), FALSE, TRUE, + CRYPT_AsnDecodeOidIgnoreTagWrap, sizeof(LPSTR), FALSE, TRUE, offsetof(CRYPT_ALGORITHM_IDENTIFIER, pszObjId), 0 }, { 0, offsetof(CRYPT_ALGORITHM_IDENTIFIER, Parameters), CRYPT_AsnDecodeCopyBytes, sizeof(CRYPT_OBJID_BLOB), TRUE, TRUE, @@ -2191,8 +2200,8 @@ static BOOL CRYPT_AsnDecodeAltNameEntry(const BYTE *pbEncoded, DWORD cbEncoded, bytesNeeded += dataLen; break; case 8: /* registeredID */ - ret = CRYPT_AsnDecodeOidIgnoreTag(0, NULL, pbEncoded, cbEncoded, 0, - NULL, NULL, &dataLen); + ret = CRYPT_AsnDecodeOidIgnoreTag(pbEncoded, cbEncoded, 0, NULL, + &dataLen, NULL); if (ret) { /* FIXME: ugly, shouldn't need to know internals of OID decode @@ -2263,9 +2272,8 @@ static BOOL CRYPT_AsnDecodeAltNameEntry(const BYTE *pbEncoded, DWORD cbEncoded, dataLen); break; case 8: /* registeredID */ - ret = CRYPT_AsnDecodeOidIgnoreTag(0, NULL, - pbEncoded, cbEncoded, 0, NULL, &entry->u.pszRegisteredID, - &dataLen); + ret = CRYPT_AsnDecodeOidIgnoreTag(pbEncoded, cbEncoded, 0, + &entry->u.pszRegisteredID, &dataLen, NULL); break; } } @@ -2441,7 +2449,7 @@ static BOOL WINAPI CRYPT_AsnDecodePKCSContentInfoInternal( CRYPT_CONTENT_INFO *info = (CRYPT_CONTENT_INFO *)pvStructInfo; struct AsnDecodeSequenceItem items[] = { { ASN_OBJECTIDENTIFIER, offsetof(CRYPT_CONTENT_INFO, pszObjId), - CRYPT_AsnDecodeOidIgnoreTag, sizeof(LPSTR), FALSE, TRUE, + CRYPT_AsnDecodeOidIgnoreTagWrap, sizeof(LPSTR), FALSE, TRUE, offsetof(CRYPT_CONTENT_INFO, pszObjId), 0 }, { ASN_CONTEXT | ASN_CONSTRUCTOR | 0, offsetof(CRYPT_CONTENT_INFO, Content), CRYPT_AsnDecodePKCSContent,

1 0

Juan Lang : crypt32: Return bytes decoded when decoding a sequence.
by Alexandre Julliard 18 Sep '07

18 Sep '07

Module: wine Branch: master Commit: fd982c85976819bec370e13d3a99ac78a17d99aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd982c85976819bec370e13d3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 17 15:04:37 2007 -0700 crypt32: Return bytes decoded when decoding a sequence. --- dlls/crypt32/decode.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 814f6b4..6370d81 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -460,6 +460,8 @@ static BOOL CRYPT_AsnDecodeSequence(DWORD dwCertEncodingType, ret = CRYPT_AsnDecodeSequenceItems(dwFlags, items, cItem, ptr, cbEncoded, dwFlags, pvStructInfo, nextData, &cbDecoded); + if (ret && pcbDecoded) + *pcbDecoded = 1 + lenBytes + cbDecoded; } } }

1 0

Juan Lang : crypt32: Update comments.
by Alexandre Julliard 18 Sep '07

18 Sep '07

Module: wine Branch: master Commit: 716a7405e47c1f4019a6286d723e5611e00d5a9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=716a7405e47c1f4019a6286d7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 17 15:00:30 2007 -0700 crypt32: Update comments. --- dlls/crypt32/decode.c | 9 ++++----- dlls/crypt32/encode.c | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 7349f5e..9d4c5c8 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -1,5 +1,5 @@ /* - * Copyright 2005 Juan Lang + * Copyright 2005-2007 Juan Lang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -17,8 +17,8 @@ * * This file implements ASN.1 DER decoding of a limited set of types. * It isn't a full ASN.1 implementation. Microsoft implements BER - * encoding of many of the basic types in msasn1.dll, but that interface is - * undocumented, so I implement them here. + * encoding of many of the basic types in msasn1.dll, but that interface isn't + * implemented, so I implement them here. * * References: * "A Layman's Guide to a Subset of ASN.1, BER, and DER", by Burton Kaliski @@ -27,8 +27,7 @@ * * RFC3280, http://www.faqs.org/rfcs/rfc3280.html * - * MSDN, especially: - * http://msdn.microsoft.com/library/en-us/seccrypto/security/constants_for_cr… + * MSDN, especially "Constants for CryptEncodeObject and CryptDecodeObject" */ #include <assert.h> diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 05c52e6..1963eb7 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -1,5 +1,5 @@ /* - * Copyright 2005 Juan Lang + * Copyright 2005-2007 Juan Lang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -17,8 +17,8 @@ * * This file implements ASN.1 DER encoding of a limited set of types. * It isn't a full ASN.1 implementation. Microsoft implements BER - * encoding of many of the basic types in msasn1.dll, but that interface is - * undocumented, so I implement them here. + * encoding of many of the basic types in msasn1.dll, but that interface isn't + * implemented, so I implement them here. * * References: * "A Layman's Guide to a Subset of ASN.1, BER, and DER", by Burton Kaliski @@ -27,8 +27,7 @@ * * RFC3280, http://www.faqs.org/rfcs/rfc3280.html * - * MSDN, especially: - * http://msdn.microsoft.com/library/en-us/seccrypto/security/constants_for_cr… + * MSDN, especially "Constants for CryptEncodeObject and CryptDecodeObject" */ #include <assert.h>

1 0

Juan Lang : crypt32: Add a test of an indefinite-length sequence.
by Alexandre Julliard 18 Sep '07

18 Sep '07

Module: wine Branch: master Commit: 15b19f1d1637dce7f56c3e1a71e11811cd0013de URL: http://source.winehq.org/git/wine.git/?a=commit;h=15b19f1d1637dce7f56c3e1a7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 17 15:00:58 2007 -0700 crypt32: Add a test of an indefinite-length sequence. --- dlls/crypt32/tests/encode.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 7b3e562..37046b0 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -979,6 +979,7 @@ static void compareNames(const CERT_NAME_INFO *expected, } } +static const BYTE emptyIndefiniteSequence[] = { 0x30,0x80,0x00,0x00 }; static const BYTE twoRDNsExtraBytes[] = { 0x30,0x23,0x31,0x21,0x30,0x0c,0x06,0x03,0x55,0x04,0x04, 0x13,0x05,0x4c,0x61,0x6e,0x67,0x00,0x30,0x11,0x06,0x03,0x55,0x04,0x03, @@ -1010,6 +1011,20 @@ static void test_decodeName(DWORD dwEncoding) ((CERT_NAME_INFO *)buf)->cRDN); LocalFree(buf); } + /* test empty name with indefinite-length encoding */ + ret = CryptDecodeObjectEx(dwEncoding, X509_NAME, emptyIndefiniteSequence, + sizeof(emptyIndefiniteSequence), CRYPT_DECODE_ALLOC_FLAG, NULL, + (BYTE *)&buf, &bufSize); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(bufSize == sizeof(CERT_NAME_INFO), "Wrong bufSize %d\n", bufSize); + ok(((CERT_NAME_INFO *)buf)->cRDN == 0, + "Expected 0 RDNs in empty info, got %d\n", + ((CERT_NAME_INFO *)buf)->cRDN); + LocalFree(buf); + } /* test empty RDN */ bufSize = 0; ret = CryptDecodeObjectEx(dwEncoding, X509_NAME, emptyRDNs,

1 0