From: Stefan Eissing Date: Wed, 3 Nov 2021 14:27:39 +0000 (+0000) Subject: * mod_ssl: fix in CHECK_PRIVKEY_ERROR for openssl 3.0 X-Git-Tag: 2.5.0-alpha2-ci-test-only~709 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6384a27d30968a080904044fd811fcae6882209d;p=thirdparty%2Fapache%2Fhttpd.git * mod_ssl: fix in CHECK_PRIVKEY_ERROR for openssl 3.0 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1894716 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c index a8c505c54d1..34ec23349fa 100644 --- a/modules/ssl/ssl_engine_init.c +++ b/modules/ssl/ssl_engine_init.c @@ -1388,7 +1388,7 @@ static APR_INLINE int modssl_DH_bits(DH *dh) #if OPENSSL_VERSION_NUMBER < 0x30000000L #define CHECK_PRIVKEY_ERROR(ec) (ERR_GET_FUNC(ec) != X509_F_X509_CHECK_PRIVATE_KEY) #else -#define CHECK_PRIVKEY_ERROR(ec) (ERR_GET_LIB != ERR_LIB_X509 \ +#define CHECK_PRIVKEY_ERROR(ec) (ERR_GET_LIB(ec) != ERR_LIB_X509 \ || (ERR_GET_REASON(ec) != X509_R_KEY_TYPE_MISMATCH \ && ERR_GET_REASON(ec) != X509_R_KEY_VALUES_MISMATCH \ && ERR_GET_REASON(ec) != X509_R_UNKNOWN_KEY_TYPE))