commit ee5464fab91cf6b6aad15d83b71a7deb28062008
author Dave Rodgman <dave.rodgman@arm.com> Wed Sep 20 09:13:12 2023 +0100
committer Dave Rodgman <dave.rodgman@arm.com> Wed Sep 20 09:13:12 2023 +0100
tree 9e06ac672c4bba06a1a32d01bc3c1dccade2c98f
parent fd96579ecd36cfb8cd940a755da4763ddd7d522e

Simplify unnecessarily complex error code handling

Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>

library/cipher.c

diff --git a/library/cipher.c b/library/cipher.c
index 73aaa5a..b398a60 100644
--- a/library/cipher.c
+++ b/library/cipher.c
@@ -915,7 +915,7 @@
         in_padding = mbedtls_ct_bool_and(in_padding, mbedtls_ct_bool_not(is_nonzero));
     }
 
-    return -((int) mbedtls_ct_uint_if_else_0(bad, -MBEDTLS_ERR_CIPHER_INVALID_PADDING));
+    return (int) mbedtls_ct_uint_if_else_0(bad, MBEDTLS_ERR_CIPHER_INVALID_PADDING);
 }
 #endif /* MBEDTLS_CIPHER_PADDING_ONE_AND_ZEROS */
 
@@ -962,7 +962,7 @@
         bad = mbedtls_ct_bool_or(bad, nonzero_pad_byte);
     }
 
-    return -((int) mbedtls_ct_uint_if_else_0(bad, -MBEDTLS_ERR_CIPHER_INVALID_PADDING));
+    return (int) mbedtls_ct_uint_if_else_0(bad, MBEDTLS_ERR_CIPHER_INVALID_PADDING);
 }
 #endif /* MBEDTLS_CIPHER_PADDING_ZEROS_AND_LEN */
 

library/nist_kw.c

diff --git a/library/nist_kw.c b/library/nist_kw.c
index d73e82f..b0d4137 100644
--- a/library/nist_kw.c
+++ b/library/nist_kw.c
@@ -421,8 +421,8 @@
          * larger than 8, because of the type wrap around.
          */
         padlen = in_len - KW_SEMIBLOCK_LENGTH - Plen;
-        ret = -((int) mbedtls_ct_uint_if(mbedtls_ct_uint_gt(padlen, 7),
-                                         -MBEDTLS_ERR_CIPHER_AUTH_FAILED, -ret));
+        ret = (int) mbedtls_ct_uint_if(mbedtls_ct_uint_gt(padlen, 7),
+                                       MBEDTLS_ERR_CIPHER_AUTH_FAILED, ret);
         padlen &= 7;
 
         /* Check padding in "constant-time" */