ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winhttp: Use a process global SSL context instead of per connection.

This commit is contained in:
Hans Leidekker 2008-09-07 21:35:07 +02:00 committed by Alexandre Julliard
parent 520b6e8153
commit 2fb746783f
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/winhttp/net.c
View File

@ -83,6 +83,7 @@ static void *libssl_handle;
static void *libcrypto_handle; static void *libcrypto_handle;
static SSL_METHOD *method; static SSL_METHOD *method;
static SSL_CTX *ctx;
#define MAKE_FUNCPTR(f) static typeof(f) * p##f #define MAKE_FUNCPTR(f) static typeof(f) * p##f
@ -90,7 +91,6 @@ MAKE_FUNCPTR( SSL_library_init );
MAKE_FUNCPTR( SSL_load_error_strings ); MAKE_FUNCPTR( SSL_load_error_strings );
MAKE_FUNCPTR( SSLv23_method ); MAKE_FUNCPTR( SSLv23_method );
MAKE_FUNCPTR( SSL_CTX_new ); MAKE_FUNCPTR( SSL_CTX_new );
MAKE_FUNCPTR( SSL_CTX_free );
MAKE_FUNCPTR( SSL_new ); MAKE_FUNCPTR( SSL_new );
MAKE_FUNCPTR( SSL_free ); MAKE_FUNCPTR( SSL_free );
MAKE_FUNCPTR( SSL_set_fd ); MAKE_FUNCPTR( SSL_set_fd );
@ -207,7 +207,6 @@ BOOL netconn_init( netconn_t *conn, BOOL secure )
LOAD_FUNCPTR( SSL_load_error_strings ); LOAD_FUNCPTR( SSL_load_error_strings );
LOAD_FUNCPTR( SSLv23_method ); LOAD_FUNCPTR( SSLv23_method );
LOAD_FUNCPTR( SSL_CTX_new ); LOAD_FUNCPTR( SSL_CTX_new );
LOAD_FUNCPTR( SSL_CTX_free );
LOAD_FUNCPTR( SSL_new ); LOAD_FUNCPTR( SSL_new );
LOAD_FUNCPTR( SSL_free ); LOAD_FUNCPTR( SSL_free );
LOAD_FUNCPTR( SSL_set_fd ); LOAD_FUNCPTR( SSL_set_fd );
@ -240,8 +239,6 @@ BOOL netconn_init( netconn_t *conn, BOOL secure )
pBIO_new_fp( stderr, BIO_NOCLOSE ); pBIO_new_fp( stderr, BIO_NOCLOSE );
method = pSSLv23_method(); method = pSSLv23_method();
conn->ssl_ctx = pSSL_CTX_new( method );
#else #else
WARN("SSL support not compiled in.\n"); WARN("SSL support not compiled in.\n");
set_last_error( ERROR_WINHTTP_SECURE_CHANNEL_ERROR ); set_last_error( ERROR_WINHTTP_SECURE_CHANNEL_ERROR );
@ -312,13 +309,14 @@ BOOL netconn_secure_connect( netconn_t *conn )
X509 *cert; X509 *cert;
long res; long res;
if (!pSSL_CTX_set_default_verify_paths( conn->ssl_ctx )) ctx = pSSL_CTX_new( method );
if (!pSSL_CTX_set_default_verify_paths( ctx ))
{ {
ERR("SSL_CTX_set_default_verify_paths failed: %s\n", pERR_error_string( pERR_get_error(), 0 )); ERR("SSL_CTX_set_default_verify_paths failed: %s\n", pERR_error_string( pERR_get_error(), 0 ));
set_last_error( ERROR_OUTOFMEMORY ); set_last_error( ERROR_OUTOFMEMORY );
return FALSE; return FALSE;
} }
if (!(conn->ssl_conn = pSSL_new( conn->ssl_ctx ))) if (!(conn->ssl_conn = pSSL_new( ctx )))
{ {
ERR("SSL_new failed: %s\n", pERR_error_string( pERR_get_error(), 0 )); ERR("SSL_new failed: %s\n", pERR_error_string( pERR_get_error(), 0 ));
set_last_error( ERROR_OUTOFMEMORY ); set_last_error( ERROR_OUTOFMEMORY );
@ -488,8 +486,8 @@ BOOL netconn_get_next_line( netconn_t *conn, char *buffer, DWORD *buflen )
#ifdef SONAME_LIBSSL #ifdef SONAME_LIBSSL
long timeout; long timeout;
timeout = pSSL_CTX_get_timeout( conn->ssl_ctx ); timeout = pSSL_CTX_get_timeout( ctx );
pSSL_CTX_set_timeout( conn->ssl_ctx, DEFAULT_RECEIVE_TIMEOUT ); pSSL_CTX_set_timeout( ctx, DEFAULT_RECEIVE_TIMEOUT );
while (recvd < *buflen) while (recvd < *buflen)
{ {
@ -506,7 +504,7 @@ BOOL netconn_get_next_line( netconn_t *conn, char *buffer, DWORD *buflen )
} }
if (buffer[recvd] != '\r') recvd++; if (buffer[recvd] != '\r') recvd++;
} }
pSSL_CTX_set_timeout( conn->ssl_ctx, timeout ); pSSL_CTX_set_timeout( ctx, timeout );
if (ret) if (ret)
{ {
buffer[recvd++] = 0; buffer[recvd++] = 0;

1
dlls/winhttp/winhttp_private.h
View File

@ -91,7 +91,6 @@ typedef struct
{ {
int socket; int socket;
BOOL secure; /* SSL active on connection? */ BOOL secure; /* SSL active on connection? */
void *ssl_ctx;
void *ssl_conn; void *ssl_conn;
char *peek_msg; char *peek_msg;
char *peek_msg_mem; char *peek_msg_mem;