File nginx-1.11.2-ssl_cert_cb_yield.patch of Package nginx

Overview Repositories Revisions Requests Users Attributes Meta

File nginx-1.11.2-ssl_cert_cb_yield.patch of Package nginx (Revision 87a5a3d9e62e7003ff1aa231ab5ff97c)

Currently displaying revision 87a5a3d9e62e7003ff1aa231ab5ff97c , Show latest

# HG changeset patch
# User Yichun Zhang <agentzh@openresty.org>
# Date 1451762084 28800
#      Sat Jan 02 11:14:44 2016 -0800
# Node ID 449f0461859c16e95bdb18e8be6b94401545d3dd
# Parent  78b4e10b4367b31367aad3c83c9c3acdd42397c4
SSL: handled SSL_CTX_set_cert_cb() callback yielding.

OpenSSL 1.0.2+ introduces SSL_CTX_set_cert_cb() to allow custom
callbacks to serve the SSL certificiates and private keys dynamically
and lazily. The callbacks may yield for nonblocking I/O or sleeping.
Here we added support for such usage in NGINX 3rd-party modules
(like ngx_lua) in NGINX's event handlers for downstream SSL
connections.

diff -r 78b4e10b4367 -r 449f0461859c src/event/ngx_event_openssl.c
--- a/src/event/ngx_event_openssl.c	Thu Dec 17 16:39:15 2015 +0300
+++ b/src/event/ngx_event_openssl.c	Sat Jan 02 11:14:44 2016 -0800
@@ -1210,6 +1210,23 @@
         return NGX_AGAIN;
     }
 
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L
+    if (sslerr == SSL_ERROR_WANT_X509_LOOKUP) {
+        c->read->handler = ngx_ssl_handshake_handler;
+        c->write->handler = ngx_ssl_handshake_handler;
+
+        if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
+            return NGX_ERROR;
+        }
+
+        if (ngx_handle_write_event(c->write, 0) != NGX_OK) {
+            return NGX_ERROR;
+        }
+
+        return NGX_AGAIN;
+    }
+#endif
+
     err = (sslerr == SSL_ERROR_SYSCALL) ? ngx_errno : 0;
 
     c->ssl->no_wait_shutdown = 1;

Places

File nginx-1.11.2-ssl_cert_cb_yield.patch of Package nginx (Revision 87a5a3d9e62e7003ff1aa231ab5ff97c)

Places