-
Notifications
You must be signed in to change notification settings - Fork 8.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3006 from ElvinEfendi/nginx-patch-for-cert-by-lua
apply nginx patch to make ssl_certificate_by_lua_block work properly
- Loading branch information
Showing
3 changed files
with
46 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
42 changes: 42 additions & 0 deletions
42
images/nginx/rootfs/patches/openresty-ssl_cert_cb_yield.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
# HG changeset patch | ||
# User Yichun Zhang <[email protected]> | ||
# 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; |