commit 4f387ef277eab7dd43f85a03f2caa2e8096f97a3
author Valerio Setti <valerio.setti@nordicsemi.no> Tue May 02 14:15:59 2023 +0200
committer Valerio Setti <valerio.setti@nordicsemi.no> Fri May 05 10:59:32 2023 +0200
tree fff3d7e647cfd4faace0929242b2878d9a49cf2a
parent 048cd44f7730f8f44e508ec2898dbb2ace5534d3

pk: use better naming for the new key ID field

Signed-off-by: Valerio Setti <valerio.setti@nordicsemi.no>

library/pk.c

diff --git a/library/pk.c b/library/pk.c
index bd6bf98..71ab60d 100644
--- a/library/pk.c
+++ b/library/pk.c
@@ -61,7 +61,7 @@
     ctx->pk_info = NULL;
     ctx->pk_ctx = NULL;
 #if defined(MBEDTLS_PSA_CRYPTO_C)
-    ctx->opaque_id = MBEDTLS_SVC_KEY_ID_INIT;
+    ctx->priv_id = MBEDTLS_SVC_KEY_ID_INIT;
 #endif /* MBEDTLS_PSA_CRYPTO_C */
 }
 
@@ -183,7 +183,7 @@
     }
 
     ctx->pk_info = info;
-    ctx->opaque_id = key;
+    ctx->priv_id = key;
 
     return 0;
 }
@@ -316,7 +316,7 @@
     psa_algorithm_t key_alg, key_alg2;
     psa_status_t status;
 
-    status = psa_get_key_attributes(ctx->opaque_id, &attributes);
+    status = psa_get_key_attributes(ctx->priv_id, &attributes);
     if (status != PSA_SUCCESS) {
         return 0;
     }
@@ -699,7 +699,7 @@
     if (mbedtls_pk_get_type(ctx) == MBEDTLS_PK_OPAQUE) {
         psa_status_t status;
 
-        status = psa_sign_hash(ctx->opaque_id, PSA_ALG_RSA_PSS(psa_md_alg),
+        status = psa_sign_hash(ctx->priv_id, PSA_ALG_RSA_PSS(psa_md_alg),
                                hash, hash_len,
                                sig, sig_size, sig_len);
         return PSA_PK_RSA_TO_MBEDTLS_ERR(status);

library/pk_wrap.c

diff --git a/library/pk_wrap.c b/library/pk_wrap.c
index d9366c1..0e5e120 100644
--- a/library/pk_wrap.c
+++ b/library/pk_wrap.c
@@ -1508,7 +1508,7 @@
     size_t bits;
     psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT;
 
-    if (PSA_SUCCESS != psa_get_key_attributes(pk->opaque_id, &attributes)) {
+    if (PSA_SUCCESS != psa_get_key_attributes(pk->priv_id, &attributes)) {
         return 0;
     }
 
@@ -1555,7 +1555,7 @@
     (void) f_rng;
     (void) p_rng;
 
-    status = psa_get_key_attributes(pk->opaque_id, &attributes);
+    status = psa_get_key_attributes(pk->priv_id, &attributes);
     if (status != PSA_SUCCESS) {
         return PSA_PK_TO_MBEDTLS_ERR(status);
     }
@@ -1576,7 +1576,7 @@
     return MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE;
 
     /* make the signature */
-    status = psa_sign_hash(pk->opaque_id, alg, hash, hash_len,
+    status = psa_sign_hash(pk->priv_id, alg, hash, hash_len,
                            sig, sig_size, sig_len);
     if (status != PSA_SUCCESS) {
 #if defined(MBEDTLS_PK_CAN_ECDSA_SIGN)
@@ -1638,7 +1638,7 @@
     (void) f_rng;
     (void) p_rng;
 
-    status = psa_asymmetric_decrypt(pk->opaque_id, PSA_ALG_RSA_PKCS1V15_CRYPT,
+    status = psa_asymmetric_decrypt(pk->priv_id, PSA_ALG_RSA_PKCS1V15_CRYPT,
                                     input, ilen,
                                     NULL, 0,
                                     output, osize, olen);

library/pkwrite.c

diff --git a/library/pkwrite.c b/library/pkwrite.c
index e62ad54..4bb9ac1 100644
--- a/library/pkwrite.c
+++ b/library/pkwrite.c
@@ -194,7 +194,7 @@
         }
 
         buffer_size = (size_t) (*p - start);
-        if (psa_export_public_key(key->opaque_id, start, buffer_size, &len)
+        if (psa_export_public_key(key->priv_id, start, buffer_size, &len)
             != PSA_SUCCESS) {
             return MBEDTLS_ERR_PK_BAD_INPUT_DATA;
         } else {
@@ -256,7 +256,7 @@
         psa_ecc_family_t curve;
         size_t bits;
 
-        if (PSA_SUCCESS != psa_get_key_attributes(key->opaque_id,
+        if (PSA_SUCCESS != psa_get_key_attributes(key->priv_id,
                                                   &attributes)) {
             return MBEDTLS_ERR_PLATFORM_HW_ACCEL_FAILED;
         }

library/ssl_tls12_server.c

diff --git a/library/ssl_tls12_server.c b/library/ssl_tls12_server.c
index 3025725..ac6c10d 100644
--- a/library/ssl_tls12_server.c
+++ b/library/ssl_tls12_server.c
@@ -2614,7 +2614,7 @@
                 return MBEDTLS_ERR_SSL_PK_TYPE_MISMATCH;
             }
 
-            ssl->handshake->ecdh_psa_privkey = pk->opaque_id;
+            ssl->handshake->ecdh_psa_privkey = pk->priv_id;
 
             /* Key should not be destroyed in the TLS library */
             ssl->handshake->ecdh_psa_privkey_is_external = 1;