diff options
| author | Pauli <pauli@openssl.org> | 2022-11-28 11:27:37 +1100 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2022-11-30 07:50:33 +1100 |
| commit | edaab86dc001603741f5b5e406afc1cc3a1c4e6e (patch) | |
| tree | 41c87e52b67ec3aa90a636acbd91ffeb1c308f9b /providers | |
| parent | e44b34185268e99ee2dc499073cf56d0465d60e2 (diff) | |
| download | openssl-new-edaab86dc001603741f5b5e406afc1cc3a1c4e6e.tar.gz | |
aes: add AES-GCM-SIV modes to the FIPS provider
Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/19777)
Diffstat (limited to 'providers')
| -rw-r--r-- | providers/fips/fipsprov.c | 5 | ||||
| -rw-r--r-- | providers/implementations/ciphers/build.info | 10 |
2 files changed, 11 insertions, 4 deletions
diff --git a/providers/fips/fipsprov.c b/providers/fips/fipsprov.c index 767b079e22..c967d61eb8 100644 --- a/providers/fips/fipsprov.c +++ b/providers/fips/fipsprov.c @@ -297,6 +297,11 @@ 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 b4fbe1aa7b..dfd476304d 100644 --- a/providers/implementations/ciphers/build.info +++ b/providers/implementations/ciphers/build.info @@ -25,6 +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 IF[{- !$disabled{asm} -}] $GHASHDEF_x86=GHASH_ASM @@ -98,10 +99,11 @@ SOURCE[$AES_GOAL]=\ SOURCE[$AES_GOAL]=cipher_aes_xts_fips.c IF[{- !$disabled{siv} -}] - DEFINE[$SIV_GOAL]=$GHASHDEF - SOURCE[$SIV_GOAL]=\ - cipher_aes_siv.c cipher_aes_siv_hw.c \ - cipher_aes_gcm_siv.c cipher_aes_gcm_siv_hw.c cipher_aes_gcm_siv_polyval.c + DEFINE[$SIV_GCM_GOAL]=$GHASHDEF + SOURCE[$SIV_GCM_GOAL]=\ + cipher_aes_gcm_siv.c cipher_aes_gcm_siv_hw.c \ + cipher_aes_gcm_siv_polyval.c + SOURCE[$SIV_GOAL]=cipher_aes_siv.c cipher_aes_siv_hw.c ENDIF IF[{- !$disabled{des} -}] |