mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-01-26 12:35:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use own define for building with test drivers

Browse Source 
Trying to compile in the PSA accelerator test driver under MBEDTLS_TEST_HOOKS
turned out to be awkward regarding existing builds. We'll put it under a
custom (not in config.h) define instead, since it's something that only
should happen in test.

Signed-off-by: Steven Cooreman <steven.cooreman@silabs.com>
This commit is contained in:
Steven Cooreman 2020-07-23 16:26:08 +02:00
parent 7922396c25
commit 1cd39d5229
7 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
library/psa_crypto_driver_wrappers.c
View File

@ -28,13 +28,13 @@
#if defined(MBEDTLS_PSA_CRYPTO_DRIVERS) #if defined(MBEDTLS_PSA_CRYPTO_DRIVERS)
/* Include test driver definition when running tests */ /* Include test driver definition when running tests */
#if defined(MBEDTLS_TEST_HOOKS) #if defined(MBEDTLS_PSA_CRYPTO_DRIVER_TEST)
#undef MBEDTLS_PSA_CRYPTO_DRIVER_PRESENT #undef MBEDTLS_PSA_CRYPTO_DRIVER_PRESENT
#define MBEDTLS_PSA_CRYPTO_DRIVER_PRESENT #define MBEDTLS_PSA_CRYPTO_DRIVER_PRESENT
#undef MBEDTLS_PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT #undef MBEDTLS_PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT
#define MBEDTLS_PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT #define MBEDTLS_PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT
#include "drivers/test_driver.h" #include "drivers/test_driver.h"
#endif /* MBEDTLS_TEST_HOOKS */ #endif /* MBEDTLS_PSA_CRYPTO_DRIVER_TEST */
/* Include driver definition file for each registered driver here */ /* Include driver definition file for each registered driver here */
#endif /* MBEDTLS_PSA_CRYPTO_DRIVERS */ #endif /* MBEDTLS_PSA_CRYPTO_DRIVERS */
@ -91,7 +91,7 @@ psa_status_t psa_driver_wrapper_sign_hash( psa_key_slot_t *slot,
case PSA_KEY_LOCATION_LOCAL_STORAGE: case PSA_KEY_LOCATION_LOCAL_STORAGE:
/* Key is stored in the slot in export representation, so /* Key is stored in the slot in export representation, so
* cycle through all known transparent accelerators */ * cycle through all known transparent accelerators */
#if defined(MBEDTLS_TEST_HOOKS) #if defined(MBEDTLS_PSA_CRYPTO_DRIVER_TEST)
status = test_transparent_signature_sign_hash( &attributes, status = test_transparent_signature_sign_hash( &attributes,
slot->data.key.data, slot->data.key.data,
slot->data.key.bytes, slot->data.key.bytes,
@ -104,11 +104,11 @@ psa_status_t psa_driver_wrapper_sign_hash( psa_key_slot_t *slot,
/* Declared with fallback == true */ /* Declared with fallback == true */
if( status != PSA_ERROR_NOT_SUPPORTED ) if( status != PSA_ERROR_NOT_SUPPORTED )
return status; return status;
#endif /* MBEDTLS_TEST_HOOKS */ #endif /* MBEDTLS_PSA_CRYPTO_DRIVER_TEST */
/* Fell through, meaning no accelerator supports this operation */ /* Fell through, meaning no accelerator supports this operation */
return PSA_ERROR_NOT_SUPPORTED; return PSA_ERROR_NOT_SUPPORTED;
/* Add cases for opaque driver here */ /* Add cases for opaque driver here */
#if defined(MBEDTLS_TEST_HOOKS) #if defined(MBEDTLS_PSA_CRYPTO_DRIVER_TEST)
case MBEDTLS_PSA_CRYPTO_TEST_DRIVER_LIFETIME: case MBEDTLS_PSA_CRYPTO_TEST_DRIVER_LIFETIME:
return( test_opaque_signature_sign_hash( &attributes, return( test_opaque_signature_sign_hash( &attributes,
slot->data.key.data, slot->data.key.data,
@ -119,7 +119,7 @@ psa_status_t psa_driver_wrapper_sign_hash( psa_key_slot_t *slot,
signature, signature,
signature_size, signature_size,
signature_length ) ); signature_length ) );
#endif /* MBEDTLS_TEST_HOOKS */ #endif /* MBEDTLS_PSA_CRYPTO_DRIVER_TEST */
default: default:
/* Key is declared with a lifetime not known to us */ /* Key is declared with a lifetime not known to us */
return status; return status;
@ -182,7 +182,7 @@ psa_status_t psa_driver_wrapper_verify_hash( psa_key_slot_t *slot,
case PSA_KEY_LOCATION_LOCAL_STORAGE: case PSA_KEY_LOCATION_LOCAL_STORAGE:
/* Key is stored in the slot in export representation, so /* Key is stored in the slot in export representation, so
* cycle through all known transparent accelerators */ * cycle through all known transparent accelerators */
#if defined(MBEDTLS_TEST_HOOKS) #if defined(MBEDTLS_PSA_CRYPTO_DRIVER_TEST)
status = test_transparent_signature_verify_hash( &attributes, status = test_transparent_signature_verify_hash( &attributes,
slot->data.key.data, slot->data.key.data,
slot->data.key.bytes, slot->data.key.bytes,
@ -194,11 +194,11 @@ psa_status_t psa_driver_wrapper_verify_hash( psa_key_slot_t *slot,
/* Declared with fallback == true */ /* Declared with fallback == true */
if( status != PSA_ERROR_NOT_SUPPORTED ) if( status != PSA_ERROR_NOT_SUPPORTED )
return status; return status;
#endif /* MBEDTLS_TEST_HOOKS */ #endif /* MBEDTLS_PSA_CRYPTO_DRIVER_TEST */
/* Fell through, meaning no accelerator supports this operation */ /* Fell through, meaning no accelerator supports this operation */
return PSA_ERROR_NOT_SUPPORTED; return PSA_ERROR_NOT_SUPPORTED;
/* Add cases for opaque driver here */ /* Add cases for opaque driver here */
#if defined(MBEDTLS_TEST_HOOKS) #if defined(MBEDTLS_PSA_CRYPTO_DRIVER_TEST)
case MBEDTLS_PSA_CRYPTO_TEST_DRIVER_LIFETIME: case MBEDTLS_PSA_CRYPTO_TEST_DRIVER_LIFETIME:
return( test_opaque_signature_verify_hash( &attributes, return( test_opaque_signature_verify_hash( &attributes,
slot->data.key.data, slot->data.key.data,
@ -208,7 +208,7 @@ psa_status_t psa_driver_wrapper_verify_hash( psa_key_slot_t *slot,
hash_length, hash_length,
signature, signature,
signature_length ) ); signature_length ) );
#endif /* MBEDTLS_TEST_HOOKS */ #endif /* MBEDTLS_PSA_CRYPTO_DRIVER_TEST */
default: default:
/* Key is declared with a lifetime not known to us */ /* Key is declared with a lifetime not known to us */
return status; return status;
@ -330,7 +330,7 @@ psa_status_t psa_driver_wrapper_generate_key( const psa_key_attributes_t *attrib
status = PSA_ERROR_NOT_SUPPORTED; status = PSA_ERROR_NOT_SUPPORTED;
break; break;
} }
#if defined(MBEDTLS_TEST_HOOKS) #if defined(MBEDTLS_PSA_CRYPTO_DRIVER_TEST)
status = test_transparent_generate_key( attributes, status = test_transparent_generate_key( attributes,
slot->data.key.data, slot->data.key.data,
slot->data.key.bytes, slot->data.key.bytes,
@ -338,19 +338,19 @@ psa_status_t psa_driver_wrapper_generate_key( const psa_key_attributes_t *attrib
/* Declared with fallback == true */ /* Declared with fallback == true */
if( status != PSA_ERROR_NOT_SUPPORTED ) if( status != PSA_ERROR_NOT_SUPPORTED )
break; break;
#endif /* MBEDTLS_TEST_HOOKS */ #endif /* MBEDTLS_PSA_CRYPTO_DRIVER_TEST */
/* Fell through, meaning no accelerator supports this operation */ /* Fell through, meaning no accelerator supports this operation */
status = PSA_ERROR_NOT_SUPPORTED; status = PSA_ERROR_NOT_SUPPORTED;
break; break;
/* Add cases for opaque driver here */ /* Add cases for opaque driver here */
#if defined(MBEDTLS_TEST_HOOKS) #if defined(MBEDTLS_PSA_CRYPTO_DRIVER_TEST)
case MBEDTLS_PSA_CRYPTO_TEST_DRIVER_LIFETIME: case MBEDTLS_PSA_CRYPTO_TEST_DRIVER_LIFETIME:
status = test_opaque_generate_key( attributes, status = test_opaque_generate_key( attributes,
slot->data.key.data, slot->data.key.data,
slot->data.key.bytes, slot->data.key.bytes,
&slot->data.key.bytes ); &slot->data.key.bytes );
break; break;
#endif /* MBEDTLS_TEST_HOOKS */ #endif /* MBEDTLS_PSA_CRYPTO_DRIVER_TEST */
default: default:
/* Key is declared with a lifetime not known to us */ /* Key is declared with a lifetime not known to us */
status = PSA_ERROR_INVALID_ARGUMENT; status = PSA_ERROR_INVALID_ARGUMENT;

4
tests/include/drivers/keygen.h
View File

@ -28,7 +28,7 @@
#include MBEDTLS_CONFIG_FILE #include MBEDTLS_CONFIG_FILE
#endif #endif
#if defined(MBEDTLS_TEST_HOOKS) #if defined(MBEDTLS_PSA_CRYPTO_DRIVER_TEST)
#include <psa/crypto_driver_common.h> #include <psa/crypto_driver_common.h>
extern void *test_driver_keygen_forced_output; extern void *test_driver_keygen_forced_output;
@ -45,5 +45,5 @@ psa_status_t test_opaque_generate_key(
const psa_key_attributes_t *attributes, const psa_key_attributes_t *attributes,
uint8_t *key, size_t key_size, size_t *key_length ); uint8_t *key, size_t key_size, size_t *key_length );
#endif /* MBEDTLS_TEST_HOOKS */ #endif /* MBEDTLS_PSA_CRYPTO_DRIVER_TEST */
#endif /* MBEDTLS_PSA_CRYPTO_TEST_DRIVERS_KEYGEN_H */ #endif /* MBEDTLS_PSA_CRYPTO_TEST_DRIVERS_KEYGEN_H */

4
tests/include/drivers/signature.h
View File

@ -28,7 +28,7 @@
#include MBEDTLS_CONFIG_FILE #include MBEDTLS_CONFIG_FILE
#endif #endif
#if defined(MBEDTLS_TEST_HOOKS) #if defined(MBEDTLS_PSA_CRYPTO_DRIVER_TEST)
#include <psa/crypto_driver_common.h> #include <psa/crypto_driver_common.h>
extern void *test_driver_forced_output; extern void *test_driver_forced_output;
@ -68,5 +68,5 @@ psa_status_t test_opaque_signature_verify_hash(
const uint8_t *hash, size_t hash_length, const uint8_t *hash, size_t hash_length,
const uint8_t *signature, size_t signature_length ); const uint8_t *signature, size_t signature_length );
#endif /* MBEDTLS_TEST_HOOKS */ #endif /* MBEDTLS_PSA_CRYPTO_DRIVER_TEST */
#endif /* MBEDTLS_PSA_CRYPTO_TEST_DRIVERS_SIGNATURE_H */ #endif /* MBEDTLS_PSA_CRYPTO_TEST_DRIVERS_SIGNATURE_H */

5
tests/scripts/all.sh
View File

@ -1659,9 +1659,8 @@ component_test_se_default () {
component_test_psa_crypto_drivers () { component_test_psa_crypto_drivers () {
msg "build: MBEDTLS_PSA_CRYPTO_DRIVERS w/ driver hooks" msg "build: MBEDTLS_PSA_CRYPTO_DRIVERS w/ driver hooks"
scripts/config.py set MBEDTLS_PSA_CRYPTO_DRIVERS scripts/config.py set MBEDTLS_PSA_CRYPTO_DRIVERS
scripts/config.py set MBEDTLS_TEST_HOOKS # Need to define the correct symbol and include the test driver header path in order to build with the test driver
# Need to include the test driver header path in order to build make CC=gcc CFLAGS="$ASAN_CFLAGS -DMBEDTLS_PSA_CRYPTO_DRIVER_TEST -I../tests/include -O2" LDFLAGS="$ASAN_CFLAGS"
make CC=gcc CFLAGS="$ASAN_CFLAGS -I../tests/include -O2" LDFLAGS="$ASAN_CFLAGS"
msg "test: MBEDTLS_PSA_CRYPTO_DRIVERS, signature" msg "test: MBEDTLS_PSA_CRYPTO_DRIVERS, signature"
make test make test

4
tests/src/drivers/keygen.c
View File

@ -25,7 +25,7 @@
#include MBEDTLS_CONFIG_FILE #include MBEDTLS_CONFIG_FILE
#endif #endif
#if defined(MBEDTLS_PSA_CRYPTO_DRIVERS) && defined(MBEDTLS_TEST_HOOKS) #if defined(MBEDTLS_PSA_CRYPTO_DRIVERS) && defined(MBEDTLS_PSA_CRYPTO_DRIVER_TEST)
#include "psa/crypto.h" #include "psa/crypto.h"
#include "mbedtls/ecp.h" #include "mbedtls/ecp.h"
#include "mbedtls/error.h" #include "mbedtls/error.h"
@ -126,4 +126,4 @@ psa_status_t test_opaque_generate_key(
return( PSA_ERROR_NOT_SUPPORTED ); return( PSA_ERROR_NOT_SUPPORTED );
} }
#endif /* MBEDTLS_PSA_CRYPTO_DRIVERS && MBEDTLS_TEST_HOOKS */ #endif /* MBEDTLS_PSA_CRYPTO_DRIVERS && MBEDTLS_PSA_CRYPTO_DRIVER_TEST */

4
tests/src/drivers/signature.c
View File

@ -25,7 +25,7 @@
#include MBEDTLS_CONFIG_FILE #include MBEDTLS_CONFIG_FILE
#endif #endif
#if defined(MBEDTLS_PSA_CRYPTO_DRIVERS) && defined(MBEDTLS_TEST_HOOKS) #if defined(MBEDTLS_PSA_CRYPTO_DRIVERS) && defined(MBEDTLS_PSA_CRYPTO_DRIVER_TEST)
#include "psa/crypto.h" #include "psa/crypto.h"
#include "mbedtls/ecp.h" #include "mbedtls/ecp.h"
@ -298,4 +298,4 @@ psa_status_t test_opaque_signature_verify_hash(
return( PSA_ERROR_NOT_SUPPORTED ); return( PSA_ERROR_NOT_SUPPORTED );
} }
#endif /* MBEDTLS_PSA_CRYPTO_DRIVERS && MBEDTLS_TEST_HOOKS */ #endif /* MBEDTLS_PSA_CRYPTO_DRIVERS && MBEDTLS_PSA_CRYPTO_DRIVER_TEST */

2
tests/suites/test_suite_psa_crypto_driver_wrappers.function
View File

@ -49,7 +49,7 @@ typedef enum
/* END_HEADER */ /* END_HEADER */
/* BEGIN_DEPENDENCIES /* BEGIN_DEPENDENCIES
* depends_on:MBEDTLS_PSA_CRYPTO_C:MBEDTLS_PSA_CRYPTO_DRIVERS:MBEDTLS_TEST_HOOKS * depends_on:MBEDTLS_PSA_CRYPTO_C:MBEDTLS_PSA_CRYPTO_DRIVERS:MBEDTLS_PSA_CRYPTO_DRIVER_TEST
* END_DEPENDENCIES * END_DEPENDENCIES
*/ */