commit eabbf9d9073d34c0635538804fb195d262ed5fab
author Neil Armstrong <narmstrong@baylibre.com> Tue Mar 15 12:01:26 2022 +0100
committer Neil Armstrong <narmstrong@baylibre.com> Thu Apr 07 14:51:47 2022 +0200
tree d836421bee3328ff97a5f35cb0b4ce040bec9c72
parent 1b05aff3ad8588725da69ac83da08d7fe268a44c

Add support for RSA PK Opaque key

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

library/pk.c

diff --git a/library/pk.c b/library/pk.c
index 3b42799..abed468 100644
--- a/library/pk.c
+++ b/library/pk.c
@@ -153,7 +153,7 @@
 int mbedtls_pk_setup_opaque( mbedtls_pk_context *ctx,
                              const mbedtls_svc_key_id_t key )
 {
-    const mbedtls_pk_info_t * const info = &mbedtls_pk_opaque_info;
+    const mbedtls_pk_info_t *info = NULL;
     psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT;
     mbedtls_svc_key_id_t *pk_ctx;
     psa_key_type_t type;
@@ -166,9 +166,12 @@
     type = psa_get_key_type( &attributes );
     psa_reset_key_attributes( &attributes );
 
-    /* Current implementation of can_do() relies on this. */
-    if( ! PSA_KEY_TYPE_IS_ECC_KEY_PAIR( type ) )
-        return( MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE) ;
+    if( PSA_KEY_TYPE_IS_ECC_KEY_PAIR( type ) )
+        info = &mbedtls_pk_ecdsa_opaque_info;
+    else if( PSA_KEY_TYPE_IS_RSA( type ) )
+        info = &mbedtls_pk_rsa_opaque_info;
+    else
+        return( MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE );
 
     if( ( ctx->pk_ctx = info->ctx_alloc_func() ) == NULL )
         return( MBEDTLS_ERR_PK_ALLOC_FAILED );