December 2009 - Wine-commits

Nikolay Sivov : kernel32/lcformat: Add support for genitive month names in GetDateFormat().
by Alexandre Julliard 04 Dec '09

04 Dec '09

Module: wine Branch: master Commit: 8ea4102a6c6e0ce0fad52e87fdd94530475255f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ea4102a6c6e0ce0fad52e87f… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Dec 4 03:06:58 2009 +0300 kernel32/lcformat: Add support for genitive month names in GetDateFormat(). --- dlls/kernel32/lcformat.c | 90 +++++++++++++++++++++++++++++++++++++---- dlls/kernel32/tests/locale.c | 69 ++++++++++++++++++++++++++++++++ 2 files changed, 150 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8ea4102a6c6e0ce0fad52…

1 0

Jacek Caban : jscript: Correctly handle NaN and Infinity in to_int32 and to_uint32.
by Alexandre Julliard 04 Dec '09

04 Dec '09

Module: wine Branch: master Commit: efda5561d01c68f54c27b4c0ab9558ab09dbc085 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efda5561d01c68f54c27b4c0a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 4 02:56:04 2009 +0100 jscript: Correctly handle NaN and Infinity in to_int32 and to_uint32. --- dlls/jscript/jsutils.c | 10 ++++++++-- dlls/jscript/tests/lang.js | 12 ++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 80cce59..304980d 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -467,7 +467,10 @@ HRESULT to_int32(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, INT *ret) if(FAILED(hres)) return hres; - *ret = V_VT(&num) == VT_I4 ? V_I4(&num) : (INT)V_R8(&num); + if(V_VT(&num) == VT_I4) + *ret = V_I4(&num); + else + *ret = isnan(V_R8(&num)) || isinf(V_R8(&num)) ? 0 : (INT)V_R8(&num); return S_OK; } @@ -481,7 +484,10 @@ HRESULT to_uint32(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, DWORD *ret) if(FAILED(hres)) return hres; - *ret = V_VT(&num) == VT_I4 ? V_I4(&num) : (DWORD)V_R8(&num); + if(V_VT(&num) == VT_I4) + *ret = V_I4(&num); + else + *ret = isnan(V_R8(&num)) || isinf(V_R8(&num)) ? 0 : (DWORD)V_R8(&num); return S_OK; } diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index bd22c52..1359e05 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -346,6 +346,15 @@ tmp = -3.5 | 0; ok(tmp === -3, "-3.5 | 0 !== -3"); ok(getVT(tmp) === "VT_I4", "getVT(3.5|0) = " + getVT(tmp)); +tmp = 0 | NaN; +ok(tmp === 0, "0 | NaN = " + tmp); + +tmp = 0 | Infinity; +ok(tmp === 0, "0 | NaN = " + tmp); + +tmp = 0 | (-Infinity); +ok(tmp === 0, "0 | NaN = " + tmp); + tmp = 10; ok((tmp |= 0x10) === 26, "tmp(10) |= 0x10 !== 26"); ok(getVT(tmp) === "VT_I4", "getVT(tmp |= 10) = " + getVT(tmp)); @@ -380,6 +389,9 @@ ok(tmp === 2, "8 >> 2 = " + tmp); tmp = -64 >>> 4; ok(tmp === 0x0ffffffc, "-64 >>> 4 = " + tmp); +tmp = 4 >>> NaN; +ok(tmp === 4, "4 >>> NaN = " + tmp); + tmp = 10; ok((tmp &= 8) === 8, "tmp(10) &= 8 !== 8"); ok(getVT(tmp) === "VT_I4", "getVT(tmp &= 8) = " + getVT(tmp));

1 0

Jacek Caban : jscript: Correctly handle NaN in to_integer.
by Alexandre Julliard 04 Dec '09

04 Dec '09

