diff options
| author | speidy <speidy@gmail.com> | 2018-03-17 09:38:32 +0200 |
|---|---|---|
| committer | Idan <speidy@gmail.com> | 2018-03-21 08:16:12 +0200 |
| commit | 8effc09ab75bf3c353cbc44746d29bdc916b863f (patch) | |
| tree | 64d8c924707075e0c7afc9e617ecc1a2d3644da0 /common | |
| parent | e3d0fd6d468fbbdd0265e09bec118d450d553512 (diff) | |
| download | xrdp-proprietary-8effc09ab75bf3c353cbc44746d29bdc916b863f.tar.gz xrdp-proprietary-8effc09ab75bf3c353cbc44746d29bdc916b863f.zip | |
common: ssl_calls: check if SSL object created right after its creation.
Diffstat (limited to 'common')
| -rw-r--r-- | common/ssl_calls.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/common/ssl_calls.c b/common/ssl_calls.c index 9347e411..5ea15c74 100644 --- a/common/ssl_calls.c +++ b/common/ssl_calls.c @@ -643,6 +643,12 @@ ssl_tls_accept(struct ssl_tls *self, long ssl_protocols, options |= SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS; self->ctx = SSL_CTX_new(SSLv23_server_method()); + if (self->ctx == NULL) + { + log_message(LOG_LEVEL_ERROR, "ssl_tls_accept: SSL_CTX_new failed"); + return 1; + } + /* set context options */ SSL_CTX_set_mode(self->ctx, SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER | @@ -663,7 +669,8 @@ ssl_tls_accept(struct ssl_tls *self, long ssl_protocols, if (g_strlen(tls_ciphers) > 1) { - log_message(LOG_LEVEL_TRACE, "ssl_tls_accept: tls_ciphers=%s", tls_ciphers); + log_message(LOG_LEVEL_TRACE, "ssl_tls_accept: tls_ciphers=%s", \ + tls_ciphers); if (SSL_CTX_set_cipher_list(self->ctx, tls_ciphers) == 0) { g_writeln("ssl_tls_accept: invalid cipher options"); @@ -673,12 +680,6 @@ ssl_tls_accept(struct ssl_tls *self, long ssl_protocols, SSL_CTX_set_read_ahead(self->ctx, 1); - if (self->ctx == NULL) - { - g_writeln("ssl_tls_accept: SSL_CTX_new failed"); - return 1; - } - if (SSL_CTX_use_RSAPrivateKey_file(self->ctx, self->key, SSL_FILETYPE_PEM) <= 0) { |