mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-04-18 14:42:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mbedtls_ssl_tls13_populate_transform: store the en/decryption keys and alg in the new fields

Browse Source 
Signed-off-by: Przemyslaw Stekiel <przemyslaw.stekiel@mobica.com>
This commit is contained in:
Przemyslaw Stekiel 2022-01-12 10:29:03 +01:00
parent ffccda45df
commit ae77b0ab28
1 changed files with 61 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
library/ssl_tls13_keys.c
View File

@ -31,6 +31,10 @@
#include "ssl_misc.h" #include "ssl_misc.h"
#include "ssl_tls13_keys.h" #include "ssl_tls13_keys.h"
/* Convert key bits to byte size */
#define KEY_BYTES( bits ) ( ( (size_t) bits + 7 ) / 8 )
#define MBEDTLS_SSL_TLS1_3_LABEL( name, string ) \ #define MBEDTLS_SSL_TLS1_3_LABEL( name, string ) \
.name = string, .name = string,
@ -795,6 +799,21 @@ exit:
return( ret ); return( ret );
} }
static int psa_status_to_mbedtls( psa_status_t status )
{
switch( status )
{
case PSA_SUCCESS:
return( 0 );
case PSA_ERROR_INSUFFICIENT_MEMORY:
return( MBEDTLS_ERR_CIPHER_ALLOC_FAILED );
case PSA_ERROR_NOT_SUPPORTED:
return( MBEDTLS_ERR_CIPHER_FEATURE_UNAVAILABLE );
default:
return( MBEDTLS_ERR_PLATFORM_HW_ACCEL_FAILED );
}
}
int mbedtls_ssl_tls13_populate_transform( mbedtls_ssl_transform *transform, int mbedtls_ssl_tls13_populate_transform( mbedtls_ssl_transform *transform,
int endpoint, int endpoint,
int ciphersuite, int ciphersuite,
@ -809,6 +828,14 @@ int mbedtls_ssl_tls13_populate_transform( mbedtls_ssl_transform *transform,
unsigned char const *key_dec; unsigned char const *key_dec;
unsigned char const *iv_dec; unsigned char const *iv_dec;
#if defined(MBEDTLS_USE_PSA_CRYPTO)
psa_key_type_t key_type;
psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT;
psa_algorithm_t alg;
size_t key_bits;
psa_status_t status = PSA_SUCCESS;
#endif
#if !defined(MBEDTLS_DEBUG_C) #if !defined(MBEDTLS_DEBUG_C)
ssl = NULL; /* make sure we don't use it except for those cases */ ssl = NULL; /* make sure we don't use it except for those cases */
(void) ssl; (void) ssl;
@ -892,6 +919,40 @@ int mbedtls_ssl_tls13_populate_transform( mbedtls_ssl_transform *transform,
return( ret ); return( ret );
} }
#if defined(MBEDTLS_USE_PSA_CRYPTO)
if( ( status = mbedtls_cipher_to_psa( cipher_info->type,
transform->taglen,
&alg,
&key_type,
&key_bits ) ) != PSA_SUCCESS )
{
MBEDTLS_SSL_DEBUG_RET( 1, "mbedtls_cipher_to_psa", status );
return( psa_status_to_mbedtls( status ) );
}
psa_set_key_usage_flags( &attributes, PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_DECRYPT );
psa_set_key_algorithm( &attributes, alg );
transform->psa_alg = alg;
if( ( status = psa_import_key( &attributes,
key_enc,
KEY_BYTES( key_bits ),
&transform->psa_key_enc ) ) != PSA_SUCCESS )
{
MBEDTLS_SSL_DEBUG_RET( 1, "psa_import_key", status );
return( psa_status_to_mbedtls( status ) );
}
if( ( status = psa_import_key( &attributes,
key_dec,
KEY_BYTES( key_bits ),
&transform->psa_key_dec ) ) != PSA_SUCCESS )
{
MBEDTLS_SSL_DEBUG_RET( 1, "psa_import_key", status );
return( psa_status_to_mbedtls( status ) );
}
#endif /* MBEDTLS_USE_PSA_CRYPTO */
/* /*
* Setup other fields in SSL transform * Setup other fields in SSL transform
*/ */