Module: wine Branch: master Commit: ec769d2d95d69f87436f1a2ef73bbe4c4c2f0b50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec769d2d95d69f87436f1a2ef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 4 02:56:25 2009 +0100 jscript: Correctly handle NaN in to_integer. --- dlls/jscript/jsutils.c | 8 ++++++-- dlls/jscript/tests/api.js | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 304980d..9e49cc7 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -449,10 +449,14 @@ HRESULT to_integer(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, VARIANT *ret) if(FAILED(hres)) return hres; - if(V_VT(&num) == VT_I4) + if(V_VT(&num) == VT_I4) { *ret = num; - else + }else if(isnan(V_R8(&num))) { + V_VT(ret) = VT_I4; + V_I4(ret) = 0; + }else { num_set_val(ret, V_R8(&num) >= 0.0 ? floor(V_R8(&num)) : -floor(-V_R8(&num))); + } return S_OK; } diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 42a79e8..80bdf88 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -231,6 +231,8 @@ tmp = "abc".charAt(-1); ok(tmp === "", "'abc',charAt(-1) = " + tmp); tmp = "abc".charAt(0,2); ok(tmp === "a", "'abc',charAt(0.2) = " + tmp); +tmp = "abc".charAt(NaN); +ok(tmp === "a", "'abc',charAt(NaN) = " + tmp); tmp = "abc".charCodeAt(0); ok(tmp === 0x61, "'abc'.charCodeAt(0) = " + tmp);

1 0

Juan Lang : wininet: Correct length of data passed to callback when resolving a name.
by Alexandre Julliard 04 Dec '09

04 Dec '09

Module: wine Branch: master Commit: b967fde0a86e5adaa7233d76b4691d6a5f5686ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=b967fde0a86e5adaa7233d76b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 3 18:19:00 2009 -0800 wininet: Correct length of data passed to callback when resolving a name. --- dlls/wininet/ftp.c | 2 +- dlls/wininet/http.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index bbef8ca..1d8a8f9 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -2535,7 +2535,7 @@ HINTERNET FTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, } SendAsyncCallback(&hIC->hdr, dwContext, INTERNET_STATUS_RESOLVING_NAME, - (LPWSTR) lpszServerName, strlenW(lpszServerName)); + (LPWSTR) lpszServerName, (strlenW(lpszServerName)+1) * sizeof(WCHAR)); sock_namelen = sizeof(socketAddr); if (!GetAddress(lpszServerName, lpwfs->serverport, (struct sockaddr *)&socketAddr, &sock_namelen)) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 19a34cb..024d5d8 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1389,7 +1389,7 @@ static DWORD HTTP_ResolveName(http_request_t *lpwhr) INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, INTERNET_STATUS_RESOLVING_NAME, lpwhs->lpszServerName, - strlenW(lpwhs->lpszServerName)+1); + (strlenW(lpwhs->lpszServerName)+1) * sizeof(WCHAR)); lpwhs->sa_len = sizeof(lpwhs->socketAddress); if (!GetAddress(lpwhs->lpszServerName, lpwhs->nServerPort,

1 0

James Hawkins : msi: MsiSetMode returns a UINT system error code, not a BOOL.
by Alexandre Julliard 04 Dec '09

04 Dec '09

Module: wine Branch: master Commit: 7d3e6643127b56549778784f7b57f62217fa95f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d3e6643127b56549778784f7… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Dec 3 21:11:49 2009 -0800 msi: MsiSetMode returns a UINT system error code, not a BOOL. --- dlls/msi/install.c | 15 +++------------ dlls/msi/tests/automation.c | 4 ++-- include/msiquery.h | 2 +- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 1a535eb..b1d741a 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -717,19 +717,10 @@ BOOL WINAPI MsiGetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode) /*********************************************************************** * MsiSetMode (MSI.@) */ -BOOL WINAPI MsiSetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode, BOOL fState) +UINT WINAPI MsiSetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode, BOOL fState) { - switch (iRunMode) - { - case MSIRUNMODE_RESERVED11: - case MSIRUNMODE_WINDOWS9X: - case MSIRUNMODE_RESERVED14: - case MSIRUNMODE_RESERVED15: - return FALSE; - default: - FIXME("%d %d %d\n", hInstall, iRunMode, fState); - } - return TRUE; + FIXME("%d %d %d\n", hInstall, iRunMode, fState); + return ERROR_SUCCESS; } /*********************************************************************** diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 29a7cd2..b792fa7 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -1713,12 +1713,12 @@ static void test_Session(IDispatch *pSession) /* Session::Mode, put */ hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTATEND, TRUE); - todo_wine ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr); hr = Session_ModeGet(pSession, MSIRUNMODE_REBOOTATEND, &bool); ok(hr == S_OK, "Session_ModeGet failed, hresult 0x%08x\n", hr); ok(bool, "Reboot at end session mode is %d, expected 1\n", bool); hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTATEND, FALSE); /* set it again so we don't reboot */ - todo_wine ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr); /* Session::Database, get */ hr = Session_Database(pSession, &pDatabase); diff --git a/include/msiquery.h b/include/msiquery.h index 6a1bfa4..2ea8320 100644 --- a/include/msiquery.h +++ b/include/msiquery.h @@ -301,7 +301,7 @@ UINT WINAPI MsiSummaryInfoGetPropertyCount(MSIHANDLE,PUINT); UINT WINAPI MsiEnableUIPreview(MSIHANDLE, MSIHANDLE*); BOOL WINAPI MsiGetMode(MSIHANDLE, MSIRUNMODE); -BOOL WINAPI MsiSetMode(MSIHANDLE, MSIRUNMODE, BOOL); +UINT WINAPI MsiSetMode(MSIHANDLE, MSIRUNMODE, BOOL); UINT WINAPI MsiViewModify(MSIHANDLE, MSIMODIFY, MSIHANDLE);

