CMAC: accelerate CMAC in accel_cipher
Signed-off-by: Yanray Wang <yanray.wang@arm.com>
This commit is contained in:
parent
0df6d9688a
commit
af5003a157
2 changed files with 18 additions and 10 deletions
|
@ -32,6 +32,14 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined(PSA_WANT_ALG_CMAC)
|
||||||
|
#if defined(MBEDTLS_PSA_ACCEL_ALG_CMAC)
|
||||||
|
#undef MBEDTLS_PSA_ACCEL_ALG_CMAC
|
||||||
|
#else
|
||||||
|
#define MBEDTLS_PSA_ACCEL_ALG_CMAC 1
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#if defined(PSA_WANT_ALG_CTR)
|
#if defined(PSA_WANT_ALG_CTR)
|
||||||
#if defined(MBEDTLS_PSA_ACCEL_ALG_CTR)
|
#if defined(MBEDTLS_PSA_ACCEL_ALG_CTR)
|
||||||
#undef MBEDTLS_PSA_ACCEL_ALG_CTR
|
#undef MBEDTLS_PSA_ACCEL_ALG_CTR
|
||||||
|
@ -395,7 +403,6 @@
|
||||||
|
|
||||||
#define MBEDTLS_PSA_ACCEL_ALG_CBC_MAC 1
|
#define MBEDTLS_PSA_ACCEL_ALG_CBC_MAC 1
|
||||||
#define MBEDTLS_PSA_ACCEL_ALG_CCM 1
|
#define MBEDTLS_PSA_ACCEL_ALG_CCM 1
|
||||||
#define MBEDTLS_PSA_ACCEL_ALG_CMAC 1
|
|
||||||
#define MBEDTLS_PSA_ACCEL_ALG_ECB_NO_PADDING 1
|
#define MBEDTLS_PSA_ACCEL_ALG_ECB_NO_PADDING 1
|
||||||
#define MBEDTLS_PSA_ACCEL_ALG_GCM 1
|
#define MBEDTLS_PSA_ACCEL_ALG_GCM 1
|
||||||
#define MBEDTLS_PSA_ACCEL_ALG_HKDF 1
|
#define MBEDTLS_PSA_ACCEL_ALG_HKDF 1
|
||||||
|
|
|
@ -3528,22 +3528,22 @@ component_test_psa_crypto_config_reference_hash_use_psa() {
|
||||||
component_test_psa_crypto_config_accel_cipher () {
|
component_test_psa_crypto_config_accel_cipher () {
|
||||||
msg "test: MBEDTLS_PSA_CRYPTO_CONFIG with accelerated cipher"
|
msg "test: MBEDTLS_PSA_CRYPTO_CONFIG with accelerated cipher"
|
||||||
|
|
||||||
loc_accel_list="ALG_CBC_NO_PADDING ALG_CBC_PKCS7 ALG_CTR ALG_CFB ALG_OFB ALG_XTS KEY_TYPE_DES"
|
loc_accel_list="ALG_CBC_NO_PADDING ALG_CBC_PKCS7 \
|
||||||
|
ALG_CTR ALG_CFB ALG_OFB ALG_XTS \
|
||||||
|
KEY_TYPE_DES ALG_CMAC"
|
||||||
|
|
||||||
# Configure
|
# Configure
|
||||||
# ---------
|
# ---------
|
||||||
|
|
||||||
|
# There is no intended accelerator support for STREAM_CIPHER and
|
||||||
|
# ECB_NO_PADDING. Therefore, asking for them in the build implies the
|
||||||
|
# inclusion of the Mbed TLS cipher operations. As we want to test here with
|
||||||
|
# cipher operations solely supported by accelerators, disabled those
|
||||||
|
# PSA configuration options by helper_libtestdriver1_adjust_config.
|
||||||
|
|
||||||
# Start from the full config
|
# Start from the full config
|
||||||
helper_libtestdriver1_adjust_config "full"
|
helper_libtestdriver1_adjust_config "full"
|
||||||
|
|
||||||
# There is no intended accelerator support for ALG CMAC. Therefore, asking
|
|
||||||
# for it in the build implies the inclusion of the Mbed TLS cipher
|
|
||||||
# operations. As we want to test here with cipher operations solely
|
|
||||||
# supported by accelerators, disabled this PSA configuration option.
|
|
||||||
# (Note: the same applies to STREAM_CIPHER and ECB_NO_PADDING, which are
|
|
||||||
# already disabled by helper_libtestdriver1_adjust_config above.)
|
|
||||||
scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_ALG_CMAC
|
|
||||||
|
|
||||||
# Disable the things that are being accelerated
|
# Disable the things that are being accelerated
|
||||||
scripts/config.py unset MBEDTLS_CIPHER_MODE_CBC
|
scripts/config.py unset MBEDTLS_CIPHER_MODE_CBC
|
||||||
scripts/config.py unset MBEDTLS_CIPHER_PADDING_PKCS7
|
scripts/config.py unset MBEDTLS_CIPHER_PADDING_PKCS7
|
||||||
|
@ -3552,6 +3552,7 @@ component_test_psa_crypto_config_accel_cipher () {
|
||||||
scripts/config.py unset MBEDTLS_CIPHER_MODE_OFB
|
scripts/config.py unset MBEDTLS_CIPHER_MODE_OFB
|
||||||
scripts/config.py unset MBEDTLS_CIPHER_MODE_XTS
|
scripts/config.py unset MBEDTLS_CIPHER_MODE_XTS
|
||||||
scripts/config.py unset MBEDTLS_DES_C
|
scripts/config.py unset MBEDTLS_DES_C
|
||||||
|
scripts/config.py unset MBEDTLS_CMAC_C
|
||||||
|
|
||||||
# Build
|
# Build
|
||||||
# -----
|
# -----
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue