commit d63320127999707a53d50f3926b5cab4500bd2d3
author Neil Armstrong <narmstrong@baylibre.com> Fri Mar 04 10:26:16 2022 +0100
committer Neil Armstrong <narmstrong@baylibre.com> Fri Mar 04 14:45:18 2022 +0100
tree b2560ed889b6322d597e7d45ce0c0972b3ab9d7a
parent bca99ee0ac871e555452f3959d78eaf892bbb870

Import PSA HMAC key in mbedtls_ssl_cookie_setup()

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>

library/ssl_cookie.c

diff --git a/library/ssl_cookie.c b/library/ssl_cookie.c
index 9f27a87..ba5d8b9 100644
--- a/library/ssl_cookie.c
+++ b/library/ssl_cookie.c
@@ -107,10 +107,34 @@
 {
     int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
     unsigned char key[COOKIE_MD_OUTLEN];
+#if defined(MBEDTLS_USE_PSA_CRYPTO)
+    psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT;
+    psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
+    psa_algorithm_t alg;
+#endif /* MBEDTLS_USE_PSA_CRYPTO */
 
     if( ( ret = f_rng( p_rng, key, sizeof( key ) ) ) != 0 )
         return( ret );
 
+#if defined(MBEDTLS_USE_PSA_CRYPTO)
+    alg = mbedtls_psa_translate_md( COOKIE_MD );
+    if( alg == 0 )
+        return( MBEDTLS_ERR_SSL_BAD_INPUT_DATA );
+
+    ctx->psa_hmac_alg = PSA_ALG_HMAC( alg );
+
+    psa_set_key_usage_flags( &attributes, PSA_KEY_USAGE_SIGN_MESSAGE );
+    psa_set_key_algorithm( &attributes, PSA_ALG_HMAC( alg ) );
+    psa_set_key_type( &attributes, PSA_KEY_TYPE_HMAC );
+
+    if( ( status = psa_import_key( &attributes,
+                                   key, sizeof( key ),
+                                   &ctx->psa_hmac ) ) != PSA_SUCCESS )
+    {
+        return psa_ssl_status_to_mbedtls( status );
+    }
+#endif /* MBEDTLS_USE_PSA_CRYPTO */
+
     ret = mbedtls_md_setup( &ctx->hmac_ctx, mbedtls_md_info_from_type( COOKIE_MD ), 1 );
     if( ret != 0 )
         return( ret );