From: Pauli Date: Mon, 27 Feb 2023 08:20:53 +0000 (+1100) Subject: Remove AES SIV ciphers from the FIPS provider X-Git-Tag: openssl-3.2.0-alpha1~1213 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c3f985cfd6fb4b8ab1765403d65fed3d006b2163;p=thirdparty%2Fopenssl.git Remove AES SIV ciphers from the FIPS provider Reviewed-by: Tomas Mraz Reviewed-by: Matt Caswell Reviewed-by: Shane Lontis (Merged from https://github.com/openssl/openssl/pull/20386) --- diff --git a/providers/fips/fipsprov.c b/providers/fips/fipsprov.c index b86b27d236f..ab58ab891d9 100644 --- a/providers/fips/fipsprov.c +++ b/providers/fips/fipsprov.c @@ -297,11 +297,6 @@ static const OSSL_ALGORITHM_CAPABLE fips_ciphers[] = { ALG(PROV_NAMES_AES_128_CTR, ossl_aes128ctr_functions), ALG(PROV_NAMES_AES_256_XTS, ossl_aes256xts_functions), ALG(PROV_NAMES_AES_128_XTS, ossl_aes128xts_functions), -#ifndef OPENSSL_NO_SIV - ALG(PROV_NAMES_AES_128_GCM_SIV, ossl_aes128gcm_siv_functions), - ALG(PROV_NAMES_AES_192_GCM_SIV, ossl_aes192gcm_siv_functions), - ALG(PROV_NAMES_AES_256_GCM_SIV, ossl_aes256gcm_siv_functions), -#endif /* OPENSSL_NO_SIV */ ALG(PROV_NAMES_AES_256_GCM, ossl_aes256gcm_functions), ALG(PROV_NAMES_AES_192_GCM, ossl_aes192gcm_functions), ALG(PROV_NAMES_AES_128_GCM, ossl_aes128gcm_functions), diff --git a/providers/implementations/ciphers/build.info b/providers/implementations/ciphers/build.info index dfd476304d4..5eb705969f5 100644 --- a/providers/implementations/ciphers/build.info +++ b/providers/implementations/ciphers/build.info @@ -25,7 +25,7 @@ $SM4_GOAL=../../libdefault.a $CHACHA_GOAL=../../libdefault.a $CHACHAPOLY_GOAL=../../libdefault.a $SIV_GOAL=../../libdefault.a -$SIV_GCM_GOAL=../../libdefault.a ../../libfips.a +$SIV_GCM_GOAL=../../libdefault.a IF[{- !$disabled{asm} -}] $GHASHDEF_x86=GHASH_ASM