September 2009 - Wine-commits

Reece Dunn : jscript/tests: Fixed typos in the output strings.
by Alexandre Julliard 09 Sep '09

09 Sep '09

Module: wine Branch: master Commit: 98cc201eaf9a07cf29b79ce771304f2e80aca464 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98cc201eaf9a07cf29b79ce77… Author: Reece Dunn <msclrhd(a)gmail.com> Date: Tue Sep 8 22:57:26 2009 +0100 jscript/tests: Fixed typos in the output strings. --- dlls/jscript/tests/lang.js | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index ae69e71..b53a224 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -35,7 +35,7 @@ ok(undefined === undefined, "undefined === undefined is false"); ok(!(undefined === null), "!(undefined === null) is false"); ok(1E0 === 1, "1E0 === 1 is false"); ok(1000000*1000000 === 1000000000000, "1000000*1000000 === 1000000000000 is false"); -ok(8.64e15 === 8640000000000000, "8.64e15 !== 8640000000000000"+8.64e15); +ok(8.64e15 === 8640000000000000, "8.64e15 !== 8640000000000000"); ok(1e2147483648 === Infinity, "1e2147483648 !== Infinity"); ok(1 !== 2, "1 !== 2 is false"); @@ -63,7 +63,7 @@ ok(ScriptEngine.length === 0, "ScriptEngine.length is not 0"); function testFunc1(x, y) { ok(this !== undefined, "this is undefined"); - ok(x === true, "x is not 1"); + ok(x === true, "x is not true"); ok(y === "test", "y is not \"test\""); ok(arguments.length === 2, "arguments.length is not 2"); ok(arguments["0"] === true, "arguments[0] is not true"); @@ -386,9 +386,9 @@ ok(+"0xff" === 255, "+'0xff' !== 255"); ok(+"3e3" === 3000, "+'3e3' !== 3000"); tmp = new Number(1); -ok(+tmp === 1, "ToNumber(new Number(1)) = " + (+tmp)); +ok(+tmp === 1, "+(new Number(1)) = " + (+tmp)); tmp = new String("1"); -ok(+tmp === 1, "ToNumber(new String('1')) = " + (+tmp)); +ok(+tmp === 1, "+(new String('1')) = " + (+tmp)); ok("" + 0 === "0", "\"\" + 0 !== \"0\""); ok("" + 123 === "123", "\"\" + 123 !== \"123\""); @@ -462,7 +462,7 @@ try { ok(state === "", "try: state = " + state); state = "try"; }finally { - ok(state === "try", "funally: state = " + state); + ok(state === "try", "finally: state = " + state); state = "finally"; } ok(state === "finally", "state = " + state + " expected finally"); @@ -474,7 +474,7 @@ try { }catch(ex) { ok(false, "unexpected catch"); }finally { - ok(state === "try", "funally: state = " + state); + ok(state === "try", "finally: state = " + state); state = "finally"; } ok(state === "finally", "state = " + state + " expected finally"); @@ -501,7 +501,7 @@ try { ok(ex === true, "ex is not true"); state = "catch"; }finally { - ok(state === "catch", "funally: state = " + state); + ok(state === "catch", "finally: state = " + state); state = "finally"; } ok(state === "finally", "state = " + state + " expected finally"); @@ -516,7 +516,7 @@ try { ok(ex === true, "ex is not true"); state = "catch"; }finally { - ok(state === "catch", "funally: state = " + state); + ok(state === "catch", "finally: state = " + state); state = "finally"; } ok(state === "finally", "state = " + state + " expected finally"); @@ -531,7 +531,7 @@ try { ok(ex === true, "ex is not true"); state = "catch"; }finally { - ok(state === "catch", "funally: state = " + state); + ok(state === "catch", "finally: state = " + state); state = "finally"; } ok(state === "finally", "state = " + state + " expected finally"); @@ -550,7 +550,7 @@ try { ok(ex === true, "ex is not true"); state = "catch"; }finally { - ok(state === "catch", "funally: state = " + state); + ok(state === "catch", "finally: state = " + state); state = "finally"; } ok(state === "finally", "state = " + state + " expected finally"); @@ -622,7 +622,7 @@ try { ok(ex === true, "ex is not true"); state = "catch"; }finally { - ok(state === "catch", "funally: state = " + state); + ok(state === "catch", "finally: state = " + state); state = "finally"; } ok(state === "finally", "state = " + state + " expected finally"); @@ -837,8 +837,8 @@ ok(isNaN(0.5, NaN) === false, "isNaN(0.5, NaN) !== false"); ok(isNaN(+undefined) === true, "isNaN(+undefined) !== true"); ok(isFinite(0.5) === true, "isFinite(0.5) !== true"); -ok(isFinite(Infinity) === false, "isFinite(Infinity) !== fals"); -ok(isFinite(-Infinity) === false, "isFinite(Infinity) !== fals"); +ok(isFinite(Infinity) === false, "isFinite(Infinity) !== false"); +ok(isFinite(-Infinity) === false, "isFinite(Infinity) !== false"); ok(isFinite(NaN) === false, "isFinite(NaN) !== false"); ok(isFinite(0.5, NaN) === true, "isFinite(0.5, NaN) !== true"); ok(isFinite(NaN, 0.5) === false, "isFinite(NaN, 0.5) !== false"); @@ -933,7 +933,7 @@ ok(re.source === "=(\\?|%3F)", "re.source = " + re.source); ok(createNullBSTR() === '', "createNullBSTR() !== ''"); -ok(getVT(nullDisp) === "VT_DISPATCH", "getVT(nullDisp) = " + typeof(nullDisp)); +ok(getVT(nullDisp) === "VT_DISPATCH", "getVT(nullDisp) = " + getVT(nullDisp)); ok(typeof(nullDisp) === "object", "typeof(nullDisp) = " + typeof(nullDisp)); function do_test() {}

1 0

Juan Lang : crypt32: Implement CertGetNameStringW for CERT_NAME_URL_TYPE.
by Alexandre Julliard 09 Sep '09

09 Sep '09

Module: wine Branch: master Commit: 89173715b25def3486ab930e669c75acc12400b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89173715b25def3486ab930e6… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 8 22:11:52 2009 -0700 crypt32: Implement CertGetNameStringW for CERT_NAME_URL_TYPE. --- dlls/crypt32/str.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index 929274b..fa6eed9 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -1154,6 +1154,27 @@ DWORD WINAPI CertGetNameStringW(PCCERT_CONTEXT pCertContext, DWORD dwType, name, szOID_COMMON_NAME, pszNameString, cchNameString); break; } + case CERT_NAME_URL_TYPE: + { + CERT_ALT_NAME_INFO *info; + PCERT_ALT_NAME_ENTRY entry = cert_find_alt_name_entry(pCertContext, + altNameOID, CERT_ALT_NAME_URL, &info); + + if (entry) + { + if (!pszNameString) + ret = strlenW(entry->pwszURL) + 1; + else + { + ret = min(strlenW(entry->pwszURL), cchNameString - 1); + memcpy(pszNameString, entry->pwszURL, ret * sizeof(WCHAR)); + pszNameString[ret++] = 0; + } + } + if (info) + LocalFree(info); + break; + } default: FIXME("unimplemented for type %d\n", dwType); ret = 0;

