mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-01-28 18:32:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove RAW PSK when MBEDTLS_USE_PSA_CRYPTO is selected

Browse Source 
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
This commit is contained in:
Neil Armstrong 2022-05-03 10:22:14 +02:00
parent 61f237afb7
commit e952a30d47
5 changed files with 28 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/mbedtls/ssl.h
View File

@ -1428,8 +1428,7 @@ struct mbedtls_ssl_config
* configured, this has value \c 0. * configured, this has value \c 0.
*/ */
uint8_t MBEDTLS_PRIVATE(psk_opaque_is_internal); uint8_t MBEDTLS_PRIVATE(psk_opaque_is_internal);
#endif /* MBEDTLS_USE_PSA_CRYPTO */ #else
unsigned char *MBEDTLS_PRIVATE(psk); /*!< The raw pre-shared key. This field should unsigned char *MBEDTLS_PRIVATE(psk); /*!< The raw pre-shared key. This field should
* only be set via mbedtls_ssl_conf_psk(). * only be set via mbedtls_ssl_conf_psk().
* If either no PSK or an opaque PSK * If either no PSK or an opaque PSK
@ -1439,6 +1438,7 @@ struct mbedtls_ssl_config
* mbedtls_ssl_conf_psk(). * mbedtls_ssl_conf_psk().
* Its value is non-zero if and only if * Its value is non-zero if and only if
* \c psk is not \c NULL. */ * \c psk is not \c NULL. */
#endif /* MBEDTLS_USE_PSA_CRYPTO */
unsigned char *MBEDTLS_PRIVATE(psk_identity); /*!< The PSK identity for PSK negotiation. unsigned char *MBEDTLS_PRIVATE(psk_identity); /*!< The PSK identity for PSK negotiation.
* This field should only be set via * This field should only be set via

10
library/ssl_misc.h
View File

@ -653,9 +653,10 @@ struct mbedtls_ssl_handshake_params
#if defined(MBEDTLS_USE_PSA_CRYPTO) #if defined(MBEDTLS_USE_PSA_CRYPTO)
mbedtls_svc_key_id_t psk_opaque; /*!< Opaque PSK from the callback */ mbedtls_svc_key_id_t psk_opaque; /*!< Opaque PSK from the callback */
uint8_t psk_opaque_is_internal; uint8_t psk_opaque_is_internal;
#endif /* MBEDTLS_USE_PSA_CRYPTO */ #else
unsigned char *psk; /*!< PSK from the callback */ unsigned char *psk; /*!< PSK from the callback */
size_t psk_len; /*!< Length of PSK from callback */ size_t psk_len; /*!< Length of PSK from callback */
#endif /* MBEDTLS_USE_PSA_CRYPTO */
#endif /* MBEDTLS_KEY_EXCHANGE_SOME_PSK_ENABLED */ #endif /* MBEDTLS_KEY_EXCHANGE_SOME_PSK_ENABLED */
#if defined(MBEDTLS_SSL_ECP_RESTARTABLE_ENABLED) #if defined(MBEDTLS_SSL_ECP_RESTARTABLE_ENABLED)
@ -1321,6 +1322,12 @@ int mbedtls_ssl_conf_has_static_psk( mbedtls_ssl_config const *conf );
static inline int mbedtls_ssl_get_psk( const mbedtls_ssl_context *ssl, static inline int mbedtls_ssl_get_psk( const mbedtls_ssl_context *ssl,
const unsigned char **psk, size_t *psk_len ) const unsigned char **psk, size_t *psk_len )
{ {
#if defined(MBEDTLS_USE_PSA_CRYPTO)
(void) ssl;
*psk = NULL;
*psk_len = 0;
return( MBEDTLS_ERR_SSL_PRIVATE_KEY_REQUIRED );
#else
if( ssl->handshake->psk != NULL && ssl->handshake->psk_len > 0 ) if( ssl->handshake->psk != NULL && ssl->handshake->psk_len > 0 )
{ {
*psk = ssl->handshake->psk; *psk = ssl->handshake->psk;
@ -1341,6 +1348,7 @@ static inline int mbedtls_ssl_get_psk( const mbedtls_ssl_context *ssl,
} }
return( 0 ); return( 0 );
#endif /* MBEDTLS_USE_PSA_CRYPTO */
} }
#if defined(MBEDTLS_USE_PSA_CRYPTO) #if defined(MBEDTLS_USE_PSA_CRYPTO)

49
library/ssl_tls.c
View File

@ -1527,10 +1527,10 @@ static int ssl_conf_psk_is_configured( mbedtls_ssl_config const *conf )
#if defined(MBEDTLS_USE_PSA_CRYPTO) #if defined(MBEDTLS_USE_PSA_CRYPTO)
if( !mbedtls_svc_key_id_is_null( conf->psk_opaque ) ) if( !mbedtls_svc_key_id_is_null( conf->psk_opaque ) )
return( 1 ); return( 1 );
#endif /* MBEDTLS_USE_PSA_CRYPTO */ #else
if( conf->psk != NULL ) if( conf->psk != NULL )
return( 1 ); return( 1 );
#endif /* MBEDTLS_USE_PSA_CRYPTO */
return( 0 ); return( 0 );
} }
@ -1550,12 +1550,7 @@ static void ssl_conf_remove_psk( mbedtls_ssl_config *conf )
} }
conf->psk_opaque = MBEDTLS_SVC_KEY_ID_INIT; conf->psk_opaque = MBEDTLS_SVC_KEY_ID_INIT;
} }
/* This and the following branch should never #else
* be taken simultaenously as we maintain the
* invariant that raw and opaque PSKs are never
* configured simultaneously. As a safeguard,
* though, `else` is omitted here. */
#endif /* MBEDTLS_USE_PSA_CRYPTO */
if( conf->psk != NULL ) if( conf->psk != NULL )
{ {
mbedtls_platform_zeroize( conf->psk, conf->psk_len ); mbedtls_platform_zeroize( conf->psk, conf->psk_len );
@ -1564,6 +1559,7 @@ static void ssl_conf_remove_psk( mbedtls_ssl_config *conf )
conf->psk = NULL; conf->psk = NULL;
conf->psk_len = 0; conf->psk_len = 0;
} }
#endif /* MBEDTLS_USE_PSA_CRYPTO */
/* Remove reference to PSK identity, if any. */ /* Remove reference to PSK identity, if any. */
if( conf->psk_identity != NULL ) if( conf->psk_identity != NULL )
@ -1668,8 +1664,7 @@ static void ssl_remove_psk( mbedtls_ssl_context *ssl )
} }
ssl->handshake->psk_opaque = MBEDTLS_SVC_KEY_ID_INIT; ssl->handshake->psk_opaque = MBEDTLS_SVC_KEY_ID_INIT;
} }
else #else
#endif /* MBEDTLS_USE_PSA_CRYPTO */
if( ssl->handshake->psk != NULL ) if( ssl->handshake->psk != NULL )
{ {
mbedtls_platform_zeroize( ssl->handshake->psk, mbedtls_platform_zeroize( ssl->handshake->psk,
@ -1677,6 +1672,7 @@ static void ssl_remove_psk( mbedtls_ssl_context *ssl )
mbedtls_free( ssl->handshake->psk ); mbedtls_free( ssl->handshake->psk );
ssl->handshake->psk_len = 0; ssl->handshake->psk_len = 0;
} }
#endif /* MBEDTLS_USE_PSA_CRYPTO */
} }
int mbedtls_ssl_set_hs_psk( mbedtls_ssl_context *ssl, int mbedtls_ssl_set_hs_psk( mbedtls_ssl_context *ssl,
@ -3304,12 +3300,13 @@ void mbedtls_ssl_handshake_free( mbedtls_ssl_context *ssl )
} }
ssl->handshake->psk_opaque = MBEDTLS_SVC_KEY_ID_INIT; ssl->handshake->psk_opaque = MBEDTLS_SVC_KEY_ID_INIT;
} }
#endif /* MBEDTLS_USE_PSA_CRYPTO */ #else
if( handshake->psk != NULL ) if( handshake->psk != NULL )
{ {
mbedtls_platform_zeroize( handshake->psk, handshake->psk_len ); mbedtls_platform_zeroize( handshake->psk, handshake->psk_len );
mbedtls_free( handshake->psk ); mbedtls_free( handshake->psk );
} }
#endif /* MBEDTLS_USE_PSA_CRYPTO */
#endif #endif
#if defined(MBEDTLS_X509_CRT_PARSE_C) && \ #if defined(MBEDTLS_X509_CRT_PARSE_C) && \
@ -4508,7 +4505,7 @@ void mbedtls_ssl_config_free( mbedtls_ssl_config *conf )
} }
conf->psk_opaque = MBEDTLS_SVC_KEY_ID_INIT; conf->psk_opaque = MBEDTLS_SVC_KEY_ID_INIT;
} }
#endif /* MBEDTLS_USE_PSA_CRYPTO */ #else
if( conf->psk != NULL ) if( conf->psk != NULL )
{ {
mbedtls_platform_zeroize( conf->psk, conf->psk_len ); mbedtls_platform_zeroize( conf->psk, conf->psk_len );
@ -4516,6 +4513,7 @@ void mbedtls_ssl_config_free( mbedtls_ssl_config *conf )
conf->psk = NULL; conf->psk = NULL;
conf->psk_len = 0; conf->psk_len = 0;
} }
#endif /* MBEDTLS_USE_PSA_CRYPTO */
if( conf->psk_identity != NULL ) if( conf->psk_identity != NULL )
{ {
@ -5185,30 +5183,6 @@ static int ssl_set_handshake_prfs( mbedtls_ssl_handshake_params *handshake,
return( 0 ); return( 0 );
} }
#if defined(MBEDTLS_USE_PSA_CRYPTO) && \
defined(MBEDTLS_KEY_EXCHANGE_SOME_PSK_ENABLED )
static int ssl_use_opaque_psk( mbedtls_ssl_context const *ssl )
{
if( ssl->conf->f_psk != NULL )
{
/* If we've used a callback to select the PSK,
* the static configuration is irrelevant. */
if( ! mbedtls_svc_key_id_is_null( ssl->handshake->psk_opaque ) )
return( 1 );
return( 0 );
}
if( ! mbedtls_svc_key_id_is_null( ssl->conf->psk_opaque ) )
return( 1 );
return( 0 );
}
#endif /* MBEDTLS_USE_PSA_CRYPTO &&
MBEDTLS_KEY_EXCHANGE_SOME_PSK_ENABLED */
/* /*
* Compute master secret if needed * Compute master secret if needed
* *
@ -5281,8 +5255,7 @@ static int ssl_compute_master( mbedtls_ssl_handshake_params *handshake,
#if defined(MBEDTLS_USE_PSA_CRYPTO) && \ #if defined(MBEDTLS_USE_PSA_CRYPTO) && \
defined(MBEDTLS_KEY_EXCHANGE_SOME_PSK_ENABLED) defined(MBEDTLS_KEY_EXCHANGE_SOME_PSK_ENABLED)
if( mbedtls_ssl_ciphersuite_uses_psk( handshake->ciphersuite_info ) == 1 && if( mbedtls_ssl_ciphersuite_uses_psk( handshake->ciphersuite_info ) == 1 )
ssl_use_opaque_psk( ssl ) == 1 )
{ {
/* Perform PSK-to-MS expansion in a single step. */ /* Perform PSK-to-MS expansion in a single step. */
psa_status_t status; psa_status_t status;

6
library/ssl_tls12_client.c
View File

@ -62,12 +62,12 @@ int mbedtls_ssl_conf_has_static_psk( mbedtls_ssl_config const *conf )
return( 0 ); return( 0 );
} }
if( conf->psk != NULL && conf->psk_len != 0 )
return( 1 );
#if defined(MBEDTLS_USE_PSA_CRYPTO) #if defined(MBEDTLS_USE_PSA_CRYPTO)
if( ! mbedtls_svc_key_id_is_null( conf->psk_opaque ) ) if( ! mbedtls_svc_key_id_is_null( conf->psk_opaque ) )
return( 1 ); return( 1 );
#else
if( conf->psk != NULL && conf->psk_len != 0 )
return( 1 );
#endif /* MBEDTLS_USE_PSA_CRYPTO */ #endif /* MBEDTLS_USE_PSA_CRYPTO */
return( 0 ); return( 0 );

5
library/ssl_tls12_server.c
View File

@ -160,12 +160,13 @@ static int ssl_conf_has_psk_or_cb( mbedtls_ssl_config const *conf )
if( conf->psk_identity_len == 0 || conf->psk_identity == NULL ) if( conf->psk_identity_len == 0 || conf->psk_identity == NULL )
return( 0 ); return( 0 );
if( conf->psk != NULL && conf->psk_len != 0 )
return( 1 );
#if defined(MBEDTLS_USE_PSA_CRYPTO) #if defined(MBEDTLS_USE_PSA_CRYPTO)
if( ! mbedtls_svc_key_id_is_null( conf->psk_opaque ) ) if( ! mbedtls_svc_key_id_is_null( conf->psk_opaque ) )
return( 1 ); return( 1 );
#else
if( conf->psk != NULL && conf->psk_len != 0 )
return( 1 );
#endif /* MBEDTLS_USE_PSA_CRYPTO */ #endif /* MBEDTLS_USE_PSA_CRYPTO */
return( 0 ); return( 0 );