summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorylavic <ylavic@13f79535-47bb-0310-9956-ffa450edef68>2023-03-17 09:45:44 +0000
committerylavic <ylavic@13f79535-47bb-0310-9956-ffa450edef68>2023-03-17 09:45:44 +0000
commit65c1f1b84b9075b48cae8cc2472e7898bdda601c (patch)
tree651a6f1e8ab7089f4a566eb8ff2a81a8fa270257
parentd5b0b8c382ac26f09bc9c4f4ce026da095ac18a1 (diff)
downloadlibapr-65c1f1b84b9075b48cae8cc2472e7898bdda601c.tar.gz
crypto: Follow up to r1908433: Fix EVP_MAC usage w/ openssl < 3.0.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1908448 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--crypto/apr_crypto_openssl.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/crypto/apr_crypto_openssl.c b/crypto/apr_crypto_openssl.c
index 008d821c3..a13e7fc43 100644
--- a/crypto/apr_crypto_openssl.c
+++ b/crypto/apr_crypto_openssl.c
@@ -302,9 +302,11 @@ static apr_status_t crypto_key_cleanup(apr_crypto_key_t *key)
if (key->pkey) {
EVP_PKEY_free(key->pkey);
}
+#if !APR_USE_OPENSSL_PRE_3_0_API
if (key->mac) {
EVP_MAC_free(key->mac);
}
+#endif
return APR_SUCCESS;
}
@@ -356,10 +358,12 @@ static apr_status_t crypto_digest_cleanup(apr_crypto_digest_t *ctx)
EVP_MD_CTX_free(ctx->mdCtx);
ctx->mdCtx = NULL;
}
+#if !APR_USE_OPENSSL_PRE_3_0_API
if (ctx->macCtx) {
EVP_MAC_CTX_free(ctx->macCtx);
ctx->macCtx = NULL;
}
+#endif
return APR_SUCCESS;