diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ngircd/conn-ssl.c | 12 | ||||
| -rw-r--r-- | src/ngircd/sighandlers.c | 2 |
2 files changed, 12 insertions, 2 deletions
diff --git a/src/ngircd/conn-ssl.c b/src/ngircd/conn-ssl.c index ba47e513..3f482dc7 100644 --- a/src/ngircd/conn-ssl.c +++ b/src/ngircd/conn-ssl.c @@ -311,8 +311,18 @@ ConnSSL_InitLibrary( void ) return false; } - if (!ConnSSL_LoadServerKey_openssl(newctx)) + if (!ConnSSL_LoadServerKey_openssl(newctx)) { + /* Failed to read new key but an old ssl context + * already exists -> reuse old context */ + if (ssl_ctx) { + SSL_CTX_free(newctx); + Log(LOG_WARNING, + "Re-Initializing of SSL failed, using old keys!"); + return true; + } + /* No preexisting old context -> error. */ goto out; + } if (SSL_CTX_set_cipher_list(newctx, Conf_SSLOptions.CipherList) == 0) { Log(LOG_ERR, "Failed to apply OpenSSL cipher list \"%s\"!", diff --git a/src/ngircd/sighandlers.c b/src/ngircd/sighandlers.c index f7ae4f45..8275123e 100644 --- a/src/ngircd/sighandlers.c +++ b/src/ngircd/sighandlers.c @@ -132,7 +132,7 @@ Rehash(void) if (!ConnSSL_InitLibrary()) Log(LOG_WARNING, - "Re-Initializing of SSL failed, using old keys!"); + "Re-Initializing of SSL failed!"); /* Start listening on sockets */ Conn_InitListeners( ); |