walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

nghttpx: Fix crash in SSL_CTX_set_tlsext_ticket_key_cb 

It seems that returning 0 when enc == 0 crashes OpenSSL.
This commit is contained in:
Tatsuhiro Tsujikawa 2015-01-08 20:46:35 +09:00
parent 5dce9501a6
commit 5d3544185c
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/shrpx.cc
View File

@ -465,7 +465,6 @@ void renew_ticket_key_cb(struct ev_loop *loop, ev_timer *w, int revents) {
if (LOG_ENABLED(INFO)) { if (LOG_ENABLED(INFO)) {
LOG(INFO) << "failed to renew ticket key"; LOG(INFO) << "failed to renew ticket key";
} }
mod_config()->ticket_keys.reset();
return; return;
} }

6
src/shrpx_ssl.cc
View File

@ -160,8 +160,8 @@ int ticket_key_cb(SSL *ssl, unsigned char *key_name, unsigned char *iv,
#endif // NOTHREADS #endif // NOTHREADS
if (!ticket_keys) { if (!ticket_keys) {
/* No ticket keys available. Perform full handshake */ // No ticket keys available.
return 0; return -1;
} }
auto &keys = ticket_keys->keys; auto &keys = ticket_keys->keys;
@ -172,7 +172,7 @@ int ticket_key_cb(SSL *ssl, unsigned char *key_name, unsigned char *iv,
if (LOG_ENABLED(INFO)) { if (LOG_ENABLED(INFO)) {
CLOG(INFO, handler) << "session ticket key: RAND_bytes failed"; CLOG(INFO, handler) << "session ticket key: RAND_bytes failed";
} }
return 0; return -1;
} }
auto &key = keys[0]; auto &key = keys[0];