ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #8926 from Patater/mbedtls-2.15.1 

mbedtls: Update Mbed TLS to 2.15.1
pull/8958/head
Martin Kojtal 2018-12-04 09:32:30 +01:00 committed by GitHub
parent 69c534d4c0 74f93271ab
commit 992bcbafdb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
features/mbedtls/VERSION.txt
View File

@ -1,2 +1,2 @@
mbedtls-2.15.0 mbedtls-2.15.1
mbedcrypto-0.1.0b mbedcrypto-0.1.0b2

2
features/mbedtls/importer/Makefile
View File

@ -27,7 +27,7 @@
# #
# Set the mbed TLS release to import (this can/should be edited before import) # Set the mbed TLS release to import (this can/should be edited before import)
MBED_TLS_RELEASE ?= mbedtls-2.15.0 MBED_TLS_RELEASE ?= mbedtls-2.15.1
# Translate between mbed TLS namespace and mbed namespace # Translate between mbed TLS namespace and mbed namespace
TARGET_PREFIX:=../ TARGET_PREFIX:=../

16
features/mbedtls/mbed-crypto/platform/TARGET_PSA/COMPONENT_PSA_SRV_IMPL/psa_crypto.c
View File

@ -3146,7 +3146,7 @@ static void psa_aead_abort( aead_operation_t *operation )
mbedtls_ccm_free( &operation->ctx.ccm ); mbedtls_ccm_free( &operation->ctx.ccm );
break; break;
#endif /* MBEDTLS_CCM_C */ #endif /* MBEDTLS_CCM_C */
#if defined(MBEDTLS_CCM_C) #if defined(MBEDTLS_GCM_C)
case PSA_ALG_GCM: case PSA_ALG_GCM:
mbedtls_gcm_free( &operation->ctx.gcm ); mbedtls_gcm_free( &operation->ctx.gcm );
break; break;
@ -3259,6 +3259,7 @@ psa_status_t psa_aead_encrypt( psa_key_slot_t key,
} }
tag = ciphertext + plaintext_length; tag = ciphertext + plaintext_length;
#if defined(MBEDTLS_GCM_C)
if( operation.core_alg == PSA_ALG_GCM ) if( operation.core_alg == PSA_ALG_GCM )
{ {
status = mbedtls_to_psa_error( status = mbedtls_to_psa_error(
@ -3270,7 +3271,10 @@ psa_status_t psa_aead_encrypt( psa_key_slot_t key,
plaintext, ciphertext, plaintext, ciphertext,
operation.tag_length, tag ) ); operation.tag_length, tag ) );
} }
else if( operation.core_alg == PSA_ALG_CCM ) else
#endif /* MBEDTLS_GCM_C */
#if defined(MBEDTLS_CCM_C)
if( operation.core_alg == PSA_ALG_CCM )
{ {
status = mbedtls_to_psa_error( status = mbedtls_to_psa_error(
mbedtls_ccm_encrypt_and_tag( &operation.ctx.ccm, mbedtls_ccm_encrypt_and_tag( &operation.ctx.ccm,
@ -3282,6 +3286,7 @@ psa_status_t psa_aead_encrypt( psa_key_slot_t key,
tag, operation.tag_length ) ); tag, operation.tag_length ) );
} }
else else
#endif /* MBEDTLS_CCM_C */
{ {
return( PSA_ERROR_NOT_SUPPORTED ); return( PSA_ERROR_NOT_SUPPORTED );
} }
@ -3339,6 +3344,7 @@ psa_status_t psa_aead_decrypt( psa_key_slot_t key,
if( status != PSA_SUCCESS ) if( status != PSA_SUCCESS )
return( status ); return( status );
#if defined(MBEDTLS_GCM_C)
if( operation.core_alg == PSA_ALG_GCM ) if( operation.core_alg == PSA_ALG_GCM )
{ {
status = psa_aead_unpadded_locate_tag( operation.tag_length, status = psa_aead_unpadded_locate_tag( operation.tag_length,
@ -3356,7 +3362,10 @@ psa_status_t psa_aead_decrypt( psa_key_slot_t key,
tag, operation.tag_length, tag, operation.tag_length,
ciphertext, plaintext ) ); ciphertext, plaintext ) );
} }
else if( operation.core_alg == PSA_ALG_CCM ) else
#endif /* MBEDTLS_GCM_C */
#if defined(MBEDTLS_CCM_C)
if( operation.core_alg == PSA_ALG_CCM )
{ {
status = psa_aead_unpadded_locate_tag( operation.tag_length, status = psa_aead_unpadded_locate_tag( operation.tag_length,
ciphertext, ciphertext_length, ciphertext, ciphertext_length,
@ -3374,6 +3383,7 @@ psa_status_t psa_aead_decrypt( psa_key_slot_t key,
tag, operation.tag_length ) ); tag, operation.tag_length ) );
} }
else else
#endif /* MBEDTLS_CCM_C */
{ {
return( PSA_ERROR_NOT_SUPPORTED ); return( PSA_ERROR_NOT_SUPPORTED );
} }