commit 8a7629fd0ffc0709eb47cdaf4607e76f35fc009b
author David Horstmann <david.horstmann@arm.com> Thu Oct 06 18:57:57 2022 +0100
committer David Horstmann <david.horstmann@arm.com> Fri Oct 07 14:08:42 2022 +0100
tree 8a67c675ce4aa0d07398ccfa6dccf0ce9bdfb213
parent 2788f6b6685c8c0e41e7ee57e788a07b99edfb43

Refactor macro-spanning if in asn1write.c

Signed-off-by: David Horstmann <david.horstmann@arm.com>

library/asn1write.c

diff --git a/library/asn1write.c b/library/asn1write.c
index 053dbb6..6c2a71f 100644
--- a/library/asn1write.c
+++ b/library/asn1write.c
@@ -78,9 +78,11 @@
         return( 4 );
     }
 
+    int len_valid = 1;
 #if SIZE_MAX > 0xFFFFFFFF
-    if( len <= 0xFFFFFFFF )
+    len_valid = ( len <= 0xFFFFFFFF );
 #endif
+    if( len_valid )
     {
         if( *p - start < 5 )
             return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
@@ -92,10 +94,10 @@
         *--(*p) = 0x84;
         return( 5 );
     }
-
-#if SIZE_MAX > 0xFFFFFFFF
-    return( MBEDTLS_ERR_ASN1_INVALID_LENGTH );
-#endif
+    else
+    {
+        return( MBEDTLS_ERR_ASN1_INVALID_LENGTH );
+    }
 }
 
 int mbedtls_asn1_write_tag( unsigned char **p, const unsigned char *start, unsigned char tag )