December 2009 - Wine-commits

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

14 Dec '09

Module: wine Branch: master Commit: 6217326a09dda8d029f80846c1ea9c2725c532b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6217326a09dda8d029f80846c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sun Dec 13 15:42:29 2009 -0800 wininet: Set callback to verify hostname with peer's certificate. --- dlls/wininet/netconnection.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 6650359..e0667ec 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -132,12 +132,16 @@ MAKE_FUNCPTR(SSL_write); MAKE_FUNCPTR(SSL_read); MAKE_FUNCPTR(SSL_pending); 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_get_timeout); MAKE_FUNCPTR(SSL_CTX_set_timeout); MAKE_FUNCPTR(SSL_CTX_set_default_verify_paths); +MAKE_FUNCPTR(SSL_CTX_set_verify); +MAKE_FUNCPTR(X509_STORE_CTX_get_ex_data); /* OpenSSL's libcrypto functions that we use */ MAKE_FUNCPTR(BIO_new_fp); @@ -165,6 +169,18 @@ static void ssl_lock_callback(int mode, int type, const char *file, int line) LeaveCriticalSection(&ssl_locks[type]); } +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 DWORD NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL) @@ -224,12 +240,16 @@ DWORD NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL) DYNSSL(SSL_read); DYNSSL(SSL_pending); DYNSSL(SSL_get_ex_new_index); + DYNSSL(SSL_get_ex_data); DYNSSL(SSL_set_ex_data); + DYNSSL(SSL_get_ex_data_X509_STORE_CTX_idx); DYNSSL(SSL_get_verify_result); DYNSSL(SSL_get_peer_certificate); DYNSSL(SSL_CTX_get_timeout); DYNSSL(SSL_CTX_set_timeout); DYNSSL(SSL_CTX_set_default_verify_paths); + DYNSSL(SSL_CTX_set_verify); + DYNSSL(X509_STORE_CTX_get_ex_data); #undef DYNSSL #define DYNCRYPTO(x) \ @@ -265,6 +285,14 @@ DWORD NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL) } 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)); + LeaveCriticalSection(&init_ssl_cs); + return ERROR_OUTOFMEMORY; + } + pSSL_CTX_set_verify(ctx, SSL_VERIFY_PEER, netconn_secure_verify); pCRYPTO_set_id_callback(ssl_thread_id); ssl_locks = HeapAlloc(GetProcessHeap(), 0,

1 0

