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

Use const pointers on parsing functions

Browse source 
The const-ness has to be cast away when calling mbedtls_asn1_xxx
parsing functions. This is a known flaw in the mbedtls API
(https://github.com/ARMmbed/mbedtls/issues/803).

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
Gilles Peskine 2021-02-14 01:22:56 +01:00
parent ad557e58bf
commit 5c2665b164
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tests/include/test/psa_exercise_key.h
View file

@ -143,8 +143,8 @@ int mbedtls_test_psa_setup_key_derivation_wrap(
psa_key_derivation_operation_t* operation, psa_key_derivation_operation_t* operation,
mbedtls_svc_key_id_t key, mbedtls_svc_key_id_t key,
psa_algorithm_t alg, psa_algorithm_t alg,
unsigned char* input1, size_t input1_length, const unsigned char* input1, size_t input1_length,
unsigned char* input2, size_t input2_length, const unsigned char* input2, size_t input2_length,
size_t capacity ); size_t capacity );
/** Perform a key agreement using the given key pair against its public key /** Perform a key agreement using the given key pair against its public key
@ -198,7 +198,7 @@ psa_status_t mbedtls_test_psa_key_agreement_with_self(
*/ */
int mbedtls_test_psa_exported_key_sanity_check( int mbedtls_test_psa_exported_key_sanity_check(
psa_key_type_t type, size_t bits, psa_key_type_t type, size_t bits,
uint8_t *exported, size_t exported_length ); const uint8_t *exported, size_t exported_length );
/** Do smoke tests on a key. /** Do smoke tests on a key.
* *

14
tests/src/psa_exercise_key.c
View file

@ -370,8 +370,8 @@ int mbedtls_test_psa_setup_key_derivation_wrap(
psa_key_derivation_operation_t* operation, psa_key_derivation_operation_t* operation,
mbedtls_svc_key_id_t key, mbedtls_svc_key_id_t key,
psa_algorithm_t alg, psa_algorithm_t alg,
unsigned char* input1, size_t input1_length, const unsigned char* input1, size_t input1_length,
unsigned char* input2, size_t input2_length, const unsigned char* input2, size_t input2_length,
size_t capacity ) size_t capacity )
{ {
PSA_ASSERT( psa_key_derivation_setup( operation, alg ) ); PSA_ASSERT( psa_key_derivation_setup( operation, alg ) );
@ -576,7 +576,7 @@ exit:
int mbedtls_test_psa_exported_key_sanity_check( int mbedtls_test_psa_exported_key_sanity_check(
psa_key_type_t type, size_t bits, psa_key_type_t type, size_t bits,
uint8_t *exported, size_t exported_length ) const uint8_t *exported, size_t exported_length )
{ {
if( PSA_KEY_TYPE_IS_UNSTRUCTURED( type ) ) if( PSA_KEY_TYPE_IS_UNSTRUCTURED( type ) )
TEST_EQUAL( exported_length, ( bits + 7 ) / 8 ); TEST_EQUAL( exported_length, ( bits + 7 ) / 8 );
@ -606,8 +606,8 @@ int mbedtls_test_psa_exported_key_sanity_check(
#if defined(MBEDTLS_RSA_C) && defined(MBEDTLS_PK_PARSE_C) #if defined(MBEDTLS_RSA_C) && defined(MBEDTLS_PK_PARSE_C)
if( type == PSA_KEY_TYPE_RSA_KEY_PAIR ) if( type == PSA_KEY_TYPE_RSA_KEY_PAIR )
{ {
uint8_t *p = exported; uint8_t *p = (uint8_t*) exported;
uint8_t *end = exported + exported_length; const uint8_t *end = exported + exported_length;
size_t len; size_t len;
/* RSAPrivateKey ::= SEQUENCE { /* RSAPrivateKey ::= SEQUENCE {
* version INTEGER, -- must be 0 * version INTEGER, -- must be 0
@ -662,8 +662,8 @@ int mbedtls_test_psa_exported_key_sanity_check(
#if defined(MBEDTLS_RSA_C) #if defined(MBEDTLS_RSA_C)
if( type == PSA_KEY_TYPE_RSA_PUBLIC_KEY ) if( type == PSA_KEY_TYPE_RSA_PUBLIC_KEY )
{ {
uint8_t *p = exported; uint8_t *p = (uint8_t*) exported;
uint8_t *end = exported + exported_length; const uint8_t *end = exported + exported_length;
size_t len; size_t len;
/* RSAPublicKey ::= SEQUENCE { /* RSAPublicKey ::= SEQUENCE {
* modulus INTEGER, -- n * modulus INTEGER, -- n