9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

OpenSSL: Initialise one context at a time

Browse source 
If initialising the server context fails, but the client one succeeds,
we will not only leak memory, but the error message reported for
initialising the server context might not make sense, because we
initialise the client context after and that could erase or change the
list of queued errors.

This scenario is considered rare. Nevertheless, we now initialise the
client context after *successfully* initialising the server context.
This commit is contained in:
Aaron Jones 2016-08-30 10:21:46 +00:00
parent 545668de33
commit 07b6e728b5
No known key found for this signature in database
GPG key ID: EC6F86EE9CD840B5
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
libratbox/src/openssl.c
View file

@ -399,24 +399,25 @@ rb_setup_ssl_server(const char *cert, const char *keyfile, const char *dhfile, c
cipher_list = libratbox_ciphers; cipher_list = libratbox_ciphers;
#ifdef LRB_HAVE_TLS_METHOD_API #ifdef LRB_HAVE_TLS_METHOD_API
ssl_server_ctx_new = SSL_CTX_new(TLS_server_method()); if((ssl_server_ctx_new = SSL_CTX_new(TLS_server_method())) == NULL)
ssl_client_ctx_new = SSL_CTX_new(TLS_client_method());
#else #else
ssl_server_ctx_new = SSL_CTX_new(SSLv23_server_method()); if((ssl_server_ctx_new = SSL_CTX_new(SSLv23_server_method())) == NULL)
ssl_client_ctx_new = SSL_CTX_new(SSLv23_client_method());
#endif #endif
if(ssl_server_ctx_new == NULL)
{ {
rb_lib_log("rb_init_openssl: Unable to initialize OpenSSL server context: %s", rb_lib_log("rb_init_openssl: Unable to initialize OpenSSL server context: %s",
get_ssl_error(ERR_get_error())); get_ssl_error(ERR_get_error()));
return 0; return 0;
} }
if(ssl_client_ctx_new == NULL) #ifdef LRB_HAVE_TLS_METHOD_API
if((ssl_client_ctx_new = SSL_CTX_new(TLS_client_method())) == NULL)
#else
if((ssl_client_ctx_new = SSL_CTX_new(SSLv23_client_method())) == NULL)
#endif
{ {
rb_lib_log("rb_init_openssl: Unable to initialize OpenSSL client context: %s", rb_lib_log("rb_init_openssl: Unable to initialize OpenSSL client context: %s",
get_ssl_error(ERR_get_error())); get_ssl_error(ERR_get_error()));
SSL_CTX_free(ssl_server_ctx_new); SSL_CTX_free(ssl_server_ctx_new);
return 0; return 0;
} }