diff options
| author | Jochen Neumeister <joneum@FreeBSD.org> | 2021-03-13 16:15:32 +0000 |
|---|---|---|
| committer | Jochen Neumeister <joneum@FreeBSD.org> | 2021-03-13 16:15:32 +0000 |
| commit | 41a60092997340c4884d4857a5e457d5a1c093a4 (patch) | |
| tree | 2d6c81a1ffc95cfc63fe96221d2375ed751bdbdf | |
| parent | bd5505ff2d7d8793fb971ce515d978b3dbab5bec (diff) | |
| download | ports-41a60092997340c4884d4857a5e457d5a1c093a4.tar.gz ports-41a60092997340c4884d4857a5e457d5a1c093a4.zip | |
MFH: r568256
fix OpenSSL KTLS causes regression: SSL_ERROR_HANDSHAKE_UNEXPECTED_ALERT
PR: 253394
Reported by: many
Approved by: apache (with hat)
Sponsored by: Netzkommune GmbH
Differential Revision: https://reviews.freebsd.org/D28932
Notes
Notes:
svn path=/branches/2021Q1/; revision=568258
| -rw-r--r-- | www/apache24/Makefile | 2 | ||||
| -rw-r--r-- | www/apache24/files/patch-modules_ssl_ssl__engine__io.c | 38 |
2 files changed, 39 insertions, 1 deletions
diff --git a/www/apache24/Makefile b/www/apache24/Makefile index 9c477123639b..75db27844f8a 100644 --- a/www/apache24/Makefile +++ b/www/apache24/Makefile @@ -2,7 +2,7 @@ PORTNAME= apache24 PORTVERSION= 2.4.46 -PORTREVISION= 0 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= APACHE_HTTPD DISTNAME= httpd-${PORTVERSION} diff --git a/www/apache24/files/patch-modules_ssl_ssl__engine__io.c b/www/apache24/files/patch-modules_ssl_ssl__engine__io.c new file mode 100644 index 000000000000..70923c6beaa3 --- /dev/null +++ b/www/apache24/files/patch-modules_ssl_ssl__engine__io.c @@ -0,0 +1,38 @@ +--- modules/ssl/ssl_engine_io.c.orig 2020-02-20 16:33:40.000000000 -0800 ++++ modules/ssl/ssl_engine_io.c 2021-02-25 16:08:04.863228000 -0800 +@@ -242,7 +242,7 @@ static int bio_filter_out_write(BIO *bio, const char * + + static long bio_filter_out_ctrl(BIO *bio, int cmd, long num, void *ptr) + { +- long ret = 1; ++ long ret = 0; + bio_filter_out_ctx_t *outctx = (bio_filter_out_ctx_t *)BIO_get_data(bio); + + switch (cmd) { +@@ -542,7 +542,7 @@ static int bio_filter_in_gets(BIO *bio, char *buf, int + + static long bio_filter_in_ctrl(BIO *bio, int cmd, long num, void *ptr) + { +- return -1; ++ return 0; + } + + #if MODSSL_USE_OPENSSL_PRE_1_1_API +@@ -567,7 +567,7 @@ static BIO_METHOD bio_filter_in_method = { + bio_filter_in_read, + bio_filter_in_puts, /* puts is never called */ + bio_filter_in_gets, /* gets is never called */ +- bio_filter_in_ctrl, /* ctrl is never called */ ++ bio_filter_in_ctrl, + bio_filter_create, + bio_filter_destroy, + NULL +@@ -594,7 +594,7 @@ void init_bio_methods(void) + BIO_meth_set_read(bio_filter_in_method, &bio_filter_in_read); + BIO_meth_set_puts(bio_filter_in_method, &bio_filter_in_puts); /* puts is never called */ + BIO_meth_set_gets(bio_filter_in_method, &bio_filter_in_gets); /* gets is never called */ +- BIO_meth_set_ctrl(bio_filter_in_method, &bio_filter_in_ctrl); /* ctrl is never called */ ++ BIO_meth_set_ctrl(bio_filter_in_method, &bio_filter_in_ctrl); + BIO_meth_set_create(bio_filter_in_method, &bio_filter_create); + BIO_meth_set_destroy(bio_filter_in_method, &bio_filter_destroy); + } |