1 0

Juan Lang : crypt32: Implement CertGetNameStringW for CERT_NAME_DNS_TYPE.
by Alexandre Julliard 09 Sep '09

09 Sep '09

Module: wine Branch: master Commit: 2fe736d9289224acbf8e697ecf43444e6404bdcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fe736d9289224acbf8e697ec… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 8 22:11:40 2009 -0700 crypt32: Implement CertGetNameStringW for CERT_NAME_DNS_TYPE. --- dlls/crypt32/str.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index 8de03a8..929274b 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -1130,6 +1130,30 @@ DWORD WINAPI CertGetNameStringW(PCCERT_CONTEXT pCertContext, DWORD dwType, cchNameString); break; } + case CERT_NAME_DNS_TYPE: + { + CERT_ALT_NAME_INFO *info; + PCERT_ALT_NAME_ENTRY entry = cert_find_alt_name_entry(pCertContext, + altNameOID, CERT_ALT_NAME_DNS_NAME, &info); + + if (entry) + { + if (!pszNameString) + ret = strlenW(entry->pwszDNSName) + 1; + else + { + ret = min(strlenW(entry->pwszDNSName), cchNameString - 1); + memcpy(pszNameString, entry->pwszDNSName, ret * sizeof(WCHAR)); + pszNameString[ret++] = 0; + } + } + if (info) + LocalFree(info); + if (!ret) + ret = cert_get_name_from_rdn_attr(pCertContext->dwCertEncodingType, + name, szOID_COMMON_NAME, pszNameString, cchNameString); + break; + } default: FIXME("unimplemented for type %d\n", dwType); ret = 0;

