diff options
author | Sergey A. Osokin <osa@FreeBSD.org> | 2018-04-22 21:35:51 +0000 |
---|---|---|
committer | Sergey A. Osokin <osa@FreeBSD.org> | 2018-04-22 21:35:51 +0000 |
commit | 1ab72784ba297e77a1414e9536668b0ac7dc74c3 (patch) | |
tree | a17b0c740156e31d281c319d999fb30a7db13743 /www/nginx-devel/files/extra-patch-nginx-ct-LibreSSL | |
parent | Add mail/dovecot22 (v2.2.35) and mail/dovecot-pigeonhole04 (v0.4.23) (diff) |
Merge from www/nginx and adopt next revisions:
465814, 465851, 465931, 468031.
Bump PORTREVISION.
Notes
Notes:
svn path=/head/; revision=468061
Diffstat (limited to 'www/nginx-devel/files/extra-patch-nginx-ct-LibreSSL')
-rw-r--r-- | www/nginx-devel/files/extra-patch-nginx-ct-LibreSSL | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/www/nginx-devel/files/extra-patch-nginx-ct-LibreSSL b/www/nginx-devel/files/extra-patch-nginx-ct-LibreSSL new file mode 100644 index 000000000000..4dd87b8a8fae --- /dev/null +++ b/www/nginx-devel/files/extra-patch-nginx-ct-LibreSSL @@ -0,0 +1,20 @@ +--- ../ nginx-ct-1.3.2/ngx_ssl_ct_module.c.orig 2016-11-30 22:58:29.000000000 +0100 ++++ ../nginx-ct-1.3.2/ngx_ssl_ct_module.c 2017-02-11 19:42:19.741572000 +0100 +@@ -170,7 +170,7 @@ + #endif + } + +-#ifndef OPENSSL_IS_BORINGSSL ++#if !defined(OPENSSL_IS_BORINGSSL) && !defined(LIBRESSL_VERSION_NUMBER) + /* add OpenSSL TLS extension */ + if (SSL_CTX_add_server_custom_ext(ssl_ctx, NGX_SSL_CT_EXT, + &ngx_ssl_ct_ext_cb, NULL, NULL, NULL, NULL) == 0) +@@ -184,7 +184,7 @@ + return NGX_CONF_OK; + } + +-#ifndef OPENSSL_IS_BORINGSSL ++#if !defined(OPENSSL_IS_BORINGSSL) && !defined(LIBRESSL_VERSION_NUMBER) + int ngx_ssl_ct_ext_cb(SSL *s, unsigned int ext_type, const unsigned char **out, + size_t *outlen, int *al, void *add_arg) + { |