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 #9856 from Patater/update-mbedcrypto-1.0.0d7 

crypto: Update Mbed Crypto to 1.0.0d7
pull/9892/head
Martin Kojtal 2019-02-27 13:45:38 +01:00 committed by GitHub
parent 6bdbe754cd d63677f207
commit 5b78adc69c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
features/mbedtls/mbed-crypto/VERSION.txt
View File

@ -1 +1 @@
mbedcrypto-1.0.0d6 mbedcrypto-1.0.0d7

2
features/mbedtls/mbed-crypto/importer/Makefile
View File

@ -29,7 +29,7 @@
# Set the Mbed Crypto release to import (this can/should be edited before # Set the Mbed Crypto release to import (this can/should be edited before
# import) # import)
CRYPTO_RELEASE ?= mbedcrypto-1.0.0d6 CRYPTO_RELEASE ?= mbedcrypto-1.0.0d7
CRYPTO_REPO_URL ?= git@github.com:ARMmbed/mbed-crypto.git CRYPTO_REPO_URL ?= git@github.com:ARMmbed/mbed-crypto.git
# Translate between Mbed Crypto namespace and Mbed OS namespace # Translate between Mbed Crypto namespace and Mbed OS namespace

2
features/mbedtls/mbed-crypto/inc/psa/crypto_extra.h
View File

@ -30,6 +30,8 @@
#ifndef PSA_CRYPTO_EXTRA_H #ifndef PSA_CRYPTO_EXTRA_H
#define PSA_CRYPTO_EXTRA_H #define PSA_CRYPTO_EXTRA_H
#include "mbedtls/platform_util.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif

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

@ -2902,8 +2902,8 @@ static psa_status_t psa_cipher_setup( psa_cipher_operation_t *operation,
psa_algorithm_t alg, psa_algorithm_t alg,
mbedtls_operation_t cipher_operation ) mbedtls_operation_t cipher_operation )
{ {
int ret = MBEDTLS_ERR_CIPHER_FEATURE_UNAVAILABLE; int ret = 0;
psa_status_t status; psa_status_t status = PSA_ERROR_GENERIC_ERROR;
psa_key_slot_t *slot; psa_key_slot_t *slot;
size_t key_bits; size_t key_bits;
const mbedtls_cipher_info_t *cipher_info = NULL; const mbedtls_cipher_info_t *cipher_info = NULL;
@ -2923,19 +2923,19 @@ static psa_status_t psa_cipher_setup( psa_cipher_operation_t *operation,
status = psa_get_key_from_slot( handle, &slot, usage, alg); status = psa_get_key_from_slot( handle, &slot, usage, alg);
if( status != PSA_SUCCESS ) if( status != PSA_SUCCESS )
return( status ); goto exit;
key_bits = psa_get_key_bits( slot ); key_bits = psa_get_key_bits( slot );
cipher_info = mbedtls_cipher_info_from_psa( alg, slot->type, key_bits, NULL ); cipher_info = mbedtls_cipher_info_from_psa( alg, slot->type, key_bits, NULL );
if( cipher_info == NULL ) if( cipher_info == NULL )
return( PSA_ERROR_NOT_SUPPORTED ); {
status = PSA_ERROR_NOT_SUPPORTED;
goto exit;
}
ret = mbedtls_cipher_setup( &operation->ctx.cipher, cipher_info ); ret = mbedtls_cipher_setup( &operation->ctx.cipher, cipher_info );
if( ret != 0 ) if( ret != 0 )
{ goto exit;
psa_cipher_abort( operation );
return( mbedtls_to_psa_error( ret ) );
}
#if defined(MBEDTLS_DES_C) #if defined(MBEDTLS_DES_C)
if( slot->type == PSA_KEY_TYPE_DES && key_bits == 128 ) if( slot->type == PSA_KEY_TYPE_DES && key_bits == 128 )
@ -2956,10 +2956,7 @@ static psa_status_t psa_cipher_setup( psa_cipher_operation_t *operation,
(int) key_bits, cipher_operation ); (int) key_bits, cipher_operation );
} }
if( ret != 0 ) if( ret != 0 )
{ goto exit;
psa_cipher_abort( operation );
return( mbedtls_to_psa_error( ret ) );
}
#if defined(MBEDTLS_CIPHER_MODE_WITH_PADDING) #if defined(MBEDTLS_CIPHER_MODE_WITH_PADDING)
switch( alg ) switch( alg )
@ -2978,10 +2975,7 @@ static psa_status_t psa_cipher_setup( psa_cipher_operation_t *operation,
break; break;
} }
if( ret != 0 ) if( ret != 0 )
{ goto exit;
psa_cipher_abort( operation );
return( mbedtls_to_psa_error( ret ) );
}
#endif //MBEDTLS_CIPHER_MODE_WITH_PADDING #endif //MBEDTLS_CIPHER_MODE_WITH_PADDING
operation->key_set = 1; operation->key_set = 1;
@ -2992,7 +2986,12 @@ static psa_status_t psa_cipher_setup( psa_cipher_operation_t *operation,
operation->iv_size = PSA_BLOCK_CIPHER_BLOCK_SIZE( slot->type ); operation->iv_size = PSA_BLOCK_CIPHER_BLOCK_SIZE( slot->type );
} }
return( PSA_SUCCESS ); exit:
if( status == 0 )
status = mbedtls_to_psa_error( ret );
if( status != 0 )
psa_cipher_abort( operation );
return( status );
} }
psa_status_t psa_cipher_encrypt_setup( psa_cipher_operation_t *operation, psa_status_t psa_cipher_encrypt_setup( psa_cipher_operation_t *operation,