You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by yl...@apache.org on 2021/09/18 14:42:12 UTC
svn commit: r1893420 - in /apr/apr-util/branches/1.7.x: ./
crypto/apr_crypto_openssl.c
Author: ylavic
Date: Sat Sep 18 14:42:12 2021
New Revision: 1893420
URL: http://svn.apache.org/viewvc?rev=1893420&view=rev
Log:
Partially merge r1837429 from trunk:
s/#ifndef APR_USE_OPENSSL_PRE_1_1_1_API/#if !APR_USE_OPENSSL_PRE_1_1_1_API/ and
fix revealed compilation error.
Submitted by: ylavic
Modified:
apr/apr-util/branches/1.7.x/ (props changed)
apr/apr-util/branches/1.7.x/crypto/apr_crypto_openssl.c
Propchange: apr/apr-util/branches/1.7.x/
------------------------------------------------------------------------------
Merged /apr/apr/trunk:r1837429
Modified: apr/apr-util/branches/1.7.x/crypto/apr_crypto_openssl.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.7.x/crypto/apr_crypto_openssl.c?rev=1893420&r1=1893419&r2=1893420&view=diff
==============================================================================
--- apr/apr-util/branches/1.7.x/crypto/apr_crypto_openssl.c (original)
+++ apr/apr-util/branches/1.7.x/crypto/apr_crypto_openssl.c Sat Sep 18 14:42:12 2021
@@ -733,7 +733,7 @@ static apr_status_t crypto_key(apr_crypt
case APR_CRYPTO_KTYPE_CMAC: {
-#ifndef APR_USE_OPENSSL_PRE_1_1_1_API
+#if !APR_USE_OPENSSL_PRE_1_1_1_API
apr_crypto_config_t *config = f->config;
/* decide on what cipher mechanism we will be using */
@@ -748,7 +748,7 @@ static apr_status_t crypto_key(apr_crypt
return APR_ENOKEY;
}
- switch (rec->k.hmac.hmac) {
+ switch (rec->k.hmac.digest) {
case APR_CRYPTO_DIGEST_MD5:
key->hmac = EVP_md5();
break;