From: Joe Orton Date: Mon, 2 Mar 2026 11:13:46 +0000 (+0000) Subject: * modules/ssl/ssl_engine_vars.c (ssl_var_lookup_ssl_cert_remain): X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e8c82bbb457e9b0daa77e6e412643e98e6036fa6;p=thirdparty%2Fapache%2Fhttpd.git * modules/ssl/ssl_engine_vars.c (ssl_var_lookup_ssl_cert_remain): Revert workaround for OpenSSL feature/ech branch, which is now updated. Also refresh the CI cache for the feature/ech OpenSSL build. Github: closes #608 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1932103 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 57b61ee76e..5da65e26d9 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -320,7 +320,7 @@ jobs: config: --enable-mods-shared=most --enable-maintainer-mode --disable-md --disable-http2 --disable-ldap --disable-crypto notest-cflags: -Werror -O2 env: | - TEST_OPENSSL3=ech1 + TEST_OPENSSL3=ech2 TEST_OPENSSL3_BRANCH=feature/ech OPENSSL_CONFIG=no-engine APR_VERSION=1.7.6 diff --git a/modules/ssl/ssl_engine_vars.c b/modules/ssl/ssl_engine_vars.c index c32e77c6c7..3f9bea18b3 100644 --- a/modules/ssl/ssl_engine_vars.c +++ b/modules/ssl/ssl_engine_vars.c @@ -839,10 +839,7 @@ static const char *ssl_var_lookup_ssl_cert_valid(apr_pool_t *p, ASN1_TIME *tm) * "0" if this can't be determined. */ static const char *ssl_var_lookup_ssl_cert_remain(apr_pool_t *p, ASN1_TIME *tm) { -/* NOTE: temporary workaround to disable this for HAVE_OPENSSL_ECH since the - * feature/ech branch is missing 9fb44b527ee3717795609fb876a7a81f8898c623 */ -#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER) \ - && !defined(HAVE_OPENSSL_ECH) +#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER) int diff; if (INVALID_ASN1_TIME(tm) || ASN1_TIME_diff(&diff, NULL, NULL, tm) != 1) {