diff options
Diffstat (limited to 'src/plugins/tlsopenssl/tls_openssl.c')
| -rw-r--r-- | src/plugins/tlsopenssl/tls_openssl.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/plugins/tlsopenssl/tls_openssl.c b/src/plugins/tlsopenssl/tls_openssl.c index eeeb74982f2..3dece6e29fc 100644 --- a/src/plugins/tlsopenssl/tls_openssl.c +++ b/src/plugins/tlsopenssl/tls_openssl.c @@ -424,8 +424,10 @@ openssl_ctx_read (tls_ctx_t * ctx, session_t * tls_session) if (PREDICT_FALSE (SSL_in_init (oc->ssl))) { - openssl_ctx_handshake_rx (ctx, tls_session); - return 0; + if (openssl_ctx_handshake_rx (ctx, tls_session) < 0) + return 0; + else + goto check_app_fifo; } f = tls_session->rx_fifo; @@ -487,7 +489,9 @@ check_app_fifo: svm_fifo_enqueue_nocopy (f, read); } - tls_notify_app_enqueue (ctx, app_session); + /* If handshake just completed, session may still be in accepting state */ + if (app_session->session_state >= SESSION_STATE_READY) + tls_notify_app_enqueue (ctx, app_session); if (SSL_pending (oc->ssl) > 0) tls_add_vpp_q_builtin_rx_evt (tls_session); |