From 863b17d0cc7db3ebcd90a9aa1a9fde56d7c6ec7c Mon Sep 17 00:00:00 2001 From: David Horstmann Date: Thu, 6 Oct 2022 18:57:57 +0100 Subject: [PATCH] Refactor macro-spanning if in asn1write.c Signed-off-by: David Horstmann --- library/asn1write.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/library/asn1write.c b/library/asn1write.c index 6477e3d58c..89a937b29e 100644 --- a/library/asn1write.c +++ b/library/asn1write.c @@ -72,9 +72,11 @@ int mbedtls_asn1_write_len( unsigned char **p, unsigned char *start, size_t len 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 ); @@ -86,10 +88,10 @@ int mbedtls_asn1_write_len( unsigned char **p, unsigned char *start, size_t len *--(*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, unsigned char *start, unsigned char tag )