moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

nginx: add patch to fix OCSP stapling with libressl.

Browse source
This commit is contained in:
Enno Boland 2019-07-06 20:10:11 +02:00 • committed by Enno Boland
parent bfe41358e7
commit 5ed7ef5070
2 changed files with 28 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

27
srcpkgs/nginx/patches/fix-libressl-stapling-issues.patch Normal file
View file

@ -0,0 +1,27 @@
ref: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=237757#c5
--- src/event/ngx_event_openssl_stapling.c.org 2019-05-12 23:56:58.526833000 +0200
+++ src/event/ngx_event_openssl_stapling.c 2019-05-13 01:31:53.737800000 +0200
@@ -298,7 +298,10 @@
SSL_CTX_select_current_cert(ssl->ctx, cert);
#endif
-#ifdef SSL_CTRL_GET_EXTRA_CHAIN_CERTS
+#ifdef SSL_CTX_get0_chain_certs
+ /* OpenSSL 1.0.2+ */
+ SSL_CTX_get0_chain_certs(ssl->ctx, &chain);
+#elif SSL_CTRL_GET_EXTRA_CHAIN_CERTS
/* OpenSSL 1.0.1+ */
SSL_CTX_get_extra_chain_certs(ssl->ctx, &chain);
#else
@@ -655,7 +658,10 @@
SSL_CTX_select_current_cert(staple->ssl_ctx, ctx->cert);
#endif
-#ifdef SSL_CTRL_GET_EXTRA_CHAIN_CERTS
+#ifdef SSL_CTX_get0_chain_certs
+ /* OpenSSL 1.0.2+ */
+ SSL_CTX_get0_chain_certs(staple->ssl_ctx, &chain);
+#elif SSL_CTRL_GET_EXTRA_CHAIN_CERTS
/* OpenSSL 1.0.1+ */
SSL_CTX_get_extra_chain_certs(staple->ssl_ctx, &chain);
#else

2
srcpkgs/nginx/template
View file

@ -1,7 +1,7 @@
# Template file for 'nginx' # Template file for 'nginx'
pkgname=nginx pkgname=nginx
version=1.16.0 version=1.16.0
revision=2 revision=3
build_style=gnu-makefile build_style=gnu-makefile
makedepends="libressl-devel pcre-devel $(vopt_if geoip 'geoip-devel')" makedepends="libressl-devel pcre-devel $(vopt_if geoip 'geoip-devel')"
short_desc="High performance web and reverse proxy server" short_desc="High performance web and reverse proxy server"