1 0

Juan Lang : crypt32: Implement CertGetNameStringW for CERT_NAME_EMAIL_TYPE.
by Alexandre Julliard 09 Sep '09

09 Sep '09

Module: wine Branch: master Commit: 6dfe7bc3a6a7f8e2f616fdb795db20f5eb35fe65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dfe7bc3a6a7f8e2f616fdb79… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 8 22:11:27 2009 -0700 crypt32: Implement CertGetNameStringW for CERT_NAME_EMAIL_TYPE. --- dlls/crypt32/str.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index 2486862..8de03a8 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -1008,6 +1008,31 @@ DWORD WINAPI CertGetNameStringW(PCCERT_CONTEXT pCertContext, DWORD dwType, switch (dwType) { + case CERT_NAME_EMAIL_TYPE: + { + CERT_ALT_NAME_INFO *info; + PCERT_ALT_NAME_ENTRY entry = cert_find_alt_name_entry(pCertContext, + altNameOID, CERT_ALT_NAME_RFC822_NAME, &info); + + if (entry) + { + if (!pszNameString) + ret = strlenW(entry->pwszRfc822Name) + 1; + else + { + ret = min(strlenW(entry->pwszRfc822Name), cchNameString - 1); + memcpy(pszNameString, entry->pwszRfc822Name, + ret * sizeof(WCHAR)); + pszNameString[ret++] = 0; + } + } + if (info) + LocalFree(info); + if (!ret) + ret = cert_get_name_from_rdn_attr(pCertContext->dwCertEncodingType, + name, szOID_RSA_emailAddr, pszNameString, cchNameString); + break; + } case CERT_NAME_RDN_TYPE: if (name->cbData) ret = CertNameToStrW(pCertContext->dwCertEncodingType, name,

1 0

Juan Lang : crypt32: Implement CertGetNameStringW for CERT_NAME_RDN_TYPE.
by Alexandre Julliard 09 Sep '09

09 Sep '09

Module: wine Branch: master Commit: 288c79cb16112c9bf5592ddcec5da346f9a700f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=288c79cb16112c9bf5592ddce… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 8 22:11:12 2009 -0700 crypt32: Implement CertGetNameStringW for CERT_NAME_RDN_TYPE. --- dlls/crypt32/str.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index a30a103..2486862 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -1008,6 +1008,24 @@ DWORD WINAPI CertGetNameStringW(PCCERT_CONTEXT pCertContext, DWORD dwType, switch (dwType) { + case CERT_NAME_RDN_TYPE: + if (name->cbData) + ret = CertNameToStrW(pCertContext->dwCertEncodingType, name, + *(DWORD *)pvTypePara, pszNameString, cchNameString); + else + { + CERT_ALT_NAME_INFO *info; + PCERT_ALT_NAME_ENTRY entry = cert_find_alt_name_entry(pCertContext, + altNameOID, CERT_ALT_NAME_DIRECTORY_NAME, &info); + + if (entry) + ret = CertNameToStrW(pCertContext->dwCertEncodingType, + &entry->DirectoryName, *(DWORD *)pvTypePara, pszNameString, + cchNameString); + if (info) + LocalFree(info); + } + break; case CERT_NAME_ATTR_TYPE: ret = cert_get_name_from_rdn_attr(pCertContext->dwCertEncodingType, name, pvTypePara, pszNameString, cchNameString);

1 0

Juan Lang : crypt32: Implement CertGetNameStringW for CERT_NAME_ATTR_TYPE.
by Alexandre Julliard 09 Sep '09

09 Sep '09

Module: wine Branch: master Commit: dfcd8a67c1a8eceaa0000931d1eeb3a7839b8685 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfcd8a67c1a8eceaa0000931d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 8 22:10:53 2009 -0700 crypt32: Implement CertGetNameStringW for CERT_NAME_ATTR_TYPE. --- dlls/crypt32/str.c | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index 6e13426..a30a103 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -966,6 +966,25 @@ static PCERT_ALT_NAME_ENTRY cert_find_alt_name_entry(PCCERT_CONTEXT cert, return entry; } +static DWORD cert_get_name_from_rdn_attr(DWORD encodingType, + PCERT_NAME_BLOB name, LPCSTR oid, LPWSTR pszNameString, DWORD cchNameString) +{ + CERT_NAME_INFO *nameInfo; + DWORD bytes = 0, ret = 0; + + if (CryptDecodeObjectEx(encodingType, X509_NAME, name->pbData, + name->cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, &nameInfo, &bytes)) + { + PCERT_RDN_ATTR nameAttr = CertFindRDNAttr(oid, nameInfo); + + if (nameAttr) + ret = CertRDNValueToStrW(nameAttr->dwValueType, &nameAttr->Value, + pszNameString, cchNameString); + LocalFree(nameInfo); + } + return ret; +} + DWORD WINAPI CertGetNameStringW(PCCERT_CONTEXT pCertContext, DWORD dwType, DWORD dwFlags, void *pvTypePara, LPWSTR pszNameString, DWORD cchNameString) { @@ -989,6 +1008,22 @@ DWORD WINAPI CertGetNameStringW(PCCERT_CONTEXT pCertContext, DWORD dwType, switch (dwType) { + case CERT_NAME_ATTR_TYPE: + ret = cert_get_name_from_rdn_attr(pCertContext->dwCertEncodingType, + name, pvTypePara, pszNameString, cchNameString); + if (!ret) + { + CERT_ALT_NAME_INFO *altInfo; + PCERT_ALT_NAME_ENTRY entry = cert_find_alt_name_entry(pCertContext, + altNameOID, CERT_ALT_NAME_DIRECTORY_NAME, &altInfo); + + if (entry) + ret = cert_name_to_str_with_indent(X509_ASN_ENCODING, 0, + &entry->DirectoryName, 0, pszNameString, cchNameString); + if (altInfo) + LocalFree(altInfo); + } + break; case CERT_NAME_SIMPLE_DISPLAY_TYPE: { static const LPCSTR simpleAttributeOIDs[] = { szOID_COMMON_NAME,

1 0

Juan Lang : crypt32: Further simplify CertGetNameStringW.
by Alexandre Julliard 09 Sep '09

09 Sep '09

Module: wine Branch: master Commit: ef7cda722c17d5c3df9ac1f9166f17ec4ab89d32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef7cda722c17d5c3df9ac1f91… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 8 21:56:11 2009 -0700 crypt32: Further simplify CertGetNameStringW. --- dlls/crypt32/str.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index ab8b947..6e13426 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -995,21 +995,23 @@ DWORD WINAPI CertGetNameStringW(PCCERT_CONTEXT pCertContext, DWORD dwType, szOID_ORGANIZATIONAL_UNIT_NAME, szOID_ORGANIZATION_NAME, szOID_RSA_emailAddr }; CERT_NAME_INFO *nameInfo = NULL; - PCERT_RDN_ATTR nameAttr = NULL; DWORD bytes = 0, i; if (CryptDecodeObjectEx(pCertContext->dwCertEncodingType, X509_NAME, name->pbData, name->cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, &nameInfo, &bytes)) { + PCERT_RDN_ATTR nameAttr = NULL; + for (i = 0; !nameAttr && i < sizeof(simpleAttributeOIDs) / sizeof(simpleAttributeOIDs[0]); i++) nameAttr = CertFindRDNAttr(simpleAttributeOIDs[i], nameInfo); + if (nameAttr) + ret = CertRDNValueToStrW(nameAttr->dwValueType, + &nameAttr->Value, pszNameString, cchNameString); + LocalFree(nameInfo); } - if (nameAttr) - ret = CertRDNValueToStrW(nameAttr->dwValueType, &nameAttr->Value, - pszNameString, cchNameString); - else + if (!ret) { CERT_ALT_NAME_INFO *altInfo; PCERT_ALT_NAME_ENTRY entry = cert_find_alt_name_entry(pCertContext, @@ -1035,8 +1037,6 @@ DWORD WINAPI CertGetNameStringW(PCCERT_CONTEXT pCertContext, DWORD dwType, LocalFree(altInfo); } } - if (nameInfo) - LocalFree(nameInfo); break; } case CERT_NAME_FRIENDLY_DISPLAY_TYPE:

1 0

Juan Lang : crypt32: Use a helper function to simplify CertGetNameStringW.
by Alexandre Julliard 09 Sep '09

09 Sep '09

Module: wine Branch: master Commit: 4d2972c844071e4e35a537dcfb800db14c820993 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d2972c844071e4e35a537dcf… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 8 21:55:47 2009 -0700 crypt32: Use a helper function to simplify CertGetNameStringW. --- dlls/crypt32/str.c | 82 +++++++++++++++++++++++++++++++++------------------- 1 files changed, 52 insertions(+), 30 deletions(-) diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index b300b1f..ab8b947 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -930,6 +930,42 @@ DWORD WINAPI CertGetNameStringA(PCCERT_CONTEXT pCertContext, DWORD dwType, return ret; } +/* Searches cert's extensions for the alternate name extension with OID + * altNameOID, and if found, searches it for the alternate name type entryType. + * If found, returns a pointer to the entry, otherwise returns NULL. + * Regardless of whether an entry of the desired type is found, if the + * alternate name extension is present, sets *info to the decoded alternate + * name extension, which you must free using LocalFree. + * The return value is a pointer within *info, so don't free *info before + * you're done with the return value. + */ +static PCERT_ALT_NAME_ENTRY cert_find_alt_name_entry(PCCERT_CONTEXT cert, + LPCSTR altNameOID, DWORD entryType, PCERT_ALT_NAME_INFO *info) +{ + PCERT_ALT_NAME_ENTRY entry = NULL; + PCERT_EXTENSION ext = CertFindExtension(altNameOID, + cert->pCertInfo->cExtension, cert->pCertInfo->rgExtension); + + if (ext) + { + DWORD bytes = 0; + + if (CryptDecodeObjectEx(cert->dwCertEncodingType, X509_ALTERNATE_NAME, + ext->Value.pbData, ext->Value.cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, + info, &bytes)) + { + DWORD i; + + for (i = 0; !entry && i < (*info)->cAltEntry; i++) + if ((*info)->rgAltEntry[i].dwAltNameChoice == entryType) + entry = &(*info)->rgAltEntry[i]; + } + } + else + *info = NULL; + return entry; +} + DWORD WINAPI CertGetNameStringW(PCCERT_CONTEXT pCertContext, DWORD dwType, DWORD dwFlags, void *pvTypePara, LPWSTR pszNameString, DWORD cchNameString) { @@ -975,42 +1011,28 @@ DWORD WINAPI CertGetNameStringW(PCCERT_CONTEXT pCertContext, DWORD dwType, pszNameString, cchNameString); else { - PCERT_EXTENSION ext = CertFindExtension(altNameOID, - pCertContext->pCertInfo->cExtension, - pCertContext->pCertInfo->rgExtension); + CERT_ALT_NAME_INFO *altInfo; + PCERT_ALT_NAME_ENTRY entry = cert_find_alt_name_entry(pCertContext, + altNameOID, CERT_ALT_NAME_RFC822_NAME, &altInfo); - if (ext) + if (altInfo) { - PCERT_ALT_NAME_INFO altInfo; - - bytes = 0; - if (CryptDecodeObjectEx(pCertContext->dwCertEncodingType, - X509_ALTERNATE_NAME, ext->Value.pbData, ext->Value.cbData, - CRYPT_DECODE_ALLOC_FLAG, NULL, &altInfo, &bytes)) + if (!entry && altInfo->cAltEntry) + entry = &altInfo->rgAltEntry[0]; + if (entry) { - PCERT_ALT_NAME_ENTRY entry = NULL; - - for (i = 0; !entry && i < altInfo->cAltEntry; i++) - if (altInfo->rgAltEntry[i].dwAltNameChoice == - CERT_ALT_NAME_RFC822_NAME) - entry = &altInfo->rgAltEntry[i]; - if (!entry && altInfo->cAltEntry) - entry = &altInfo->rgAltEntry[0]; - if (entry) + if (!pszNameString) + ret = strlenW(entry->pwszRfc822Name) + 1; + else { - if (!pszNameString) - ret = strlenW(entry->pwszRfc822Name) + 1; - else - { - ret = min(strlenW(entry->pwszRfc822Name), - cchNameString - 1); - memcpy(pszNameString, entry->pwszRfc822Name, - ret * sizeof(WCHAR)); - pszNameString[ret++] = 0; - } + ret = min(strlenW(entry->pwszRfc822Name), + cchNameString - 1); + memcpy(pszNameString, entry->pwszRfc822Name, + ret * sizeof(WCHAR)); + pszNameString[ret++] = 0; } - LocalFree(altInfo); } + LocalFree(altInfo); } } if (nameInfo)

1 0

Juan Lang : crypt32: Return an empty string from CertGetNameStringW if a name couldn't be found .
by Alexandre Julliard 09 Sep '09

09 Sep '09

Module: wine Branch: master Commit: 7d831064270ebc37ed94df3f81d2be6c6e50e9df URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d831064270ebc37ed94df3f8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 8 21:55:26 2009 -0700 crypt32: Return an empty string from CertGetNameStringW if a name couldn't be found. --- dlls/crypt32/str.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index f7821e1..b300b1f 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -1034,5 +1034,15 @@ DWORD WINAPI CertGetNameStringW(PCCERT_CONTEXT pCertContext, DWORD dwType, FIXME("unimplemented for type %d\n", dwType); ret = 0; } + if (!ret) + { + if (!pszNameString) + ret = 1; + else if (cchNameString) + { + pszNameString[0] = 0; + ret = 1; + } + } return ret; }

1 0

Juan Lang : crypt32: Correct searching the alternate name in CertGetNameStringW if the main name doesn 't contain an appropriate OID.
by Alexandre Julliard 09 Sep '09

09 Sep '09

Module: wine Branch: master Commit: c7db5ee6a722d8993bc66adc851660cf2ed57485 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7db5ee6a722d8993bc66adc8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 8 21:06:28 2009 -0700 crypt32: Correct searching the alternate name in CertGetNameStringW if the main name doesn't contain an appropriate OID. --- dlls/crypt32/str.c | 58 ++++++++++++++++++++++++++++++++++------------------ 1 files changed, 38 insertions(+), 20 deletions(-) diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index c0b7677..f7821e1 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -933,7 +933,7 @@ DWORD WINAPI CertGetNameStringA(PCCERT_CONTEXT pCertContext, DWORD dwType, DWORD WINAPI CertGetNameStringW(PCCERT_CONTEXT pCertContext, DWORD dwType, DWORD dwFlags, void *pvTypePara, LPWSTR pszNameString, DWORD cchNameString) { - DWORD ret; + DWORD ret = 0; PCERT_NAME_BLOB name; LPCSTR altNameOID; @@ -958,19 +958,22 @@ DWORD WINAPI CertGetNameStringW(PCCERT_CONTEXT pCertContext, DWORD dwType, static const LPCSTR simpleAttributeOIDs[] = { szOID_COMMON_NAME, szOID_ORGANIZATIONAL_UNIT_NAME, szOID_ORGANIZATION_NAME, szOID_RSA_emailAddr }; - CERT_NAME_INFO *info = NULL; + CERT_NAME_INFO *nameInfo = NULL; PCERT_RDN_ATTR nameAttr = NULL; DWORD bytes = 0, i; if (CryptDecodeObjectEx(pCertContext->dwCertEncodingType, X509_NAME, - name->pbData, name->cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, &info, + name->pbData, name->cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, &nameInfo, &bytes)) { for (i = 0; !nameAttr && i < sizeof(simpleAttributeOIDs) / sizeof(simpleAttributeOIDs[0]); i++) - nameAttr = CertFindRDNAttr(simpleAttributeOIDs[i], info); + nameAttr = CertFindRDNAttr(simpleAttributeOIDs[i], nameInfo); } - if (!nameAttr) + if (nameAttr) + ret = CertRDNValueToStrW(nameAttr->dwValueType, &nameAttr->Value, + pszNameString, cchNameString); + else { PCERT_EXTENSION ext = CertFindExtension(altNameOID, pCertContext->pCertInfo->cExtension, @@ -978,25 +981,40 @@ DWORD WINAPI CertGetNameStringW(PCCERT_CONTEXT pCertContext, DWORD dwType, if (ext) { - for (i = 0; !nameAttr && i < sizeof(simpleAttributeOIDs) / - sizeof(simpleAttributeOIDs[0]); i++) - nameAttr = CertFindRDNAttr(simpleAttributeOIDs[i], info); - if (!nameAttr) + PCERT_ALT_NAME_INFO altInfo; + + bytes = 0; + if (CryptDecodeObjectEx(pCertContext->dwCertEncodingType, + X509_ALTERNATE_NAME, ext->Value.pbData, ext->Value.cbData, + CRYPT_DECODE_ALLOC_FLAG, NULL, &altInfo, &bytes)) { - /* FIXME: gotta then look for a rfc822Name choice in ext. - * Failing that, look for the first attribute. - */ - FIXME("CERT_NAME_SIMPLE_DISPLAY_TYPE: stub\n"); + PCERT_ALT_NAME_ENTRY entry = NULL; + + for (i = 0; !entry && i < altInfo->cAltEntry; i++) + if (altInfo->rgAltEntry[i].dwAltNameChoice == + CERT_ALT_NAME_RFC822_NAME) + entry = &altInfo->rgAltEntry[i]; + if (!entry && altInfo->cAltEntry) + entry = &altInfo->rgAltEntry[0]; + if (entry) + { + if (!pszNameString) + ret = strlenW(entry->pwszRfc822Name) + 1; + else + { + ret = min(strlenW(entry->pwszRfc822Name), + cchNameString - 1); + memcpy(pszNameString, entry->pwszRfc822Name, + ret * sizeof(WCHAR)); + pszNameString[ret++] = 0; + } + } + LocalFree(altInfo); } } } - if (nameAttr) - ret = CertRDNValueToStrW(nameAttr->dwValueType, &nameAttr->Value, - pszNameString, cchNameString); - else - ret = 0; - if (info) - LocalFree(info); + if (nameInfo) + LocalFree(nameInfo); break; } case CERT_NAME_FRIENDLY_DISPLAY_TYPE:

1 0