Debugging code to try and narrow down CI issues

Signed-off-by: Paul Elliott <[email protected]>
Mbed-TLS · Oct 7, 2024 · 4759795 · 4759795
1 parent 897a1b8
commit 4759795
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/tf-psa-crypto/core/psa_crypto.c b/tf-psa-crypto/core/psa_crypto.c
@@ -8179,14 +8179,23 @@ psa_status_t psa_generate_key_iop_complete(
         return PSA_ERROR_BAD_STATE;
     }
 
+    //mbedtls_fprintf(stderr, "\npsa_generate_key_iop_complete()\n");
+
     status = mbedtls_psa_generate_key_complete(&operation->ctx, key_data,
                                                MBEDTLS_ECP_MAX_BYTES, &key_len);
     if (status != PSA_SUCCESS) {
         goto exit;
     }
 
+    //mbedtls_fprintf(stderr, "\npost mbedtls_psa_generate_key_complete()\n");
+
     status = psa_import_key(&operation->attributes, key_data, key_len, key);
 
+    if (status != PSA_SUCCESS && status != PSA_OPERATION_INCOMPLETE) {
+        mbedtls_fprintf(stderr, "\npsa_import_key() failed (key_len = %u\n",
+                        (unsigned) key_len);
+    }
+
 exit:
     if (status != PSA_OPERATION_INCOMPLETE) {
         if (status != PSA_SUCCESS) {

diff --git a/tf-psa-crypto/core/psa_crypto_ecp.c b/tf-psa-crypto/core/psa_crypto_ecp.c
@@ -630,6 +630,14 @@ psa_status_t mbedtls_psa_generate_key_complete(
     status = mbedtls_ecp_gen_privkey(&operation->ecp.grp, &operation->ecp.d,
                                      mbedtls_psa_get_random, MBEDTLS_PSA_RANDOM_STATE);
 
+    if (status) {
+
+        mbedtls_fprintf(stderr, "\nmbedtls_ecp_gen_privkey() failed\n");
+        if (mbedtls_ecp_get_type(&operation->ecp.grp) == MBEDTLS_ECP_TYPE_SHORT_WEIERSTRASS) {
+            mbedtls_fprintf(stderr, "\nIs Weierstrass\n");
+        }
+    }
+
     if (status) {
         return mbedtls_to_psa_error(status);
     }