Date: Sat, 13 Mar 2021 16:15:32 +0000 (UTC) From: Jochen Neumeister <joneum@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r568258 - in branches/2021Q1/www/apache24: . files Message-ID: <202103131615.12DGFWCs019979@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: joneum Date: Sat Mar 13 16:15:32 2021 New Revision: 568258 URL: https://svnweb.freebsd.org/changeset/ports/568258 Log: 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 Added: branches/2021Q1/www/apache24/files/patch-modules_ssl_ssl__engine__io.c - copied unchanged from r568256, head/www/apache24/files/patch-modules_ssl_ssl__engine__io.c Modified: branches/2021Q1/www/apache24/Makefile Directory Properties: branches/2021Q1/ (props changed) Modified: branches/2021Q1/www/apache24/Makefile ============================================================================== --- branches/2021Q1/www/apache24/Makefile Sat Mar 13 16:13:22 2021 (r568257) +++ branches/2021Q1/www/apache24/Makefile Sat Mar 13 16:15:32 2021 (r568258) @@ -2,7 +2,7 @@ PORTNAME= apache24 PORTVERSION= 2.4.46 -PORTREVISION= 0 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= APACHE_HTTPD DISTNAME= httpd-${PORTVERSION} Copied: branches/2021Q1/www/apache24/files/patch-modules_ssl_ssl__engine__io.c (from r568256, head/www/apache24/files/patch-modules_ssl_ssl__engine__io.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2021Q1/www/apache24/files/patch-modules_ssl_ssl__engine__io.c Sat Mar 13 16:15:32 2021 (r568258, copy of r568256, head/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); + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103131615.12DGFWCs019979>