diff options
| author | Pauli <pauli@openssl.org> | 2023-02-27 19:20:53 +1100 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2023-03-01 18:35:01 +1100 |
| commit | c3f985cfd6fb4b8ab1765403d65fed3d006b2163 (patch) | |
| tree | c4ad3dd2006030cd0a53a8a972bcd6ef9891346c /providers | |
| parent | a5ad015898718a99ed6cb3e1d096434e112c2862 (diff) | |
| download | openssl-new-c3f985cfd6fb4b8ab1765403d65fed3d006b2163.tar.gz | |
Remove AES SIV ciphers from the FIPS provider
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/20386)
Diffstat (limited to 'providers')
| -rw-r--r-- | providers/fips/fipsprov.c | 5 | ||||
| -rw-r--r-- | providers/implementations/ciphers/build.info | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/providers/fips/fipsprov.c b/providers/fips/fipsprov.c index b86b27d236..ab58ab891d 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 dfd476304d..5eb705969f 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 |