lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-28 00:21:48 +03:00
Code Activity

Merge pull request #5648 from gabor-mezei-arm/5403_hkdf_use_internal_psa_implementations

Browse Source 
HKDF 2: use internal implementations in TLS 1.3
This commit is contained in:
Manuel Pégourié-Gonnard
2022-04-01 11:15:29 +02:00
committed by GitHub
parent d7bdedc9f6 e42d8bf83b
commit 6a25159c69
6 changed files with 373 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
library/ssl_misc.h
View File

@ -52,11 +52,6 @@
#include "mbedtls/ecjpake.h"
#endif
#if defined(MBEDTLS_USE_PSA_CRYPTO)
#include "psa/crypto.h"
#include "mbedtls/psa_util.h"
#endif /* MBEDTLS_USE_PSA_CRYPTO */
#include "common.h"
#if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && \
@ -2187,11 +2182,15 @@ static inline int psa_ssl_status_to_mbedtls( psa_status_t status )
case PSA_SUCCESS:
return( 0 );
case PSA_ERROR_INSUFFICIENT_MEMORY:
return( MBEDTLS_ERR_CIPHER_ALLOC_FAILED );
return( MBEDTLS_ERR_SSL_ALLOC_FAILED );
case PSA_ERROR_NOT_SUPPORTED:
return( MBEDTLS_ERR_CIPHER_FEATURE_UNAVAILABLE );
return( MBEDTLS_ERR_SSL_FEATURE_UNAVAILABLE );
case PSA_ERROR_INVALID_SIGNATURE:
return( MBEDTLS_ERR_SSL_INVALID_MAC );
case PSA_ERROR_INVALID_ARGUMENT:
return( MBEDTLS_ERR_SSL_BAD_INPUT_DATA );
case PSA_ERROR_BAD_STATE:
return( MBEDTLS_ERR_SSL_INTERNAL_ERROR );
default:
return( MBEDTLS_ERR_PLATFORM_HW_ACCEL_FAILED );
}