commit b7000d4b2f1a35fcfdfbe3c87fa7210be5b02ded
author Janos Follath <janos.follath@arm.com> Mon Feb 03 13:55:11 2020 +0000
committer GitHub <noreply@github.com> Mon Feb 03 13:55:11 2020 +0000
tree a9c831d691ede015b81115273e5b4ed6df9518f9
parent c69c2c5bf52a8314644eaee808a9a2c33108b229
parent 28cd41676e2d3c978aa9cec0ce048e81b930cffa

Merge pull request #345 from gilles-peskine-arm/psa_mac_verify_finish-status

Fix possible error code mangling in psa_mac_verify_finish

library/psa_crypto.c

diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index 72ecdde..733a2e4 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -3149,6 +3149,8 @@
 
     status = psa_mac_finish_internal( operation,
                                       actual_mac, sizeof( actual_mac ) );
+    if( status != PSA_SUCCESS )
+        goto cleanup;
 
     if( safer_memcmp( mac, actual_mac, mac_length ) != 0 )
         status = PSA_ERROR_INVALID_SIGNATURE;