diff options
| author | Bernard Spil <brnrd@FreeBSD.org> | 2017-10-23 18:49:27 +0000 |
|---|---|---|
| committer | Bernard Spil <brnrd@FreeBSD.org> | 2017-10-23 18:49:27 +0000 |
| commit | b1926a29fefea4c83e86e9d6d96ba8ffe7f6b7ae (patch) | |
| tree | 106f0d0f0867a98a53f82264c3fff7c85e1a98d2 /www/apache24/files/patch-modules_ssl_ssl__engine__io.c | |
| parent | Update to 1.4.5 (diff) | |
www/apache24: Update to 2.4.29
- Remove patch for CVE-2017-9798 (included upstream)
- Remove mod_ssl LibreSSL patches (included upstream)
- Fix SSL stapling patch for LibreSSL
- mod_http2 no longer experimental
PR: 222814
With hat: apache
Diffstat (limited to 'www/apache24/files/patch-modules_ssl_ssl__engine__io.c')
| -rw-r--r-- | www/apache24/files/patch-modules_ssl_ssl__engine__io.c | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/www/apache24/files/patch-modules_ssl_ssl__engine__io.c b/www/apache24/files/patch-modules_ssl_ssl__engine__io.c deleted file mode 100644 index 85787aeb5498..000000000000 --- a/www/apache24/files/patch-modules_ssl_ssl__engine__io.c +++ /dev/null @@ -1,38 +0,0 @@ ---- modules/ssl/ssl_engine_io.c.orig 2017-05-30 12:26:05 UTC -+++ modules/ssl/ssl_engine_io.c -@@ -164,7 +164,7 @@ static int bio_filter_create(BIO *bio) - { - BIO_set_shutdown(bio, 1); - BIO_set_init(bio, 1); --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - /* No setter method for OpenSSL 1.1.0 available, - * but I can't find any functional use of the - * "num" field there either. -@@ -549,7 +549,7 @@ static long bio_filter_in_ctrl(BIO *bio, - return -1; - } - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - - static BIO_METHOD bio_filter_out_method = { - BIO_TYPE_MEM, -@@ -2024,7 +2024,7 @@ static void ssl_io_input_add_filter(ssl_ - - filter_ctx->pInputFilter = ap_add_input_filter(ssl_io_filter, inctx, r, c); - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - filter_ctx->pbioRead = BIO_new(&bio_filter_in_method); - #else - filter_ctx->pbioRead = BIO_new(bio_filter_in_method); -@@ -2059,7 +2059,7 @@ void ssl_io_filter_init(conn_rec *c, req - filter_ctx->pOutputFilter = ap_add_output_filter(ssl_io_filter, - filter_ctx, r, c); - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - filter_ctx->pbioWrite = BIO_new(&bio_filter_out_method); - #else - filter_ctx->pbioWrite = BIO_new(bio_filter_out_method); |