1 0

Juan Lang : cryptnet: Add tests for getting the certificate issuer URL from a cert' s authority info access extension.
by Alexandre Julliard 04 Dec '09

04 Dec '09

Module: wine Branch: master Commit: a7c236a0664d16e97f7cf4e33fc30b68ef482668 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7c236a0664d16e97f7cf4e33… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 3 10:45:10 2009 -0800 cryptnet: Add tests for getting the certificate issuer URL from a cert's authority info access extension. --- dlls/cryptnet/tests/cryptnet.c | 63 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 63 insertions(+), 0 deletions(-) diff --git a/dlls/cryptnet/tests/cryptnet.c b/dlls/cryptnet/tests/cryptnet.c index 99df4a0..acbfa32 100644 --- a/dlls/cryptnet/tests/cryptnet.c +++ b/dlls/cryptnet/tests/cryptnet.c @@ -60,6 +60,29 @@ static const BYTE certWithCRLDistPoint[] = { 0x25,0x06,0x03,0x55,0x1d,0x1f,0x01,0x01,0xff,0x04,0x1b,0x30,0x19,0x30,0x17, 0xa0,0x15,0xa0,0x13,0x86,0x11,0x68,0x74,0x74,0x70,0x3a,0x2f,0x2f,0x77,0x69, 0x6e,0x65,0x68,0x71,0x2e,0x6f,0x72,0x67, }; +static const BYTE certWithAIAWithCAIssuers[] = { +0x30,0x82,0x01,0x3c,0xa0,0x03,0x02,0x01,0x02,0x02,0x01,0x01,0x30,0x0b,0x06, +0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x05,0x30,0x14,0x31,0x12,0x30, +0x10,0x06,0x03,0x55,0x04,0x03,0x13,0x09,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61, +0x6e,0x67,0x30,0x1e,0x17,0x0d,0x30,0x39,0x31,0x30,0x32,0x38,0x30,0x30,0x30, +0x30,0x30,0x30,0x5a,0x17,0x0d,0x32,0x30,0x31,0x31,0x32,0x37,0x30,0x30,0x30, +0x30,0x30,0x30,0x5a,0x30,0x14,0x31,0x12,0x30,0x10,0x06,0x03,0x55,0x04,0x03, +0x13,0x09,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e,0x67,0x30,0x81,0xa5,0x30, +0x0b,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x01,0x03,0x81,0x95, +0x00,0x06,0x02,0x00,0x00,0x00,0x24,0x00,0x00,0x52,0x53,0x41,0x31,0x00,0x04, +0x00,0x00,0x01,0x00,0x01,0x00,0x2f,0xb2,0x8c,0xff,0x6c,0xf1,0xb1,0x61,0x9c, +0x3a,0x8f,0x5e,0x35,0x2f,0x1f,0xd5,0xcf,0x2a,0xf6,0x9e,0x37,0xe8,0x89,0xa2, +0xb1,0x1c,0xc0,0x1c,0xb6,0x72,0x45,0x97,0xe5,0x88,0x3d,0xfe,0xa6,0x27,0xea, +0xd6,0x07,0x0f,0xcd,0xba,0x49,0x06,0x16,0xdb,0xad,0x06,0x76,0x39,0x4c,0x15, +0xdf,0xe2,0x07,0xc5,0x99,0x1b,0x98,0x4b,0xc3,0x8e,0x89,0x12,0x95,0x9e,0x3b, +0xb9,0x59,0xfe,0x91,0x33,0xc1,0x1f,0xce,0x8f,0xab,0x93,0x25,0x01,0x3e,0xde, +0xf1,0x58,0x3b,0xe7,0x7a,0x03,0x14,0x07,0x09,0x0a,0x21,0x2d,0x12,0x11,0x08, +0x78,0x07,0x9e,0x34,0xc3,0xc5,0xde,0xb2,0xd8,0xd7,0x86,0x0d,0x0d,0xcd,0x81, +0xa4,0x2d,0x7c,0x82,0x50,0xca,0x2a,0xc2,0x99,0xe5,0xf3,0xca,0x7e,0xad,0xa3, +0x31,0x30,0x2f,0x30,0x2d,0x06,0x08,0x2b,0x06,0x01,0x05,0x05,0x07,0x01,0x01, +0x04,0x21,0x30,0x1f,0x30,0x1d,0x06,0x08,0x2b,0x06,0x01,0x05,0x05,0x07,0x30, +0x02,0x86,0x11,0x68,0x74,0x74,0x70,0x3a,0x2f,0x2f,0x77,0x69,0x6e,0x65,0x68, +0x71,0x2e,0x6f,0x72,0x67 }; static void compareUrlArray(const CRYPT_URL_ARRAY *expected, const CRYPT_URL_ARRAY *got) @@ -231,6 +254,46 @@ static void test_getObjectUrl(void) "Expected CRYPT_E_NOT_FOUND, got %08x\n", GetLastError()); CertFreeCertificateContext(cert); } + cert = CertCreateCertificateContext(X509_ASN_ENCODING, + certWithAIAWithCAIssuers, sizeof(certWithAIAWithCAIssuers)); + if (cert) + { + PCRYPT_URL_ARRAY urlArray; + + /* This has an AIA extension with the CA Issuers set, so expect it + * to succeed: + */ + ret = CryptGetObjectUrl(URL_OID_CERTIFICATE_ISSUER, + (void *)cert, 0, NULL, &urlArraySize, NULL, NULL, NULL); + todo_wine + ok(ret, "CryptGetObjectUrl failed: %08x\n", GetLastError()); + if (ret) + { + urlArray = HeapAlloc(GetProcessHeap(), 0, urlArraySize); + if (urlArray) + { + ret = CryptGetObjectUrl(URL_OID_CERTIFICATE_ISSUER, + (void *)cert, CRYPT_GET_URL_FROM_EXTENSION, urlArray, + &urlArraySize, NULL, NULL, NULL); + ok(ret, "CryptGetObjectUrl failed: %08x\n", GetLastError()); + if (ret) + { + LPWSTR pUrl = url; + CRYPT_URL_ARRAY expectedUrl = { 1, &pUrl }; + + compareUrlArray(&expectedUrl, urlArray); + } + HeapFree(GetProcessHeap(), 0, urlArray); + } + } + /* It doesn't have a CRL dist points extension, so this should fail */ + SetLastError(0xdeadbeef); + ret = CryptGetObjectUrl(URL_OID_CERTIFICATE_CRL_DIST_POINT, + (void *)cert, 0, NULL, &urlArraySize, NULL, NULL, NULL); + ok(!ret && GetLastError() == CRYPT_E_NOT_FOUND, + "expected CRYPT_E_NOT_FOUND, got %08x\n", GetLastError()); + CertFreeCertificateContext(cert); + } } static void make_tmp_file(LPSTR path)

