commit 328f11c50ed3a540aefbc0fd9a159a92b4f093ac
author Steven Cooreman <steven.cooreman@silabs.com> Tue Mar 02 11:44:51 2021 +0100
committer Steven Cooreman <steven.cooreman@silabs.com> Tue Mar 02 11:44:51 2021 +0100
tree 7dcc1987cfec81abadbe0d78e00fcebfc98efb57
parent d788fab4ff8a7e14841c8c372591fc71333fde67

Language & readability touchups

Signed-off-by: Steven Cooreman <steven.cooreman@silabs.com>

library/psa_crypto.c

diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index eff86bc..4f67ddf 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -890,9 +890,11 @@
     if( PSA_KEY_TYPE_IS_PUBLIC_KEY( slot->attr.type ) )
         usage &= ~PSA_KEY_USAGE_EXPORT;
 
-    status = PSA_ERROR_NOT_PERMITTED;
     if( ( slot->attr.policy.usage & usage ) != usage )
+    {
+        status = PSA_ERROR_NOT_PERMITTED;
         goto error;
+    }
 
     /* Enforce that the usage policy permits the requested algortihm. */
     if( alg != 0 )
@@ -2938,21 +2940,29 @@
          * a corner case due to the default MAC length being unknown
          * at key loading time. */
         if( PSA_ALG_IS_MAC( slot->attr.policy.alg ) &&
-            ( PSA_ALG_FULL_LENGTH_MAC( slot->attr.policy.alg ) == full_length_alg ) &&
+            ( PSA_ALG_FULL_LENGTH_MAC( slot->attr.policy.alg ) ==
+                full_length_alg ) &&
             ( slot->attr.policy.alg & PSA_ALG_MAC_AT_LEAST_THIS_LENGTH_FLAG ) )
         {
             /* validate policy length */
-            if( PSA_MAC_TRUNCATED_LENGTH( slot->attr.policy.alg ) > operation->mac_size )
+            if( PSA_MAC_TRUNCATED_LENGTH( slot->attr.policy.alg ) >
+                    operation->mac_size )
+            {
                 status = PSA_ERROR_NOT_PERMITTED;
+            }
         }
 
         if( PSA_ALG_IS_MAC( slot->attr.policy.alg2 ) &&
-            ( PSA_ALG_FULL_LENGTH_MAC( slot->attr.policy.alg2 ) == full_length_alg ) &&
+            ( PSA_ALG_FULL_LENGTH_MAC( slot->attr.policy.alg2 ) ==
+                full_length_alg ) &&
             ( slot->attr.policy.alg2 & PSA_ALG_MAC_AT_LEAST_THIS_LENGTH_FLAG ) )
         {
             /* validate policy length */
-            if( PSA_MAC_TRUNCATED_LENGTH( slot->attr.policy.alg2 ) > operation->mac_size )
+            if( PSA_MAC_TRUNCATED_LENGTH( slot->attr.policy.alg2 ) >
+                    operation->mac_size )
+            {
                 status = PSA_ERROR_NOT_PERMITTED;
+            }
         }
     }
     else if( truncated < 4 )