eden-emu/mbedtls
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve error message and documents

Browse source 
- fix grammar error
- Add more information for AES_USE_HARDWARE_ONLY
- Improve error message

Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
This commit is contained in:
Jerry Yu 2023-04-25 11:08:30 +08:00
parent e77c4d95a7
commit 6943681820
3 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog.d/add-aes-hardware-only-option.txt
View file

@ -2,5 +2,5 @@ Features
* New configuration option MBEDTLS_AES_USE_HARDWARE_ONLY introduced. When * New configuration option MBEDTLS_AES_USE_HARDWARE_ONLY introduced. When
using CPU-accelerated AES (e.g., Arm Crypto Extensions), this option using CPU-accelerated AES (e.g., Arm Crypto Extensions), this option
disables the plain C implementation and the run-time detection for the disables the plain C implementation and the run-time detection for the
CPU feature, which reduces code size and avoid the vulnerability of the CPU feature, which reduces code size and avoids the vulnerability of the
plain C implementation. plain C implementation.

4
include/mbedtls/mbedtls_config.h
View file

@ -4015,7 +4015,9 @@
* detection will be used to select between them. * detection will be used to select between them.
* *
* If only one implementation is present, runtime detection will not be used. * If only one implementation is present, runtime detection will not be used.
* This configuration will crash if running on the CPU without needed features. * This configuration will crash at runtime if running on a CPU without the
* necessary features. It will not build unless at least one of MBEDTLS_AESCE_C,
* MBEDTLS_AESNI_C and/or MBEDTLS_PADLOCK_C is enabled & present in the build.
*/ */
//#define MBEDTLS_AES_USE_HARDWARE_ONLY //#define MBEDTLS_AES_USE_HARDWARE_ONLY

6
library/aes.c
View file

@ -38,7 +38,7 @@
defined(__aarch64__) && !defined(MBEDTLS_HAVE_ARM64) defined(__aarch64__) && !defined(MBEDTLS_HAVE_ARM64)
#define MBEDTLS_HAVE_ARM64 #define MBEDTLS_HAVE_ARM64
#if !defined(MBEDTLS_AESCE_C) && defined(MBEDTLS_AES_USE_HARDWARE_ONLY) #if !defined(MBEDTLS_AESCE_C) && defined(MBEDTLS_AES_USE_HARDWARE_ONLY)
#error "MBEDTLS_AES_C defined, but not all prerequisites" #error "MBEDTLS_AES_USE_HARDWARE_ONLY defined, but not all prerequisites"
#endif #endif
#endif #endif
@ -47,7 +47,7 @@
!defined(MBEDTLS_HAVE_X86_64) !defined(MBEDTLS_HAVE_X86_64)
#define MBEDTLS_HAVE_X86_64 #define MBEDTLS_HAVE_X86_64
#if !defined(MBEDTLS_AESNI_C) && defined(MBEDTLS_AES_USE_HARDWARE_ONLY) #if !defined(MBEDTLS_AESNI_C) && defined(MBEDTLS_AES_USE_HARDWARE_ONLY)
#error "MBEDTLS_AES_C defined, but not all prerequisites" #error "MBEDTLS_AES_USE_HARDWARE_ONLY defined, but not all prerequisites"
#endif #endif
#endif #endif
@ -56,7 +56,7 @@
#define MBEDTLS_HAVE_X86 #define MBEDTLS_HAVE_X86
#if !defined(MBEDTLS_PADLOCK_C) && defined(MBEDTLS_AES_USE_HARDWARE_ONLY) #if !defined(MBEDTLS_PADLOCK_C) && defined(MBEDTLS_AES_USE_HARDWARE_ONLY)
#error "MBEDTLS_AES_C defined, but not all prerequisites" #error "MBEDTLS_AES_USE_HARDWARE_ONLY defined, but not all prerequisites"
#endif #endif
#endif #endif