commit 9719a8450e4ff6f20d5b2548ffd3605da6c9abdf
author gabor-mezei-arm <gabor.mezei@arm.com> Mon May 03 16:26:20 2021 +0200
committer gabor-mezei-arm <gabor.mezei@arm.com> Thu May 06 13:49:24 2021 +0200
tree f5def624ae94d6d693de8073fe2fd8ac0622b9d5
parent fc8d0aedd6fe160916f1e7109184929d78ad59b7

Fix for algorithms other than hash-then-sign

Signed-off-by: gabor-mezei-arm <gabor.mezei@arm.com>

library/psa_crypto.c

diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index 7c95a6c..aa1beb5 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -3024,11 +3024,12 @@
     size_t *signature_length )
 {
     psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
-    size_t hash_length;
-    uint8_t hash[PSA_HASH_MAX_SIZE];
 
     if ( PSA_ALG_IS_HASH_AND_SIGN( alg ) )
     {
+        size_t hash_length;
+        uint8_t hash[PSA_HASH_MAX_SIZE];
+
         status = psa_driver_wrapper_hash_compute(
                     PSA_ALG_SIGN_GET_HASH( alg ),
                     input, input_length,
@@ -3036,11 +3037,16 @@
 
         if( status != PSA_SUCCESS )
             return status;
+
+        return psa_driver_wrapper_sign_hash(
+                    attributes, key_buffer, key_buffer_size,
+                    alg, hash, hash_length,
+                    signature, signature_size, signature_length );
     }
 
     return psa_driver_wrapper_sign_hash(
                 attributes, key_buffer, key_buffer_size,
-                alg, hash, hash_length,
+                alg, input, input_length,
                 signature, signature_size, signature_length );
 }
 
@@ -3068,11 +3074,12 @@
     size_t signature_length )
 {
     psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
-    size_t hash_length;
-    uint8_t hash[PSA_HASH_MAX_SIZE];
 
     if ( PSA_ALG_IS_HASH_AND_SIGN( alg ) )
     {
+        size_t hash_length;
+        uint8_t hash[PSA_HASH_MAX_SIZE];
+
         status = psa_driver_wrapper_hash_compute(
                     PSA_ALG_SIGN_GET_HASH( alg ),
                     input, input_length,
@@ -3080,11 +3087,16 @@
 
         if( status != PSA_SUCCESS )
             return status;
+
+        return psa_driver_wrapper_verify_hash(
+                    attributes, key_buffer, key_buffer_size,
+                    alg, hash, hash_length,
+                    signature, signature_length );
     }
 
     return psa_driver_wrapper_verify_hash(
                 attributes, key_buffer, key_buffer_size,
-                alg, hash, hash_length,
+                alg, input, input_length,
                 signature, signature_length );
 }