From 8f18b789d5a73af17cf123a3f803d45e5a6d0d90 Mon Sep 17 00:00:00 2001
From: Mate Toth-Pal <mate.toth-pal@arm.com>
Date: Tue, 17 Oct 2023 15:04:53 +0200
Subject: [PATCH] Initialise PSA signing context

Initialise the PSA signing context in the PSA crypto adapter when the
restartable signing API called with started==false.

Change-Id: I9f5c40d2908f1cd32aa35b8d9562b63873d21471
---
 crypto_adapters/t_cose_psa_crypto.c |  2 ++
 test/t_cose_sign_verify_test.c      | 40 ++++++++++++++++++++++++++---
 2 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/crypto_adapters/t_cose_psa_crypto.c b/crypto_adapters/t_cose_psa_crypto.c
index c045b71c..884c6a46 100644
--- a/crypto_adapters/t_cose_psa_crypto.c
+++ b/crypto_adapters/t_cose_psa_crypto.c
@@ -306,6 +306,8 @@ t_cose_crypto_sign_restart(bool                   started,
     psa_crypto_context = (struct t_cose_psa_crypto_context *)crypto_context;
 
     if(!started) {
+        psa_crypto_context->operation =
+            psa_sign_hash_interruptible_operation_init();
         psa_result = psa_sign_hash_start(
                             &psa_crypto_context->operation,
                             signing_key_psa,
diff --git a/test/t_cose_sign_verify_test.c b/test/t_cose_sign_verify_test.c
index 6874d9d1..d7cd98db 100644
--- a/test/t_cose_sign_verify_test.c
+++ b/test/t_cose_sign_verify_test.c
@@ -1552,6 +1552,38 @@ int32_t restart_test_2_step(void)
 
     QCBOREncode_AddBytes(&cbor_encode, payload);
 
+    for(counter = 0; counter < 3; ++counter) {
+        result = t_cose_sign_encode_finish(&sign_ctx,
+                                           NULL_Q_USEFUL_BUF_C,
+                                           payload,
+                                           &cbor_encode);
+        if(result != T_COSE_ERR_SIG_IN_PROGRESS) {
+            return 2000 + (int32_t)result;
+        }
+    }
+
+    /*
+     * Abandon the previous calculation, and call init on all the contexts to
+     * see that everything is initialised properly.
+     */
+
+    t_cose_signature_sign_restart_init(&signer, cose_algorithm_id);
+    t_cose_signature_sign_restart_set_crypto_context(&signer,
+                                                     &crypto_context);
+    t_cose_signature_sign_restart_set_signing_key(&signer, key_pair);
+
+    t_cose_sign_sign_init(&sign_ctx, T_COSE_OPT_MESSAGE_TYPE_SIGN1);
+    t_cose_sign_add_signer(&sign_ctx, t_cose_signature_sign_from_restart(&signer));
+
+    QCBOREncode_Init(&cbor_encode, signed_cose_buffer);
+
+    result = t_cose_sign_encode_start(&sign_ctx, &cbor_encode);
+    if(result != T_COSE_SUCCESS) {
+        return 3000 + (int32_t)result;
+    }
+
+    QCBOREncode_AddBytes(&cbor_encode, payload);
+
     counter = 0;
     do {
         result = t_cose_sign_encode_finish(&sign_ctx,
@@ -1562,15 +1594,15 @@ int32_t restart_test_2_step(void)
     } while(result == T_COSE_ERR_SIG_IN_PROGRESS);
 
     if(result) {
-        return 2000 + (int32_t)result;
+        return 4000 + (int32_t)result;
     }
     if(counter <= 1) {
-        return 3000;
+        return 5000;
     }
 
     qcbor_result = QCBOREncode_Finish(&cbor_encode, &signed_cose);
     if(qcbor_result) {
-        return 4000 + (int32_t)qcbor_result;
+        return 6000 + (int32_t)qcbor_result;
     }
 
     /* --- Done making COSE Sign1 object  --- */
@@ -1589,7 +1621,7 @@ int32_t restart_test_2_step(void)
                                  /* Don't return parameters */
                                  NULL);
     if(result) {
-        return 5000 + (int32_t)result;
+        return 7000 + (int32_t)result;
     }