commit d38e8215d8ecf23726bcf3222405e768512cf9de
author Elena Uziunaite <elena.uziunaite@arm.com> Mon Feb 26 17:25:47 2024 +0000
committer Antonio de Angelis <Antonio.deAngelis@arm.com> Thu Aug 15 18:44:29 2024 +0200
tree 961d4baff693fca46f39a17f4a39ceb9c81521ef
parent e026a9478961bda81d68ba80f4cf161fef6f6b8b

MISRA: Reduce the number of violations for MC3R1.R12.1

According to MC3R1.R12.1 the precedence
of operators within expressions should be made explicit.

Change-Id: Ia82d28dc437f83bba995cb75dff0d1282d3b3157
Signed-off-by: Elena Uziunaite <elena.uziunaite@arm.com>
Signed-off-by: Nicola Mazzucato <nicola.mazzucato@arm.com>

interface/include/psa/crypto_sizes.h

diff --git a/interface/include/psa/crypto_sizes.h b/interface/include/psa/crypto_sizes.h
index 635ee98..1ce04b4 100644
--- a/interface/include/psa/crypto_sizes.h
+++ b/interface/include/psa/crypto_sizes.h
@@ -991,15 +991,15 @@
     PSA_KEY_EXPORT_ECC_KEY_PAIR_MAX_SIZE(PSA_VENDOR_ECC_MAX_CURVE_BITS)
 #endif
 #if defined(PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_BASIC) && \
-    (PSA_KEY_EXPORT_RSA_KEY_PAIR_MAX_SIZE(PSA_VENDOR_RSA_MAX_KEY_BITS) > \
-     PSA_EXPORT_KEY_PAIR_MAX_SIZE)
+    ((PSA_KEY_EXPORT_RSA_KEY_PAIR_MAX_SIZE(PSA_VENDOR_RSA_MAX_KEY_BITS)) > \
+     (PSA_EXPORT_KEY_PAIR_MAX_SIZE))
 #undef PSA_EXPORT_KEY_PAIR_MAX_SIZE
 #define PSA_EXPORT_KEY_PAIR_MAX_SIZE    \
     PSA_KEY_EXPORT_RSA_KEY_PAIR_MAX_SIZE(PSA_VENDOR_RSA_MAX_KEY_BITS)
 #endif
 #if defined(PSA_WANT_KEY_TYPE_DH_KEY_PAIR_BASIC) && \
-    (PSA_KEY_EXPORT_FFDH_KEY_PAIR_MAX_SIZE(PSA_VENDOR_FFDH_MAX_KEY_BITS) > \
-     PSA_EXPORT_KEY_PAIR_MAX_SIZE)
+    ((PSA_KEY_EXPORT_FFDH_KEY_PAIR_MAX_SIZE(PSA_VENDOR_FFDH_MAX_KEY_BITS)) > \
+     (PSA_EXPORT_KEY_PAIR_MAX_SIZE))
 #undef PSA_EXPORT_KEY_PAIR_MAX_SIZE
 #define PSA_EXPORT_KEY_PAIR_MAX_SIZE    \
     PSA_KEY_EXPORT_FFDH_KEY_PAIR_MAX_SIZE(PSA_VENDOR_FFDH_MAX_KEY_BITS)
@@ -1017,22 +1017,22 @@
 #define PSA_EXPORT_PUBLIC_KEY_MAX_SIZE            1
 
 #if defined(PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY) && \
-    (PSA_KEY_EXPORT_ECC_PUBLIC_KEY_MAX_SIZE(PSA_VENDOR_ECC_MAX_CURVE_BITS) > \
-     PSA_EXPORT_PUBLIC_KEY_MAX_SIZE)
+    ((PSA_KEY_EXPORT_ECC_PUBLIC_KEY_MAX_SIZE(PSA_VENDOR_ECC_MAX_CURVE_BITS)) > \
+     (PSA_EXPORT_PUBLIC_KEY_MAX_SIZE))
 #undef PSA_EXPORT_PUBLIC_KEY_MAX_SIZE
 #define PSA_EXPORT_PUBLIC_KEY_MAX_SIZE    \
     PSA_KEY_EXPORT_ECC_PUBLIC_KEY_MAX_SIZE(PSA_VENDOR_ECC_MAX_CURVE_BITS)
 #endif
 #if defined(PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY) && \
-    (PSA_KEY_EXPORT_RSA_PUBLIC_KEY_MAX_SIZE(PSA_VENDOR_RSA_MAX_KEY_BITS) > \
-     PSA_EXPORT_PUBLIC_KEY_MAX_SIZE)
+    ((PSA_KEY_EXPORT_RSA_PUBLIC_KEY_MAX_SIZE(PSA_VENDOR_RSA_MAX_KEY_BITS)) > \
+     (PSA_EXPORT_PUBLIC_KEY_MAX_SIZE))
 #undef PSA_EXPORT_PUBLIC_KEY_MAX_SIZE
 #define PSA_EXPORT_PUBLIC_KEY_MAX_SIZE    \
     PSA_KEY_EXPORT_RSA_PUBLIC_KEY_MAX_SIZE(PSA_VENDOR_RSA_MAX_KEY_BITS)
 #endif
 #if defined(PSA_WANT_KEY_TYPE_DH_PUBLIC_KEY) && \
-    (PSA_KEY_EXPORT_FFDH_PUBLIC_KEY_MAX_SIZE(PSA_VENDOR_FFDH_MAX_KEY_BITS) > \
-     PSA_EXPORT_PUBLIC_KEY_MAX_SIZE)
+    ((PSA_KEY_EXPORT_FFDH_PUBLIC_KEY_MAX_SIZE(PSA_VENDOR_FFDH_MAX_KEY_BITS)) > \
+     (PSA_EXPORT_PUBLIC_KEY_MAX_SIZE))
 #undef PSA_EXPORT_PUBLIC_KEY_MAX_SIZE
 #define PSA_EXPORT_PUBLIC_KEY_MAX_SIZE    \
     PSA_KEY_EXPORT_FFDH_PUBLIC_KEY_MAX_SIZE(PSA_VENDOR_FFDH_MAX_KEY_BITS)

interface/include/psa/crypto_values.h

diff --git a/interface/include/psa/crypto_values.h b/interface/include/psa/crypto_values.h
index 1d678db..eb04f46 100644
--- a/interface/include/psa/crypto_values.h
+++ b/interface/include/psa/crypto_values.h
@@ -2396,7 +2396,7 @@
  * \return The constructed lifetime value.
  */
 #define PSA_KEY_LIFETIME_FROM_PERSISTENCE_AND_LOCATION(persistence, location) \
-    ((location) << 8 | (persistence))
+    (((location) << 8) | (persistence))
 
 /** The local storage area for persistent keys.
  *