]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
* modules/ssl/ssl_engine_io.c (bio_filter_in_ctrl): Remove debugging
authorJoe Orton <jorton@apache.org>
Fri, 10 Dec 2021 14:50:19 +0000 (14:50 +0000)
committerJoe Orton <jorton@apache.org>
Fri, 10 Dec 2021 14:50:19 +0000 (14:50 +0000)
  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

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1895774 13f79535-47bb-0310-9956-ffa450edef68

modules/ssl/ssl_engine_io.c

index 348956079a2836851405f1b09449c3af99523a55..7f2386fb115af55cae1f989f2644f55903f63f68 100644 (file)
@@ -627,7 +627,6 @@ static long bio_filter_in_ctrl(BIO *bio, int cmd, long num, void *ptr)
     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;
 }