lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-30 22:43:08 +03:00
Code Activity

Compact the argument lists

Browse Source 
Signed-off-by: Przemyslaw Stekiel <przemyslaw.stekiel@mobica.com>
This commit is contained in:
Przemyslaw Stekiel
2022-02-02 11:10:46 +01:00
parent 2ce7c9c5dc
commit 4576b91148
3 changed files with 58 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
scripts/data_files/driver_templates/psa_crypto_driver_wrappers.c.jinja
View File

@ -2337,17 +2337,10 @@ psa_status_t psa_driver_wrapper_mac_abort(
* Asymmetric cryptography * Asymmetric cryptography
*/ */
psa_status_t psa_driver_wrapper_asymmetric_encrypt( psa_status_t psa_driver_wrapper_asymmetric_encrypt(
const psa_key_attributes_t *attributes, const psa_key_attributes_t *attributes, const uint8_t *key_buffer,
const uint8_t *key_buffer, size_t key_buffer_size, psa_algorithm_t alg, const uint8_t *input,
size_t key_buffer_size, size_t input_length, const uint8_t *salt, size_t salt_length,
psa_algorithm_t alg, uint8_t *output, size_t output_size, size_t *output_length )
const uint8_t *input,
size_t input_length,
const uint8_t *salt,
size_t salt_length,
uint8_t *output,
size_t output_size,
size_t *output_length )
{ {
psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED; psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
psa_key_location_t location = psa_key_location_t location =
@ -2361,47 +2354,26 @@ psa_status_t psa_driver_wrapper_asymmetric_encrypt(
#if defined(PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT) #if defined(PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT)
#if defined(PSA_CRYPTO_DRIVER_TEST) #if defined(PSA_CRYPTO_DRIVER_TEST)
status = mbedtls_test_transparent_asymmetric_encrypt( attributes, status = mbedtls_test_transparent_asymmetric_encrypt( attributes,
key_buffer, key_buffer, key_buffer_size, alg, input, input_length,
key_buffer_size, salt, salt_length, output, output_size,
alg, output_length );
input,
input_length,
salt,
salt_length,
output,
output_size,
output_length );
/* 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 /* PSA_CRYPTO_DRIVER_TEST */ #endif /* PSA_CRYPTO_DRIVER_TEST */
#endif /* PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT */ #endif /* PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT */
return( mbedtls_psa_asymmetric_encrypt( attributes, return( mbedtls_psa_asymmetric_encrypt( attributes,
key_buffer, key_buffer, key_buffer_size, alg, input, input_length,
key_buffer_size, salt, salt_length, output, output_size, output_length )
alg, );
input,
input_length,
salt,
salt_length,
output,
output_size,
output_length ) );
/* Add cases for opaque driver here */ /* Add cases for opaque driver here */
#if defined(PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT) #if defined(PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT)
#if defined(PSA_CRYPTO_DRIVER_TEST) #if defined(PSA_CRYPTO_DRIVER_TEST)
case PSA_CRYPTO_TEST_DRIVER_LOCATION: case PSA_CRYPTO_TEST_DRIVER_LOCATION:
return( mbedtls_test_opaque_asymmetric_encrypt( attributes, return( mbedtls_test_opaque_asymmetric_encrypt( attributes,
key_buffer, key_buffer, key_buffer_size, alg, input, input_length,
key_buffer_size, salt, salt_length, output, output_size, output_length )
alg, );
input,
input_length,
salt,
salt_length,
output,
output_size,
output_length ) );
#endif /* PSA_CRYPTO_DRIVER_TEST */ #endif /* PSA_CRYPTO_DRIVER_TEST */
#endif /* PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT */ #endif /* PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT */
@ -2423,17 +2395,10 @@ psa_status_t psa_driver_wrapper_asymmetric_encrypt(
} }
psa_status_t psa_driver_wrapper_asymmetric_decrypt( psa_status_t psa_driver_wrapper_asymmetric_decrypt(
const psa_key_attributes_t *attributes, const psa_key_attributes_t *attributes, const uint8_t *key_buffer,
const uint8_t *key_buffer, size_t key_buffer_size, psa_algorithm_t alg, const uint8_t *input,
size_t key_buffer_size, size_t input_length, const uint8_t *salt, size_t salt_length,
psa_algorithm_t alg, uint8_t *output, size_t output_size, size_t *output_length )
const uint8_t *input,
size_t input_length,
const uint8_t *salt,
size_t salt_length,
uint8_t *output,
size_t output_size,
size_t *output_length )
{ {
psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED; psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
psa_key_location_t location = psa_key_location_t location =
@ -2447,47 +2412,26 @@ psa_status_t psa_driver_wrapper_asymmetric_decrypt(
#if defined(PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT) #if defined(PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT)
#if defined(PSA_CRYPTO_DRIVER_TEST) #if defined(PSA_CRYPTO_DRIVER_TEST)
status = mbedtls_test_transparent_asymmetric_decrypt( attributes, status = mbedtls_test_transparent_asymmetric_decrypt( attributes,
key_buffer, key_buffer, key_buffer_size, alg, input, input_length,
key_buffer_size, salt, salt_length, output, output_size,
alg, output_length );
input,
input_length,
salt,
salt_length,
output,
output_size,
output_length );
/* 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 /* PSA_CRYPTO_DRIVER_TEST */ #endif /* PSA_CRYPTO_DRIVER_TEST */
#endif /* PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT */ #endif /* PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT */
return( mbedtls_psa_asymmetric_decrypt( attributes, return( mbedtls_psa_asymmetric_decrypt( attributes,
key_buffer, key_buffer, key_buffer_size, alg,input, input_length,
key_buffer_size, salt, salt_length, output, output_size,
alg, output_length ) );
input,
input_length,
salt,
salt_length,
output,
output_size,
output_length ) );
/* Add cases for opaque driver here */ /* Add cases for opaque driver here */
#if defined(PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT) #if defined(PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT)
#if defined(PSA_CRYPTO_DRIVER_TEST) #if defined(PSA_CRYPTO_DRIVER_TEST)
case PSA_CRYPTO_TEST_DRIVER_LOCATION: case PSA_CRYPTO_TEST_DRIVER_LOCATION:
return( mbedtls_test_opaque_asymmetric_decrypt( attributes, return( mbedtls_test_opaque_asymmetric_decrypt( attributes,
key_buffer, key_buffer, key_buffer_size, alg, input, input_length,
key_buffer_size, salt, salt_length, output, output_size,
alg, output_length ) );
input,
input_length,
salt,
salt_length,
output,
output_size,
output_length ) );
#endif /* PSA_CRYPTO_DRIVER_TEST */ #endif /* PSA_CRYPTO_DRIVER_TEST */
#endif /* PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT */ #endif /* PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT */

60
tests/include/test/drivers/asym.h
View File

@ -49,56 +49,28 @@ static inline mbedtls_test_driver_rsa_hooks_t
extern mbedtls_test_driver_rsa_hooks_t mbedtls_test_driver_rsa_hooks; extern mbedtls_test_driver_rsa_hooks_t mbedtls_test_driver_rsa_hooks;
psa_status_t mbedtls_test_transparent_asymmetric_encrypt( psa_status_t mbedtls_test_transparent_asymmetric_encrypt(
const psa_key_attributes_t *attributes, const psa_key_attributes_t *attributes, const uint8_t *key_buffer,
const uint8_t *key_buffer, size_t key_buffer_size, psa_algorithm_t alg, const uint8_t *input,
size_t key_buffer_size, size_t input_length, const uint8_t *salt, size_t salt_length,
psa_algorithm_t alg, uint8_t *output, size_t output_size, size_t *output_length );
const uint8_t *input,
size_t input_length,
const uint8_t *salt,
size_t salt_length,
uint8_t *output,
size_t output_size,
size_t *output_length );
psa_status_t mbedtls_test_opaque_asymmetric_encrypt( psa_status_t mbedtls_test_opaque_asymmetric_encrypt(
const psa_key_attributes_t *attributes, const psa_key_attributes_t *attributes, const uint8_t *key,
const uint8_t *key, size_t key_length, psa_algorithm_t alg, const uint8_t *input,
size_t key_length, size_t input_length, const uint8_t *salt, size_t salt_length,
psa_algorithm_t alg, uint8_t *output, size_t output_size, size_t *output_length );
const uint8_t *input,
size_t input_length,
const uint8_t *salt,
size_t salt_length,
uint8_t *output,
size_t output_size,
size_t *output_length);
psa_status_t mbedtls_test_transparent_asymmetric_decrypt( psa_status_t mbedtls_test_transparent_asymmetric_decrypt(
const psa_key_attributes_t *attributes, const psa_key_attributes_t *attributes, const uint8_t *key_buffer,
const uint8_t *key_buffer, size_t key_buffer_size, psa_algorithm_t alg, const uint8_t *input,
size_t key_buffer_size, size_t input_length, const uint8_t *salt, size_t salt_length,
psa_algorithm_t alg, uint8_t *output, size_t output_size, size_t *output_length );
const uint8_t *input,
size_t input_length,
const uint8_t *salt,
size_t salt_length,
uint8_t *output,
size_t output_size,
size_t *output_length );
psa_status_t mbedtls_test_opaque_asymmetric_decrypt( psa_status_t mbedtls_test_opaque_asymmetric_decrypt(
const psa_key_attributes_t *attributes, const psa_key_attributes_t *attributes, const uint8_t *key,
const uint8_t *key, size_t key_length, psa_algorithm_t alg, const uint8_t *input,
size_t key_length, size_t input_length, const uint8_t *salt, size_t salt_length,
psa_algorithm_t alg, uint8_t *output, size_t output_size, size_t *output_length );
const uint8_t *input,
size_t input_length,
const uint8_t *salt,
size_t salt_length,
uint8_t *output,
size_t output_size,
size_t *output_length);
#endif /* PSA_CRYPTO_DRIVER_TEST */ #endif /* PSA_CRYPTO_DRIVER_TEST */
#endif /* PSA_CRYPTO_TEST_DRIVERS_ASYM_H */ #endif /* PSA_CRYPTO_TEST_DRIVERS_ASYM_H */

60
tests/src/drivers/test_driver_rsa.c
View File

@ -34,17 +34,10 @@ mbedtls_test_driver_rsa_hooks_t mbedtls_test_driver_rsa_hooks =
MBEDTLS_TEST_DRIVER_RSA_INIT; MBEDTLS_TEST_DRIVER_RSA_INIT;
psa_status_t mbedtls_test_transparent_asymmetric_encrypt( psa_status_t mbedtls_test_transparent_asymmetric_encrypt(
const psa_key_attributes_t *attributes, const psa_key_attributes_t *attributes, const uint8_t *key_buffer,
const uint8_t *key_buffer, size_t key_buffer_size, psa_algorithm_t alg, const uint8_t *input,
size_t key_buffer_size, size_t input_length, const uint8_t *salt, size_t salt_length,
psa_algorithm_t alg, uint8_t *output, size_t output_size, size_t *output_length )
const uint8_t *input,
size_t input_length,
const uint8_t *salt,
size_t salt_length,
uint8_t *output,
size_t output_size,
size_t *output_length )
{ {
mbedtls_test_driver_rsa_hooks.hits++; mbedtls_test_driver_rsa_hooks.hits++;
@ -82,17 +75,10 @@ psa_status_t mbedtls_test_transparent_asymmetric_encrypt(
} }
psa_status_t mbedtls_test_transparent_asymmetric_decrypt( psa_status_t mbedtls_test_transparent_asymmetric_decrypt(
const psa_key_attributes_t *attributes, const psa_key_attributes_t *attributes, const uint8_t *key_buffer,
const uint8_t *key_buffer, size_t key_buffer_size, psa_algorithm_t alg, const uint8_t *input,
size_t key_buffer_size, size_t input_length, const uint8_t *salt, size_t salt_length,
psa_algorithm_t alg, uint8_t *output, size_t output_size, size_t *output_length )
const uint8_t *input,
size_t input_length,
const uint8_t *salt,
size_t salt_length,
uint8_t *output,
size_t output_size,
size_t *output_length )
{ {
mbedtls_test_driver_rsa_hooks.hits++; mbedtls_test_driver_rsa_hooks.hits++;
@ -133,17 +119,10 @@ psa_status_t mbedtls_test_transparent_asymmetric_decrypt(
* opaque versions, to do * opaque versions, to do
*/ */
psa_status_t mbedtls_test_opaque_asymmetric_encrypt( psa_status_t mbedtls_test_opaque_asymmetric_encrypt(
const psa_key_attributes_t *attributes, const psa_key_attributes_t *attributes, const uint8_t *key,
const uint8_t *key, size_t key_length, psa_algorithm_t alg, const uint8_t *input,
size_t key_length, size_t input_length, const uint8_t *salt, size_t salt_length,
psa_algorithm_t alg, uint8_t *output, size_t output_size, size_t *output_length )
const uint8_t *input,
size_t input_length,
const uint8_t *salt,
size_t salt_length,
uint8_t *output,
size_t output_size,
size_t *output_length)
{ {
(void) attributes; (void) attributes;
(void) key; (void) key;
@ -160,17 +139,10 @@ psa_status_t mbedtls_test_opaque_asymmetric_encrypt(
} }
psa_status_t mbedtls_test_opaque_asymmetric_decrypt( psa_status_t mbedtls_test_opaque_asymmetric_decrypt(
const psa_key_attributes_t *attributes, const psa_key_attributes_t *attributes, const uint8_t *key,
const uint8_t *key, size_t key_length, psa_algorithm_t alg, const uint8_t *input,
size_t key_length, size_t input_length, const uint8_t *salt, size_t salt_length,
psa_algorithm_t alg, uint8_t *output, size_t output_size, size_t *output_length )
const uint8_t *input,
size_t input_length,
const uint8_t *salt,
size_t salt_length,
uint8_t *output,
size_t output_size,
size_t *output_length)
{ {
(void) attributes; (void) attributes;
(void) key; (void) key;