Rename plain c disable option
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
This commit is contained in:
parent
2f26a59910
commit
315fd30201
9 changed files with 12 additions and 12 deletions
|
@ -147,7 +147,7 @@ jobs:
|
|||
- scripts/config.py unset MBEDTLS_AESNI_C
|
||||
- scripts/config.py unset MBEDTLS_PADLOCK_C
|
||||
- scripts/config.py set MBEDTLS_AESCE_C
|
||||
- scripts/config.py set MBEDTLS_AES_HAS_NO_BUILTIN
|
||||
- scripts/config.py set MBEDTLS_AES_HAS_NO_PLAIN_C
|
||||
- make generated_files
|
||||
- make
|
||||
- programs/test/selftest
|
||||
|
|
|
@ -4009,6 +4009,6 @@
|
|||
/*
|
||||
* Platform independent implementation for crypto algorithms.
|
||||
*/
|
||||
//#define MBEDTLS_AES_HAS_NO_BUILTIN /* Uncomment to disable built-in platform independent code of AES */
|
||||
//#define MBEDTLS_AES_HAS_NO_PLAIN_C /* Uncomment to disable built-in platform independent code of AES */
|
||||
|
||||
/** \} name SECTION: Module configuration options */
|
||||
|
|
|
@ -99,7 +99,7 @@
|
|||
#include <sys/auxv.h>
|
||||
#endif
|
||||
|
||||
#if !defined(MBEDTLS_AES_HAS_NO_BUILTIN)
|
||||
#if !defined(MBEDTLS_AES_HAS_NO_PLAIN_C)
|
||||
/*
|
||||
* AES instruction support detection routine
|
||||
*/
|
||||
|
|
|
@ -47,7 +47,7 @@ extern "C" {
|
|||
*
|
||||
* \return 1 if CPU has support for the feature, 0 otherwise
|
||||
*/
|
||||
#if !defined(MBEDTLS_AES_HAS_NO_BUILTIN)
|
||||
#if !defined(MBEDTLS_AES_HAS_NO_PLAIN_C)
|
||||
int mbedtls_aesce_has_support(void);
|
||||
#else
|
||||
#define /* no-check-names */ mbedtls_aesce_has_support() 1
|
||||
|
|
|
@ -39,7 +39,7 @@
|
|||
#include <immintrin.h>
|
||||
#endif
|
||||
|
||||
#if !defined(MBEDTLS_AES_HAS_NO_BUILTIN)
|
||||
#if !defined(MBEDTLS_AES_HAS_NO_PLAIN_C)
|
||||
/*
|
||||
* AES-NI support detection routine
|
||||
*/
|
||||
|
@ -69,7 +69,7 @@ int mbedtls_aesni_has_support(unsigned int what)
|
|||
|
||||
return (c & what) != 0;
|
||||
}
|
||||
#endif /* !MBEDTLS_AES_HAS_NO_BUILTIN */
|
||||
#endif /* !MBEDTLS_AES_HAS_NO_PLAIN_C */
|
||||
|
||||
#if MBEDTLS_AESNI_HAVE_CODE == 2
|
||||
|
||||
|
|
|
@ -88,7 +88,7 @@ extern "C" {
|
|||
*
|
||||
* \return 1 if CPU has support for the feature, 0 otherwise
|
||||
*/
|
||||
#if !defined(MBEDTLS_AES_HAS_NO_BUILTIN)
|
||||
#if !defined(MBEDTLS_AES_HAS_NO_PLAIN_C)
|
||||
int mbedtls_aesni_has_support(unsigned int what);
|
||||
#else
|
||||
#define /* no-check-names */ mbedtls_aesni_has_support(what) 1
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
|
||||
#if defined(MBEDTLS_HAVE_X86)
|
||||
|
||||
#if !defined(MBEDTLS_AES_HAS_NO_BUILTIN)
|
||||
#if !defined(MBEDTLS_AES_HAS_NO_PLAIN_C)
|
||||
/*
|
||||
* PadLock detection routine
|
||||
*/
|
||||
|
|
|
@ -68,7 +68,7 @@ extern "C" {
|
|||
*
|
||||
* \return non-zero if CPU has support for the feature, 0 otherwise
|
||||
*/
|
||||
#if !defined(MBEDTLS_AES_HAS_NO_BUILTIN)
|
||||
#if !defined(MBEDTLS_AES_HAS_NO_PLAIN_C)
|
||||
int mbedtls_padlock_has_support(int feature);
|
||||
#else
|
||||
#define /* no-check-names */ mbedtls_padlock_has_support(feature) 1
|
||||
|
|
|
@ -4946,7 +4946,7 @@ component_test_aes_builtin_only () {
|
|||
scripts/config.py unset MBEDTLS_AESNI_C
|
||||
scripts/config.py unset MBEDTLS_PADLOCK_C
|
||||
scripts/config.py unset MBEDTLS_AESCE_C
|
||||
scripts/config.py unset MBEDTLS_AES_HAS_NO_BUILTIN
|
||||
scripts/config.py unset MBEDTLS_AES_HAS_NO_PLAIN_C
|
||||
msg "build: make, AES built-in only" # ~10s
|
||||
make
|
||||
|
||||
|
@ -4959,7 +4959,7 @@ component_test_aes_aesni_only () {
|
|||
scripts/config.py set MBEDTLS_AESNI_C
|
||||
scripts/config.py unset MBEDTLS_PADLOCK_C
|
||||
scripts/config.py unset MBEDTLS_AESCE_C
|
||||
scripts/config.py set MBEDTLS_AES_HAS_NO_BUILTIN
|
||||
scripts/config.py set MBEDTLS_AES_HAS_NO_PLAIN_C
|
||||
msg "build: AESNI only" # ~10s
|
||||
make
|
||||
|
||||
|
@ -4972,7 +4972,7 @@ component_test_aes_padlock_only () {
|
|||
scripts/config.py unset MBEDTLS_AESNI_C
|
||||
scripts/config.py set MBEDTLS_PADLOCK_C
|
||||
scripts/config.py unset MBEDTLS_AESCE_C
|
||||
scripts/config.py set MBEDTLS_AES_HAS_NO_BUILTIN
|
||||
scripts/config.py set MBEDTLS_AES_HAS_NO_PLAIN_C
|
||||
msg "build: AES, VIA padlock only" # ~10s
|
||||
make CC=gcc CFLAGS="$ASAN_CFLAGS -m32 -O2" LDFLAGS="-m32 $ASAN_CFLAGS"
|
||||
|
||||
|
|
Loading…
Reference in a new issue