diff options
author | Tobias Heider <tobias.heider@canonical.com> | 2023-02-16 03:21:26 +0100 |
---|---|---|
committer | NIIBE Yutaka <gniibe@fsij.org> | 2023-03-08 10:23:53 +0900 |
commit | 0024db5afee825185ddf26cd9a91f563b8c11b1a (patch) | |
tree | 11caccd5b3473aacf5fd3e2ba1d1cb425619cd1b | |
parent | a51f0e66842ae989cd3966e5ef5eb1f62a3576b1 (diff) | |
download | libgcrypt-0024db5afee825185ddf26cd9a91f563b8c11b1a.tar.gz |
fips: Unblock MD5 in fips mode but mark non-approved in indicator.
* cipher/mac-hmac.c (_gcry_mac_type_spec_hmac_md5): Allow in fips mode.
* cipher/md5.c (_gcry_digest_spec_md5): Allow in fips mode.
--
Cherry-pick master commit of:
dc4a60e2d70bc52ba2955f8e676341d675ab89a0
GnuPG-bug-id: 6376
Signed-off-by: Tobias Heider <tobias.heider@canonical.com>
-rw-r--r-- | cipher/mac-hmac.c | 2 | ||||
-rw-r--r-- | cipher/md5.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cipher/mac-hmac.c b/cipher/mac-hmac.c index f1ab568b..9fac77dc 100644 --- a/cipher/mac-hmac.c +++ b/cipher/mac-hmac.c @@ -1413,7 +1413,7 @@ const gcry_mac_spec_t _gcry_mac_type_spec_hmac_tiger1 = { #endif #if USE_MD5 const gcry_mac_spec_t _gcry_mac_type_spec_hmac_md5 = { - GCRY_MAC_HMAC_MD5, {0, 0}, "HMAC_MD5", + GCRY_MAC_HMAC_MD5, {0, 1}, "HMAC_MD5", &hmac_ops }; #endif diff --git a/cipher/md5.c b/cipher/md5.c index 5457fc38..744a2cc1 100644 --- a/cipher/md5.c +++ b/cipher/md5.c @@ -314,7 +314,7 @@ static const gcry_md_oid_spec_t oid_spec_md5[] = const gcry_md_spec_t _gcry_digest_spec_md5 = { - GCRY_MD_MD5, {0, 0}, + GCRY_MD_MD5, {0, 1}, "MD5", asn, DIM (asn), oid_spec_md5, 16, md5_init, _gcry_md_block_write, md5_final, md5_read, NULL, NULL, |