albino
/
ngircd-tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SSL/TLS: fix bogus 'socket closed' error message 

When we get there then the ssl handshake has failed, or
we could not create a ssl context because ssl library
initialization failed on startup.

Reflect that in the log message.
This commit is contained in:
Florian Westphal 2010-05-07 23:25:59 +02:00
parent defd7e09af
commit df359835d1
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ngircd/conn-ssl.c
View File

@ -383,9 +383,10 @@ ConnSSL_Init_SSL(CONNECTION *c)
int ret;
assert(c != NULL);
#ifdef HAVE_LIBSSL
if (!ssl_ctx) /* NULL when library initialization failed */
if (!ssl_ctx) {
Log(LOG_ERR, "Cannot init ssl_ctx: OpenSSL initialization failed at startup");
return false;
}
assert(c->ssl_state.ssl == NULL);
c->ssl_state.ssl = SSL_new(ssl_ctx);

2
src/ngircd/conn.c
View File

@ -342,7 +342,7 @@ cb_clientserver_ssl(int sock, short what)
case 0:
return; /* EAGAIN: callback will be invoked again by IO layer */
default:
Conn_Close(idx, "Socket closed!", "SSL accept error", false);
Conn_Close(idx, "SSL accept error, closing socket", "SSL accept error", false);
return;
}
if (what & IO_WANTREAD)