cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFH: r568256

Browse Source 
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
This commit is contained in:
Jochen Neumeister 2021-03-13 16:15:32 +00:00
parent bd5505ff2d
commit 41a6009299
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2021Q1/; revision=568258
2 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
www/apache24/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= apache24
PORTVERSION= 2.4.46
PORTREVISION= 0
PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= APACHE_HTTPD
DISTNAME= httpd-${PORTVERSION}

38
www/apache24/files/patch-modules_ssl_ssl__engine__io.c Normal file
View File

@ -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);
}