mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-02-06 12:40:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix issues in export handshake psk

Browse Source 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
This commit is contained in:
Jerry Yu 2022-08-21 12:55:51 +08:00
parent 9f7f646b11
commit 01e42d2d4c
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
library/ssl_tls13_keys.c
View File

@ -1567,12 +1567,12 @@ cleanup:
return( ret ); return( ret );
} }
#if defined(MBEDTLS_KEY_EXCHANGE_SOME_PSK_ENABLED)
int mbedtls_ssl_tls13_export_handshake_psk( mbedtls_ssl_context *ssl, int mbedtls_ssl_tls13_export_handshake_psk( mbedtls_ssl_context *ssl,
unsigned char **psk, unsigned char **psk,
size_t *psk_len ) size_t *psk_len )
{ {
#if defined(MBEDTLS_KEY_EXCHANGE_SOME_PSK_ENABLED)
#if defined(MBEDTLS_USE_PSA_CRYPTO) #if defined(MBEDTLS_USE_PSA_CRYPTO)
psa_key_attributes_t key_attributes = PSA_KEY_ATTRIBUTES_INIT; psa_key_attributes_t key_attributes = PSA_KEY_ATTRIBUTES_INIT;
psa_status_t status; psa_status_t status;
@ -1581,7 +1581,7 @@ int mbedtls_ssl_tls13_export_handshake_psk( mbedtls_ssl_context *ssl,
*psk = NULL; *psk = NULL;
if( mbedtls_svc_key_id_is_null( ssl->handshake->psk_opaque ) ) if( mbedtls_svc_key_id_is_null( ssl->handshake->psk_opaque ) )
return( 0 ); return( MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED );
status = psa_get_key_attributes( ssl->handshake->psk_opaque, &key_attributes ); status = psa_get_key_attributes( ssl->handshake->psk_opaque, &key_attributes );
if( status != PSA_SUCCESS ) if( status != PSA_SUCCESS )
@ -1612,14 +1612,8 @@ int mbedtls_ssl_tls13_export_handshake_psk( mbedtls_ssl_context *ssl,
return( MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED ); return( MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED );
return( 0 ); return( 0 );
#endif /* !MBEDTLS_USE_PSA_CRYPTO */ #endif /* !MBEDTLS_USE_PSA_CRYPTO */
#else /* MBEDTLS_KEY_EXCHANGE_SOME_PSK_ENABLED */
((void) ssl);
*psk = NULL;
*psk_len = 0;
return( MBEDTLS_ERR_SSL_FEATURE_UNAVAILABLE );
#endif /* !MBEDTLS_KEY_EXCHANGE_SOME_PSK_ENABLED */
} }
#endif /* MBEDTLS_KEY_EXCHANGE_SOME_PSK_ENABLED */
#endif /* MBEDTLS_SSL_PROTO_TLS1_3 */ #endif /* MBEDTLS_SSL_PROTO_TLS1_3 */

11
library/ssl_tls13_keys.h
View File

@ -692,21 +692,22 @@ int mbedtls_ssl_tls13_compute_handshake_transform( mbedtls_ssl_context *ssl );
MBEDTLS_CHECK_RETURN_CRITICAL MBEDTLS_CHECK_RETURN_CRITICAL
int mbedtls_ssl_tls13_compute_application_transform( mbedtls_ssl_context *ssl ); int mbedtls_ssl_tls13_compute_application_transform( mbedtls_ssl_context *ssl );
#if defined(MBEDTLS_KEY_EXCHANGE_SOME_PSK_ENABLED)
/** /**
* \brief Export TLS 1.3 PSK from handshake context * \brief Export TLS 1.3 PSK from handshake context
* *
* \param ssl The SSL context to operate on. * \param[in] ssl The SSL context to operate on.
* \param psk PSK output pointer. * \param[out] psk PSK output pointer.
* \param psk_len * \param[out] psk_len Length of PSK.
* Length of PSK.
* *
* \returns \c 0 on success. * \returns \c 0 if there is configured PSK and exported success.
* \returns A negative error code on failure. * \returns A negative error code on failure.
*/ */
MBEDTLS_CHECK_RETURN_CRITICAL MBEDTLS_CHECK_RETURN_CRITICAL
int mbedtls_ssl_tls13_export_handshake_psk( mbedtls_ssl_context *ssl, int mbedtls_ssl_tls13_export_handshake_psk( mbedtls_ssl_context *ssl,
unsigned char **psk, unsigned char **psk,
size_t *psk_len ); size_t *psk_len );
#endif /* MBEDTLS_KEY_EXCHANGE_SOME_PSK_ENABLED */
#endif /* MBEDTLS_SSL_PROTO_TLS1_3 */ #endif /* MBEDTLS_SSL_PROTO_TLS1_3 */