1 0

Juan Lang : cryptnet: Implement getting the certificate issuer URL from a cert' s authority info access extension.
by Alexandre Julliard 04 Dec '09

04 Dec '09

Module: wine Branch: master Commit: 59820c2e5cdd915399687968f381914e0923dac5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59820c2e5cdd915399687968f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 3 10:53:45 2009 -0800 cryptnet: Implement getting the certificate issuer URL from a cert's authority info access extension. --- dlls/cryptnet/cryptnet_main.c | 145 +++++++++++++++++++++------------------ dlls/cryptnet/tests/cryptnet.c | 1 - 2 files changed, 78 insertions(+), 68 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 34bbc58..fef7837 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -120,61 +120,6 @@ static const char *url_oid_to_str(LPCSTR oid) typedef BOOL (WINAPI *UrlDllGetObjectUrlFunc)(LPCSTR, LPVOID, DWORD, PCRYPT_URL_ARRAY, DWORD *, PCRYPT_URL_INFO, DWORD *, LPVOID); -static LPWSTR name_value_to_str(CERT_NAME_BLOB *name) -{ - DWORD len = CertNameToStrW(X509_ASN_ENCODING, name, CERT_SIMPLE_NAME_STR, - NULL, 0); - LPWSTR str = NULL; - - if (len) - { - str = CryptMemAlloc(len * sizeof(WCHAR)); - if (str) - CertNameToStrW(X509_ASN_ENCODING, name, CERT_SIMPLE_NAME_STR, - str, len); - } - return str; -} - -static void dump_alt_name_entry(CERT_ALT_NAME_ENTRY *entry) -{ - LPWSTR str; - - switch (entry->dwAltNameChoice) - { - case CERT_ALT_NAME_OTHER_NAME: - TRACE("CERT_ALT_NAME_OTHER_NAME, oid = %s\n", - debugstr_a(entry->u.pOtherName->pszObjId)); - break; - case CERT_ALT_NAME_RFC822_NAME: - TRACE("CERT_ALT_NAME_RFC822_NAME: %s\n", - debugstr_w(entry->u.pwszRfc822Name)); - break; - case CERT_ALT_NAME_DNS_NAME: - TRACE("CERT_ALT_NAME_DNS_NAME: %s\n", - debugstr_w(entry->u.pwszDNSName)); - break; - case CERT_ALT_NAME_DIRECTORY_NAME: - str = name_value_to_str(&entry->u.DirectoryName); - TRACE("CERT_ALT_NAME_DIRECTORY_NAME: %s\n", debugstr_w(str)); - CryptMemFree(str); - break; - case CERT_ALT_NAME_URL: - TRACE("CERT_ALT_NAME_URL: %s\n", debugstr_w(entry->u.pwszURL)); - break; - case CERT_ALT_NAME_IP_ADDRESS: - TRACE("CERT_ALT_NAME_IP_ADDRESS: %d bytes\n", - entry->u.IPAddress.cbData); - break; - case CERT_ALT_NAME_REGISTERED_ID: - TRACE("CERT_ALT_NAME_REGISTERED_ID: %s\n", - debugstr_a(entry->u.pszRegisteredID)); - break; - default: - TRACE("dwAltNameChoice = %d\n", entry->dwAltNameChoice); - } -} - static BOOL WINAPI CRYPT_GetUrlFromCertificateIssuer(LPCSTR pszUrlOid, LPVOID pvPara, DWORD dwFlags, PCRYPT_URL_ARRAY pUrlArray, DWORD *pcbUrlArray, PCRYPT_URL_INFO pUrlInfo, DWORD *pcbUrlInfo, LPVOID pvReserved) @@ -200,23 +145,89 @@ static BOOL WINAPI CRYPT_GetUrlFromCertificateIssuer(LPCSTR pszUrlOid, &aia, &size); if (ret) { - DWORD i; + DWORD i, cUrl, bytesNeeded = sizeof(CRYPT_URL_ARRAY); - TRACE("%d access descriptions:\n", aia->cAccDescr); - for (i = 0; i < aia->cAccDescr; i++) - { + for (i = 0, cUrl = 0; i < aia->cAccDescr; i++) if (!strcmp(aia->rgAccDescr[i].pszAccessMethod, - szOID_PKIX_OCSP)) - TRACE("OCSP:\n"); - else if (!strcmp(aia->rgAccDescr[i].pszAccessMethod, szOID_PKIX_CA_ISSUERS)) - TRACE("CA issuers:\n"); - dump_alt_name_entry(&aia->rgAccDescr[i].AccessLocation); + { + if (aia->rgAccDescr[i].AccessLocation.dwAltNameChoice == + CERT_ALT_NAME_URL) + { + if (aia->rgAccDescr[i].AccessLocation.u.pwszURL) + { + cUrl++; + bytesNeeded += sizeof(LPWSTR) + + (lstrlenW(aia->rgAccDescr[i].AccessLocation.u. + pwszURL) + 1) * sizeof(WCHAR); + } + } + else + FIXME("unsupported alt name type %d\n", + aia->rgAccDescr[i].AccessLocation.dwAltNameChoice); + } + if (!pcbUrlArray) + { + SetLastError(E_INVALIDARG); + ret = FALSE; + } + else if (!pUrlArray) + *pcbUrlArray = bytesNeeded; + else if (*pcbUrlArray < bytesNeeded) + { + SetLastError(ERROR_MORE_DATA); + *pcbUrlArray = bytesNeeded; + ret = FALSE; + } + else + { + LPWSTR nextUrl; + + *pcbUrlArray = bytesNeeded; + pUrlArray->cUrl = 0; + pUrlArray->rgwszUrl = + (LPWSTR *)((BYTE *)pUrlArray + sizeof(CRYPT_URL_ARRAY)); + nextUrl = (LPWSTR)((BYTE *)pUrlArray + sizeof(CRYPT_URL_ARRAY) + + cUrl * sizeof(LPWSTR)); + for (i = 0; i < aia->cAccDescr; i++) + if (!strcmp(aia->rgAccDescr[i].pszAccessMethod, + szOID_PKIX_CA_ISSUERS)) + { + if (aia->rgAccDescr[i].AccessLocation.dwAltNameChoice + == CERT_ALT_NAME_URL) + { + if (aia->rgAccDescr[i].AccessLocation.u.pwszURL) + { + lstrcpyW(nextUrl, + aia->rgAccDescr[i].AccessLocation.u.pwszURL); + pUrlArray->rgwszUrl[pUrlArray->cUrl++] = + nextUrl; + nextUrl += (lstrlenW(nextUrl) + 1); + } + } + } + } + if (ret) + { + if (pcbUrlInfo) + { + FIXME("url info: stub\n"); + if (!pUrlInfo) + *pcbUrlInfo = sizeof(CRYPT_URL_INFO); + else if (*pcbUrlInfo < sizeof(CRYPT_URL_INFO)) + { + *pcbUrlInfo = sizeof(CRYPT_URL_INFO); + SetLastError(ERROR_MORE_DATA); + ret = FALSE; + } + else + { + *pcbUrlInfo = sizeof(CRYPT_URL_INFO); + memset(pUrlInfo, 0, sizeof(CRYPT_URL_INFO)); + } + } } LocalFree(aia); - FIXME("authority info access unsupported\n"); - SetLastError(CRYPT_E_NOT_FOUND); - ret = FALSE; } } else diff --git a/dlls/cryptnet/tests/cryptnet.c b/dlls/cryptnet/tests/cryptnet.c index acbfa32..83060b6 100644 --- a/dlls/cryptnet/tests/cryptnet.c +++ b/dlls/cryptnet/tests/cryptnet.c @@ -265,7 +265,6 @@ static void test_getObjectUrl(void) */ ret = CryptGetObjectUrl(URL_OID_CERTIFICATE_ISSUER, (void *)cert, 0, NULL, &urlArraySize, NULL, NULL, NULL); - todo_wine ok(ret, "CryptGetObjectUrl failed: %08x\n", GetLastError()); if (ret) {