Juan Lang : wininet: Check the certificate in an https connection using the crypto api.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 03fe473ad79d15b41849db09a39c3c88aa773f06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03fe473ad79d15b41849db09a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sun Dec 13 16:05:35 2009 -0800 wininet: Check the certificate in an https connection using the crypto api. --- dlls/wininet/netconnection.c | 198 ++++++++++++++++++++++++++++++++---------- 1 files changed, 153 insertions(+), 45 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index e0667ec..39ef464 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -23,6 +23,8 @@ #include "config.h" #include "wine/port.h" +#define NONAMELESSUNION + #if defined(__MINGW32__) || defined (_MSC_VER) #include <ws2tcpip.h> #endif @@ -152,6 +154,8 @@ MAKE_FUNCPTR(ERR_free_strings); MAKE_FUNCPTR(ERR_get_error); MAKE_FUNCPTR(ERR_error_string); MAKE_FUNCPTR(i2d_X509); +MAKE_FUNCPTR(sk_num); +MAKE_FUNCPTR(sk_value); #undef MAKE_FUNCPTR static CRITICAL_SECTION *ssl_locks; @@ -169,16 +173,159 @@ static void ssl_lock_callback(int mode, int type, const char *file, int line) LeaveCriticalSection(&ssl_locks[type]); } +static PCCERT_CONTEXT X509_to_cert_context(X509 *cert) +{ + unsigned char* buffer,*p; + INT len; + BOOL malloced = FALSE; + PCCERT_CONTEXT ret; + + p = NULL; + len = pi2d_X509(cert,&p); + /* + * SSL 0.9.7 and above malloc the buffer if it is null. + * however earlier version do not and so we would need to alloc the buffer. + * + * see the i2d_X509 man page for more details. + */ + if (!p) + { + buffer = HeapAlloc(GetProcessHeap(),0,len); + p = buffer; + len = pi2d_X509(cert,&p); + } + else + { + buffer = p; + malloced = TRUE; + } + + ret = CertCreateCertificateContext(X509_ASN_ENCODING,buffer,len); + + if (malloced) + free(buffer); + else + HeapFree(GetProcessHeap(),0,buffer); + + return ret; +} + +static BOOL netconn_verify_cert(PCCERT_CONTEXT cert, HCERTSTORE store, + WCHAR *server) +{ + BOOL ret; + CERT_CHAIN_PARA chainPara = { sizeof(chainPara), { 0 } }; + PCCERT_CHAIN_CONTEXT chain; + char oid_server_auth[] = szOID_PKIX_KP_SERVER_AUTH; + char *server_auth[] = { oid_server_auth }; + DWORD err; + + TRACE("verifying %s\n", debugstr_w(server)); + chainPara.RequestedUsage.Usage.cUsageIdentifier = 1; + chainPara.RequestedUsage.Usage.rgpszUsageIdentifier = server_auth; + if ((ret = CertGetCertificateChain(NULL, cert, NULL, store, &chainPara, 0, + NULL, &chain))) + { + if (chain->TrustStatus.dwErrorStatus) + { + if (chain->TrustStatus.dwErrorStatus & CERT_TRUST_IS_NOT_TIME_VALID) + err = ERROR_INTERNET_SEC_CERT_DATE_INVALID; + else if (chain->TrustStatus.dwErrorStatus & + CERT_TRUST_IS_UNTRUSTED_ROOT) + err = ERROR_INTERNET_INVALID_CA; + else if ((chain->TrustStatus.dwErrorStatus & + CERT_TRUST_IS_OFFLINE_REVOCATION) || + (chain->TrustStatus.dwErrorStatus & + CERT_TRUST_REVOCATION_STATUS_UNKNOWN)) + err = ERROR_INTERNET_SEC_CERT_NO_REV; + else if (chain->TrustStatus.dwErrorStatus & CERT_TRUST_IS_REVOKED) + err = ERROR_INTERNET_SEC_CERT_REVOKED; + else if (chain->TrustStatus.dwErrorStatus & + CERT_TRUST_IS_NOT_VALID_FOR_USAGE) + err = ERROR_INTERNET_SEC_INVALID_CERT; + else + err = ERROR_INTERNET_SEC_INVALID_CERT; + INTERNET_SetLastError(err); + ret = FALSE; + } + else + { + CERT_CHAIN_POLICY_PARA policyPara; + SSL_EXTRA_CERT_CHAIN_POLICY_PARA sslExtraPolicyPara; + CERT_CHAIN_POLICY_STATUS policyStatus; + + sslExtraPolicyPara.u.cbSize = sizeof(sslExtraPolicyPara); + sslExtraPolicyPara.dwAuthType = AUTHTYPE_SERVER; + sslExtraPolicyPara.pwszServerName = server; + policyPara.cbSize = sizeof(policyPara); + policyPara.dwFlags = 0; + policyPara.pvExtraPolicyPara = &sslExtraPolicyPara; + ret = CertVerifyCertificateChainPolicy(CERT_CHAIN_POLICY_SSL, + chain, &policyPara, &policyStatus); + /* Any error in the policy status indicates that the + * policy couldn't be verified. + */ + if (ret && policyStatus.dwError) + { + if (policyStatus.dwError == CERT_E_CN_NO_MATCH) + err = ERROR_INTERNET_SEC_CERT_CN_INVALID; + else + err = ERROR_INTERNET_SEC_INVALID_CERT; + INTERNET_SetLastError(err); + ret = FALSE; + } + } + CertFreeCertificateChain(chain); + } + TRACE("returning %d\n", ret); + return ret; +} + static int netconn_secure_verify(int preverify_ok, X509_STORE_CTX *ctx) { SSL *ssl; WCHAR *server; + BOOL ret = FALSE; 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; + if (preverify_ok) + { + HCERTSTORE store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, + CERT_STORE_CREATE_NEW_FLAG, NULL); + + if (store) + { + X509 *cert; + int i; + PCCERT_CONTEXT endCert = NULL; + + ret = TRUE; + for (i = 0; ret && i < psk_num((struct stack_st *)ctx->chain); i++) + { + PCCERT_CONTEXT context; + + cert = (X509 *)psk_value((struct stack_st *)ctx->chain, i); + if ((context = X509_to_cert_context(cert))) + { + if (i == 0) + ret = CertAddCertificateContextToStore(store, context, + CERT_STORE_ADD_ALWAYS, &endCert); + else + ret = CertAddCertificateContextToStore(store, context, + CERT_STORE_ADD_ALWAYS, NULL); + CertFreeCertificateContext(context); + } + } + if (!endCert) ret = FALSE; + if (ret) + ret = netconn_verify_cert(endCert, store, server); + CertFreeCertificateContext(endCert); + CertCloseStore(store, 0); + } + } + return ret; } #endif @@ -268,6 +415,8 @@ DWORD NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL) DYNCRYPTO(ERR_get_error); DYNCRYPTO(ERR_error_string); DYNCRYPTO(i2d_X509); + DYNCRYPTO(sk_num); + DYNCRYPTO(sk_value); #undef DYNCRYPTO pSSL_library_init(); @@ -459,13 +608,7 @@ DWORD NETCON_close(WININET_NETCONNECTION *connection) return sock_get_error(errno); return ERROR_SUCCESS; } -#ifdef SONAME_LIBSSL -static BOOL check_hostname(X509 *cert, LPCWSTR hostname) -{ - /* FIXME: implement */ - return TRUE; -} -#endif + /****************************************************************************** * NETCON_secure_connect * Initiates a secure connection over an existing plaintext connection. @@ -525,12 +668,6 @@ DWORD NETCON_secure_connect(WININET_NETCONNECTION *connection, LPWSTR hostname) * the moment */ } - if (!check_hostname(cert, hostname)) - { - res = ERROR_INTERNET_SEC_CERT_CN_INVALID; - goto fail; - } - connection->useSSL = TRUE; return ERROR_SUCCESS; @@ -662,42 +799,13 @@ LPCVOID NETCON_GetCert(WININET_NETCONNECTION *connection) { #ifdef SONAME_LIBSSL X509* cert; - unsigned char* buffer,*p; - INT len; - BOOL malloced = FALSE; LPCVOID r = NULL; if (!connection->useSSL) return NULL; cert = pSSL_get_peer_certificate(connection->ssl_s); - p = NULL; - len = pi2d_X509(cert,&p); - /* - * SSL 0.9.7 and above malloc the buffer if it is null. - * however earlier version do not and so we would need to alloc the buffer. - * - * see the i2d_X509 man page for more details. - */ - if (!p) - { - buffer = HeapAlloc(GetProcessHeap(),0,len); - p = buffer; - len = pi2d_X509(cert,&p); - } - else - { - buffer = p; - malloced = TRUE; - } - - r = CertCreateCertificateContext(X509_ASN_ENCODING,buffer,len); - - if (malloced) - free(buffer); - else - HeapFree(GetProcessHeap(),0,buffer); - + r = X509_to_cert_context(cert); return r; #else return NULL;

