diff options
author | Matt Caswell <matt@openssl.org> | 2023-11-30 09:24:26 +0000 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2023-12-12 16:08:05 +0000 |
commit | ff279597692f9f19dca5b147944d3d96f2e109f8 (patch) | |
tree | 00377afc0c7b9a65d1c2a912638e13f9f4c2f654 | |
parent | e46a6b1a5de0759023c5c9c2143ead4621f20d20 (diff) |
Fix detection for riscv64/riscv32
Fixes #22871
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
(Merged from https://github.com/openssl/openssl/pull/22881)
-rw-r--r-- | providers/implementations/ciphers/cipher_aes_ccm_hw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/providers/implementations/ciphers/cipher_aes_ccm_hw.c b/providers/implementations/ciphers/cipher_aes_ccm_hw.c index 575a8ba88d..b050cf3edd 100644 --- a/providers/implementations/ciphers/cipher_aes_ccm_hw.c +++ b/providers/implementations/ciphers/cipher_aes_ccm_hw.c @@ -61,9 +61,9 @@ static const PROV_CCM_HW aes_ccm = { # include "cipher_aes_ccm_hw_aesni.inc" #elif defined(SPARC_AES_CAPABLE) # include "cipher_aes_ccm_hw_t4.inc" -#elif defined(__riscv) && __riscv_xlen == 64 +#elif defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 64 # include "cipher_aes_ccm_hw_rv64i.inc" -#elif defined(__riscv) && __riscv_xlen == 32 +#elif defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 32 # include "cipher_aes_ccm_hw_rv32i.inc" #else const PROV_CCM_HW *ossl_prov_aes_hw_ccm(size_t keybits) |