commit 4fc14cc4ae276e9723d5d5de1610869726db9766
author Dave Rodgman <dave.rodgman@arm.com> Tue Sep 19 19:45:54 2023 +0100
committer Dave Rodgman <dave.rodgman@arm.com> Tue Sep 19 19:45:54 2023 +0100
tree e9a9f7ed503484bbb65d499d6380b37f686ab157
parent f8182d91a71eff605f0756ba361757dcc7109f4d

Fix error in handling of return value from mbedtls_nist_kw_unwrap

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

library/nist_kw.c

diff --git a/library/nist_kw.c b/library/nist_kw.c
index 3de1b6a..d73e82f 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_else_0(mbedtls_ct_uint_gt(padlen, 7),
-                                                -MBEDTLS_ERR_CIPHER_AUTH_FAILED));
+        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" */