1 0

Juan Lang : winhttp: Pass hostname to netconn_secure_connect.
by Alexandre Julliard 04 Dec '09

04 Dec '09

Module: wine Branch: master Commit: a33c4bfd0b8be409012c46483d400bee4711d965 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a33c4bfd0b8be409012c46483… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 12 13:28:23 2009 -0800 winhttp: Pass hostname to netconn_secure_connect. --- dlls/winhttp/net.c | 2 +- dlls/winhttp/request.c | 2 +- dlls/winhttp/winhttp_private.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 53911d6..5d5f9b7 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -418,7 +418,7 @@ BOOL netconn_connect( netconn_t *conn, const struct sockaddr *sockaddr, unsigned return ret; } -BOOL netconn_secure_connect( netconn_t *conn ) +BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname ) { #ifdef SONAME_LIBSSL X509 *cert; diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 4d5be84..f6c9bce 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -957,7 +957,7 @@ static BOOL open_connection( request_t *request ) return FALSE; } } - if (!netconn_secure_connect( &request->netconn )) + if (!netconn_secure_connect( &request->netconn, connect->servername )) { netconn_close( &request->netconn ); heap_free( addressW ); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 64348a2..73ac5ba 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -219,7 +219,7 @@ void netconn_unload( void ); BOOL netconn_query_data_available( netconn_t *, DWORD * ); BOOL netconn_recv( netconn_t *, void *, size_t, int, int * ); BOOL netconn_resolve( WCHAR *, INTERNET_PORT, struct sockaddr *, socklen_t * ); -BOOL netconn_secure_connect( netconn_t * ); +BOOL netconn_secure_connect( netconn_t *, WCHAR * ); BOOL netconn_send( netconn_t *, const void *, size_t, int, int * ); DWORD netconn_set_timeout( netconn_t *, BOOL, int ); const void *netconn_get_certificate( netconn_t * );

1 0

Juan Lang : winhttp: Store hostname for secure connection in its SSL context.
by Alexandre Julliard 04 Dec '09

04 Dec '09

Module: wine Branch: master Commit: be8f2ae98ee264a7855921fb63cad50ed22144f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be8f2ae98ee264a7855921fb6… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 12 13:33:48 2009 -0800 winhttp: Store hostname for secure connection in its SSL context. --- dlls/winhttp/net.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 5d5f9b7..cf83f20 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -91,6 +91,7 @@ static void *libcrypto_handle; static SSL_METHOD *method; static SSL_CTX *ctx; +static int hostname_idx; #define MAKE_FUNCPTR(f) static typeof(f) * p##f @@ -106,6 +107,9 @@ MAKE_FUNCPTR( SSL_connect ); MAKE_FUNCPTR( SSL_shutdown ); MAKE_FUNCPTR( SSL_write ); MAKE_FUNCPTR( SSL_read ); +MAKE_FUNCPTR( SSL_get_ex_new_index ); +MAKE_FUNCPTR( SSL_get_ex_data ); +MAKE_FUNCPTR( SSL_set_ex_data ); MAKE_FUNCPTR( SSL_get_verify_result ); MAKE_FUNCPTR( SSL_get_peer_certificate ); MAKE_FUNCPTR( SSL_CTX_set_default_verify_paths ); @@ -254,6 +258,9 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) LOAD_FUNCPTR( SSL_shutdown ); LOAD_FUNCPTR( SSL_write ); LOAD_FUNCPTR( SSL_read ); + LOAD_FUNCPTR( SSL_get_ex_new_index ); + LOAD_FUNCPTR( SSL_get_ex_data ); + LOAD_FUNCPTR( SSL_set_ex_data ); LOAD_FUNCPTR( SSL_get_verify_result ); LOAD_FUNCPTR( SSL_get_peer_certificate ); LOAD_FUNCPTR( SSL_CTX_set_default_verify_paths ); @@ -289,6 +296,7 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) LeaveCriticalSection( &init_ssl_cs ); return FALSE; } + hostname_idx = pSSL_get_ex_new_index( 0, (void *)"hostname index", NULL, NULL, NULL ); pCRYPTO_set_id_callback(ssl_thread_id); num_ssl_locks = pCRYPTO_num_locks(); @@ -442,6 +450,7 @@ BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname ) set_last_error( ERROR_WINHTTP_SECURE_CHANNEL_ERROR ); goto fail; } + pSSL_set_ex_data( conn->ssl_conn, hostname_idx, hostname ); if (!(cert = pSSL_get_peer_certificate( conn->ssl_conn ))) { ERR("No certificate for server: %s\n", pERR_error_string( pERR_get_error(), 0 ));

1 0

Juan Lang : winhttp: Set callback to verify hostname with peer' s certificate.
by Alexandre Julliard 04 Dec '09

04 Dec '09

Module: wine Branch: master Commit: 48a7580135b03c270c2a6328cc4ba1df7b40fc2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=48a7580135b03c270c2a6328c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Dec 2 16:56:40 2009 -0800 winhttp: Set callback to verify hostname with peer's certificate. --- dlls/winhttp/net.c | 41 +++++++++++++++++++++++++++++++++-------- 1 files changed, 33 insertions(+), 8 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index cf83f20..a86a5a6 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -110,9 +110,12 @@ MAKE_FUNCPTR( SSL_read ); MAKE_FUNCPTR( SSL_get_ex_new_index ); MAKE_FUNCPTR( SSL_get_ex_data ); MAKE_FUNCPTR( SSL_set_ex_data ); +MAKE_FUNCPTR( SSL_get_ex_data_X509_STORE_CTX_idx ); MAKE_FUNCPTR( SSL_get_verify_result ); MAKE_FUNCPTR( SSL_get_peer_certificate ); MAKE_FUNCPTR( SSL_CTX_set_default_verify_paths ); +MAKE_FUNCPTR( SSL_CTX_set_verify ); +MAKE_FUNCPTR( X509_STORE_CTX_get_ex_data ); MAKE_FUNCPTR( BIO_new_fp ); MAKE_FUNCPTR( CRYPTO_num_locks ); @@ -208,6 +211,19 @@ static int sock_get_error( int err ) return err; } +#ifdef SONAME_LIBSSL +static int netconn_secure_verify( int preverify_ok, X509_STORE_CTX *ctx ) +{ + SSL *ssl; + WCHAR *server; + + ssl = pX509_STORE_CTX_get_ex_data( ctx, pSSL_get_ex_data_X509_STORE_CTX_idx() ); + server = pSSL_get_ex_data( ssl, hostname_idx ); + FIXME("verify %s\n", debugstr_w(server)); + return preverify_ok; +} +#endif + BOOL netconn_init( netconn_t *conn, BOOL secure ) { #if defined(SONAME_LIBSSL) && defined(SONAME_LIBCRYPTO) @@ -261,9 +277,12 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) LOAD_FUNCPTR( SSL_get_ex_new_index ); LOAD_FUNCPTR( SSL_get_ex_data ); LOAD_FUNCPTR( SSL_set_ex_data ); + LOAD_FUNCPTR( SSL_get_ex_data_X509_STORE_CTX_idx ); LOAD_FUNCPTR( SSL_get_verify_result ); LOAD_FUNCPTR( SSL_get_peer_certificate ); LOAD_FUNCPTR( SSL_CTX_set_default_verify_paths ); + LOAD_FUNCPTR( SSL_CTX_set_verify ); + LOAD_FUNCPTR( X509_STORE_CTX_get_ex_data ); #undef LOAD_FUNCPTR #define LOAD_FUNCPTR(x) \ @@ -297,6 +316,14 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) return FALSE; } hostname_idx = pSSL_get_ex_new_index( 0, (void *)"hostname index", NULL, NULL, NULL ); + if (hostname_idx == -1) + { + ERR("SSL_get_ex_new_index failed: %s\n", pERR_error_string( pERR_get_error(), 0 )); + set_last_error( ERROR_OUTOFMEMORY ); + LeaveCriticalSection( &init_ssl_cs ); + return FALSE; + } + pSSL_CTX_set_verify( ctx, SSL_VERIFY_PEER, netconn_secure_verify ); pCRYPTO_set_id_callback(ssl_thread_id); num_ssl_locks = pCRYPTO_num_locks(); @@ -429,7 +456,6 @@ BOOL netconn_connect( netconn_t *conn, const struct sockaddr *sockaddr, unsigned BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname ) { #ifdef SONAME_LIBSSL - X509 *cert; long res; if (!(conn->ssl_conn = pSSL_new( ctx ))) @@ -438,22 +464,21 @@ BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname ) set_last_error( ERROR_OUTOFMEMORY ); goto fail; } - if (!pSSL_set_fd( conn->ssl_conn, conn->socket )) + if (!pSSL_set_ex_data( conn->ssl_conn, hostname_idx, hostname )) { - ERR("SSL_set_fd failed: %s\n", pERR_error_string( pERR_get_error(), 0 )); + ERR("SSL_set_ex_data failed: %s\n", pERR_error_string( pERR_get_error(), 0 )); set_last_error( ERROR_WINHTTP_SECURE_CHANNEL_ERROR ); goto fail; } - if (pSSL_connect( conn->ssl_conn ) <= 0) + if (!pSSL_set_fd( conn->ssl_conn, conn->socket )) { - ERR("SSL_connect failed: %s\n", pERR_error_string( pERR_get_error(), 0 )); + ERR("SSL_set_fd failed: %s\n", pERR_error_string( pERR_get_error(), 0 )); set_last_error( ERROR_WINHTTP_SECURE_CHANNEL_ERROR ); goto fail; } - pSSL_set_ex_data( conn->ssl_conn, hostname_idx, hostname ); - if (!(cert = pSSL_get_peer_certificate( conn->ssl_conn ))) + if (pSSL_connect( conn->ssl_conn ) <= 0) { - ERR("No certificate for server: %s\n", pERR_error_string( pERR_get_error(), 0 )); + ERR("SSL_connect failed: %s\n", pERR_error_string( pERR_get_error(), 0 )); set_last_error( ERROR_WINHTTP_SECURE_CHANNEL_ERROR ); goto fail; }

1 0