You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jo...@apache.org on 2021/12/10 14:50:19 UTC
svn commit: r1895774 - /httpd/httpd/trunk/modules/ssl/ssl_engine_io.c
Author: jorton
Date: Fri Dec 10 14:50:19 2021
New Revision: 1895774
URL: http://svn.apache.org/viewvc?rev=1895774&view=rev
Log:
* modules/ssl/ssl_engine_io.c (bio_filter_in_ctrl): Remove debugging
assert for unexpected control commands, matching bio_filter_out_ctrl
which also ignores such invocations. Fixes core dumps in debug
builds with OpenSSL 3.0.0 which triggers this via the
BIO_get_ktls_recv() call on the SSL bio, aka
BIO_ctrl(b, BIO_CTRL_GET_KTLS_RECV, ...);
See: https://github.com/openssl/openssl/blob/105af0ad923a665ca5fee296b52dbf34b524a2aa/ssl/record/rec_layer_s3.c#L274
Modified:
httpd/httpd/trunk/modules/ssl/ssl_engine_io.c
Modified: httpd/httpd/trunk/modules/ssl/ssl_engine_io.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_engine_io.c?rev=1895774&r1=1895773&r2=1895774&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_engine_io.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_engine_io.c Fri Dec 10 14:50:19 2021
@@ -627,7 +627,6 @@ static long bio_filter_in_ctrl(BIO *bio,
ap_log_cerror(APLOG_MARK, APLOG_TRACE1, 0, inctx->f->c,
"BUG: bio_filter_in_ctrl() should not be called with cmd=%i",
cmd);
- AP_DEBUG_ASSERT(0);
return 0;
}
Re: svn commit: r1895774 - /httpd/httpd/trunk/modules/ssl/ssl_engine_io.c
Posted by Christophe JAILLET <ch...@wanadoo.fr>.
Le 10/12/2021 à 15:50, jorton@apache.org a écrit :
> Author: jorton
> Date: Fri Dec 10 14:50:19 2021
> New Revision: 1895774
>
> URL: http://svn.apache.org/viewvc?rev=1895774&view=rev
> Log:
> * modules/ssl/ssl_engine_io.c (bio_filter_in_ctrl): Remove debugging
> assert for unexpected control commands, matching bio_filter_out_ctrl
> which also ignores such invocations. Fixes core dumps in debug
> builds with OpenSSL 3.0.0 which triggers this via the
> BIO_get_ktls_recv() call on the SSL bio, aka
> BIO_ctrl(b, BIO_CTRL_GET_KTLS_RECV, ...);
>
> See: https://github.com/openssl/openssl/blob/105af0ad923a665ca5fee296b52dbf34b524a2aa/ssl/record/rec_layer_s3.c#L274
>
> Modified:
> httpd/httpd/trunk/modules/ssl/ssl_engine_io.c
>
> Modified: httpd/httpd/trunk/modules/ssl/ssl_engine_io.c
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_engine_io.c?rev=1895774&r1=1895773&r2=1895774&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/modules/ssl/ssl_engine_io.c (original)
> +++ httpd/httpd/trunk/modules/ssl/ssl_engine_io.c Fri Dec 10 14:50:19 2021
> @@ -627,7 +627,6 @@ static long bio_filter_in_ctrl(BIO *bio,
> ap_log_cerror(APLOG_MARK, APLOG_TRACE1, 0, inctx->f->c,
> "BUG: bio_filter_in_ctrl() should not be called with cmd=%i",
> cmd);
> - AP_DEBUG_ASSERT(0);
Does the "BUG" message still makes sense, then?
CJ
> return 0;
> }
>
>
>