1 0

Vincent Povirk : ole32: Fix a memory leak in StorageBaseImpl_CopyTo.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 0ad48797f8382aa74352883f160a4bdac8037fd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ad48797f8382aa74352883f1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sun Dec 13 18:16:56 2009 -0600 ole32: Fix a memory leak in StorageBaseImpl_CopyTo. Spotted by valgrind. --- dlls/ole32/storage32.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 479c2a5..00ffe89 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -1656,12 +1656,12 @@ static HRESULT WINAPI StorageBaseImpl_CopyTo( } if ( skip ) - continue; + goto cleanup; if (curElement.type == STGTY_STORAGE) { if(skip_storage) - continue; + goto cleanup; /* * open child source storage @@ -1671,7 +1671,7 @@ static HRESULT WINAPI StorageBaseImpl_CopyTo( NULL, 0, &pstgChild ); if (hr != S_OK) - break; + goto cleanup; /* * Check if destination storage is not a child of the source @@ -1679,9 +1679,8 @@ static HRESULT WINAPI StorageBaseImpl_CopyTo( */ if (pstgChild == pstgDest) { - IEnumSTATSTG_Release(elements); - - return STG_E_ACCESSDENIED; + hr = STG_E_ACCESSDENIED; + goto cleanup; } /* @@ -1702,7 +1701,7 @@ static HRESULT WINAPI StorageBaseImpl_CopyTo( } if (hr != S_OK) - break; + goto cleanup; /* @@ -1717,7 +1716,7 @@ static HRESULT WINAPI StorageBaseImpl_CopyTo( else if (curElement.type == STGTY_STREAM) { if(skip_stream) - continue; + goto cleanup; /* * create a new stream in destination storage. If the stream already @@ -1728,7 +1727,7 @@ static HRESULT WINAPI StorageBaseImpl_CopyTo( 0, 0, &pstrTmp ); if (hr != S_OK) - break; + goto cleanup; /* * open child stream storage @@ -1738,7 +1737,7 @@ static HRESULT WINAPI StorageBaseImpl_CopyTo( 0, &pstrChild ); if (hr != S_OK) - break; + goto cleanup; /* * Get the size of the source stream @@ -1764,6 +1763,8 @@ static HRESULT WINAPI StorageBaseImpl_CopyTo( WARN("unknown element type: %d\n", curElement.type); } +cleanup: + CoTaskMemFree(curElement.pwcsName); } while (hr == S_OK); /*

1 0

Vincent Povirk : ole32: Remove an unnecessary special case in StorageBaseImpl_CopyTo.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 6afe24c38d6ff3644f3ae9108536f9476e73818a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6afe24c38d6ff3644f3ae9108… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sun Dec 13 18:21:54 2009 -0600 ole32: Remove an unnecessary special case in StorageBaseImpl_CopyTo. Opening a storage when it has already been opened now fails with STG_E_ACCESSDENIED. If we attempt to copy a storage to its own child, this will happen during the copy. --- dlls/ole32/storage32.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 00ffe89..2d2c3d6 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -1674,16 +1674,6 @@ static HRESULT WINAPI StorageBaseImpl_CopyTo( goto cleanup; /* - * Check if destination storage is not a child of the source - * storage, which will cause an infinite loop - */ - if (pstgChild == pstgDest) - { - hr = STG_E_ACCESSDENIED; - goto cleanup; - } - - /* * create a new storage in destination storage */ hr = IStorage_CreateStorage( pstgDest, curElement.pwcsName,

1 0

Vincent Povirk : ole32: Properly free temporary objects when StorageBaseImpl_CopyTo fails.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 3ac34f7416ff660a62abacee9d9bff7cc72d5339 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ac34f7416ff660a62abacee9… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sun Dec 13 18:30:35 2009 -0600 ole32: Properly free temporary objects when StorageBaseImpl_CopyTo fails. --- dlls/ole32/storage32.c | 51 ++++++++++++++++++++++++----------------------- 1 files changed, 26 insertions(+), 25 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 2d2c3d6..90d2434 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -1690,17 +1690,17 @@ static HRESULT WINAPI StorageBaseImpl_CopyTo( NULL, 0, &pstgTmp ); } - if (hr != S_OK) - goto cleanup; - + if (hr == S_OK) + { + /* + * do the copy recursively + */ + hr = IStorage_CopyTo( pstgChild, ciidExclude, rgiidExclude, + NULL, pstgTmp ); - /* - * do the copy recursively - */ - hr = IStorage_CopyTo( pstgChild, ciidExclude, rgiidExclude, - NULL, pstgTmp ); + IStorage_Release( pstgTmp ); + } - IStorage_Release( pstgTmp ); IStorage_Release( pstgChild ); } else if (curElement.type == STGTY_STREAM) @@ -1726,27 +1726,28 @@ static HRESULT WINAPI StorageBaseImpl_CopyTo( STGM_READ|STGM_SHARE_EXCLUSIVE, 0, &pstrChild ); - if (hr != S_OK) - goto cleanup; + if (hr == S_OK) + { + /* + * Get the size of the source stream + */ + IStream_Stat( pstrChild, &strStat, STATFLAG_NONAME ); - /* - * Get the size of the source stream - */ - IStream_Stat( pstrChild, &strStat, STATFLAG_NONAME ); + /* + * Set the size of the destination stream. + */ + IStream_SetSize(pstrTmp, strStat.cbSize); - /* - * Set the size of the destination stream. - */ - IStream_SetSize(pstrTmp, strStat.cbSize); + /* + * do the copy + */ + hr = IStream_CopyTo( pstrChild, pstrTmp, strStat.cbSize, + NULL, NULL ); - /* - * do the copy - */ - hr = IStream_CopyTo( pstrChild, pstrTmp, strStat.cbSize, - NULL, NULL ); + IStream_Release( pstrChild ); + } IStream_Release( pstrTmp ); - IStream_Release( pstrChild ); } else {

1 0

Nicolas Le Cam : ddraw/tests: Get rid of a carriage return in a trace.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: bf64bbd1fb3c3a6664f89d83abcbcb3a31a6f9c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf64bbd1fb3c3a6664f89d83a… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Sat Dec 5 14:54:06 2009 +0100 ddraw/tests: Get rid of a carriage return in a trace. --- dlls/ddraw/tests/ddrawmodes.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index e44c6bc..c584684 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -345,7 +345,7 @@ static void flushdisplaymodes(void) static HRESULT WINAPI enummodescallback(LPDDSURFACEDESC lpddsd, LPVOID lpContext) { - trace("Width = %i, Height = %i, Refresh Rate = %i, Pitch = %i, flags =%02X\r\n", + trace("Width = %i, Height = %i, Refresh Rate = %i, Pitch = %i, flags =%02X\n", lpddsd->dwWidth, lpddsd->dwHeight, U2(*lpddsd).dwRefreshRate, U1(*lpddsd).lPitch, lpddsd->dwFlags);

1 0

Gregor Schneider : mlang: Change EnumRfc1766_create return values to error codes.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 3fa550b5325a6ff19c8eb435d2f4ce025eb8d97a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fa550b5325a6ff19c8eb435d… Author: Gregor Schneider <grschneider(a)gmail.com> Date: Sun Dec 13 17:53:15 2009 +0100 mlang: Change EnumRfc1766_create return values to error codes. --- dlls/mlang/mlang.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index c28e695..49f0605 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -2501,7 +2501,7 @@ static HRESULT EnumRfc1766_create(LANGID LangId, IEnumRfc1766 **ppEnum) if (!data.info) { HeapFree(GetProcessHeap(), 0, rfc); - return S_FALSE; + return E_OUTOFMEMORY; } TlsSetValue(MLANG_tls_index, &data); @@ -2514,7 +2514,7 @@ static HRESULT EnumRfc1766_create(LANGID LangId, IEnumRfc1766 **ppEnum) { HeapFree(GetProcessHeap(), 0, data.info); HeapFree(GetProcessHeap(), 0, rfc); - return FALSE; + return E_FAIL; } rfc->info = data.info;

1 0

Gregor Schneider : xcopy: Remove unneeded assignment.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: b6a5da06e928e03f479f7847a7d73c767aa830ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6a5da06e928e03f479f7847a… Author: Gregor Schneider <grschneider(a)gmail.com> Date: Sun Dec 13 18:03:00 2009 +0100 xcopy: Remove unneeded assignment. --- programs/xcopy/xcopy.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index eaff10c..f996144 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -261,10 +261,10 @@ int wmain (int argc, WCHAR *argvW[]) WINE_TRACE("Destination : '%s'\n", wine_dbgstr_w(supplieddestination)); /* Extract required information from source specification */ - rc = XCOPY_ProcessSourceParm(suppliedsource, sourcestem, sourcespec, flags); + XCOPY_ProcessSourceParm(suppliedsource, sourcestem, sourcespec, flags); /* Extract required information from destination specification */ - rc = XCOPY_ProcessDestParm(supplieddestination, destinationstem, + XCOPY_ProcessDestParm(supplieddestination, destinationstem, destinationspec, sourcespec, flags); /* Trace out the resulting information */

1 0

Juan Lang : wininet: Don' t unnecessarily convert hostname to ANSI to check it.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 33e68268a49634493a4811d86db845f756975686 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33e68268a49634493a4811d86… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sun Dec 13 15:21:29 2009 -0800 wininet: Don't unnecessarily convert hostname to ANSI to check it. --- dlls/wininet/netconnection.c | 17 ++--------------- 1 files changed, 2 insertions(+), 15 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 1f95dcb..2d1c07b 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -422,7 +422,7 @@ DWORD NETCON_close(WININET_NETCONNECTION *connection) return ERROR_SUCCESS; } #ifdef SONAME_LIBSSL -static BOOL check_hostname(X509 *cert, char *hostname) +static BOOL check_hostname(X509 *cert, LPCWSTR hostname) { /* FIXME: implement */ return TRUE; @@ -438,8 +438,6 @@ DWORD NETCON_secure_connect(WININET_NETCONNECTION *connection, LPCWSTR hostname) #ifdef SONAME_LIBSSL long verify_res; X509 *cert; - int len; - char *hostname_unix; /* can't connect if we are already connected */ if (connection->useSSL) @@ -488,23 +486,12 @@ DWORD NETCON_secure_connect(WININET_NETCONNECTION *connection, LPCWSTR hostname) * the moment */ } - len = WideCharToMultiByte(CP_UNIXCP, 0, hostname, -1, NULL, 0, NULL, NULL); - hostname_unix = HeapAlloc(GetProcessHeap(), 0, len); - if (!hostname_unix) + if (!check_hostname(cert, hostname)) { - res = ERROR_OUTOFMEMORY; - goto fail; - } - WideCharToMultiByte(CP_UNIXCP, 0, hostname, -1, hostname_unix, len, NULL, NULL); - - if (!check_hostname(cert, hostname_unix)) - { - HeapFree(GetProcessHeap(), 0, hostname_unix); res = ERROR_INTERNET_SEC_CERT_CN_INVALID; goto fail; } - HeapFree(GetProcessHeap(), 0, hostname_unix); connection->useSSL = TRUE; return ERROR_SUCCESS;

1 0

Juan Lang : wininet: Free OpenSSL error strings at unload.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 1350e9d1c08678d228092ffa338503591190e90c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1350e9d1c08678d228092ffa3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sun Dec 13 15:23:27 2009 -0800 wininet: Free OpenSSL error strings at unload. --- dlls/wininet/netconnection.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 2d1c07b..b73df94 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -141,6 +141,7 @@ MAKE_FUNCPTR(BIO_new_fp); MAKE_FUNCPTR(CRYPTO_num_locks); MAKE_FUNCPTR(CRYPTO_set_id_callback); MAKE_FUNCPTR(CRYPTO_set_locking_callback); +MAKE_FUNCPTR(ERR_free_strings); MAKE_FUNCPTR(ERR_get_error); MAKE_FUNCPTR(ERR_error_string); MAKE_FUNCPTR(i2d_X509); @@ -238,6 +239,7 @@ DWORD NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL) DYNCRYPTO(CRYPTO_num_locks); DYNCRYPTO(CRYPTO_set_id_callback); DYNCRYPTO(CRYPTO_set_locking_callback); + DYNCRYPTO(ERR_free_strings); DYNCRYPTO(ERR_get_error); DYNCRYPTO(ERR_error_string); DYNCRYPTO(i2d_X509); @@ -282,6 +284,7 @@ void NETCON_unload(void) #if defined(SONAME_LIBSSL) && defined(SONAME_LIBCRYPTO) if (OpenSSL_crypto_handle) { + pERR_free_strings(); wine_dlclose(OpenSSL_crypto_handle, NULL, 0); } if (OpenSSL_ssl_handle)

1 0