|
@@ -158,7 +158,8 @@ static const PROV_CIPHER_HW aes_xts_t4 = { \
|
|
|
# define PROV_CIPHER_HW_select_xts() \
|
|
|
if (SPARC_AES_CAPABLE) \
|
|
|
return &aes_xts_t4;
|
|
|
-#elif defined(RV64I_ZKND_ZKNE_CAPABLE)
|
|
|
+
|
|
|
+#elif defined(__riscv) && __riscv_xlen == 64
|
|
|
|
|
|
static int cipher_hw_aes_xts_rv64i_zknd_zkne_initkey(PROV_CIPHER_CTX *ctx,
|
|
|
const unsigned char *key,
|
|
@@ -181,9 +182,10 @@ static const PROV_CIPHER_HW aes_xts_rv64i_zknd_zkne = { \
|
|
|
cipher_hw_aes_xts_copyctx \
|
|
|
};
|
|
|
# define PROV_CIPHER_HW_select_xts() \
|
|
|
-if (RV64I_ZKND_ZKNE_CAPABLE) \
|
|
|
+if (RISCV_HAS_ZKND_AND_ZKNE()) \
|
|
|
return &aes_xts_rv64i_zknd_zkne;
|
|
|
-#elif defined(RV32I_ZBKB_ZKND_ZKNE_CAPABLE) && defined(RV32I_ZKND_ZKNE_CAPABLE)
|
|
|
+
|
|
|
+#elif defined(__riscv) && __riscv_xlen == 32
|
|
|
|
|
|
static int cipher_hw_aes_xts_rv32i_zknd_zkne_initkey(PROV_CIPHER_CTX *ctx,
|
|
|
const unsigned char *key,
|
|
@@ -221,9 +223,9 @@ static const PROV_CIPHER_HW aes_xts_rv32i_zbkb_zknd_zkne = { \
|
|
|
cipher_hw_aes_xts_copyctx \
|
|
|
};
|
|
|
# define PROV_CIPHER_HW_select_xts() \
|
|
|
-if (RV32I_ZBKB_ZKND_ZKNE_CAPABLE) \
|
|
|
+if (RISCV_HAS_ZBKB_AND_ZKND_AND_ZKNE()) \
|
|
|
return &aes_xts_rv32i_zbkb_zknd_zkne; \
|
|
|
-if (RV32I_ZKND_ZKNE_CAPABLE) \
|
|
|
+if (RISCV_HAS_ZKND_ZKNE()) \
|
|
|
return &aes_xts_rv32i_zknd_zkne;
|
|
|
# else
|
|
|
/* The generic case */
|