commit b3906d8829a44b850bd8b908f03b546d6a65aa6a
author Hanno Becker <hanno.becker@arm.com> Tue Dec 18 11:35:00 2018 +0000
committer Hanno Becker <hanno.becker@arm.com> Tue Dec 18 11:37:28 2018 +0000
tree 8c1f4cca6ccb37a9f6f61f380296d703543cfad3
parent 0e24473b943792706a4ac669ac16d6444615c2a6

Minor fixes to implementation of SHA1 parameter validation

library/sha1.c

diff --git a/library/sha1.c b/library/sha1.c
index e9521e3..0eaedcf 100644
--- a/library/sha1.c
+++ b/library/sha1.c
@@ -72,9 +72,9 @@
 #endif
 
 #define MBEDTLS_SHA1_VALIDATE_RET(cond)                             \
-    MBEDTLS_VALIDATE_RET( MBEDTLS_ERR_SHA1_BAD_INPUT_DATA, cond )
+    MBEDTLS_INTERNAL_VALIDATE_RET( cond, MBEDTLS_ERR_SHA1_BAD_INPUT_DATA )
 
-#define MBEDTLS_SHA1_VALIDATE(cond)                 MBEDTLS_VALIDATE( cond )
+#define MBEDTLS_SHA1_VALIDATE(cond)  MBEDTLS_INTERNAL_VALIDATE( cond )
 
 void mbedtls_sha1_init( mbedtls_sha1_context *ctx )
 {
@@ -309,12 +309,12 @@
     size_t fill;
     uint32_t left;
 
+    MBEDTLS_SHA1_VALIDATE_RET( ctx != NULL );
+    MBEDTLS_SHA1_VALIDATE_RET( ilen == 0 || input != NULL );
+
     if( ilen == 0 )
         return( 0 );
 
-    MBEDTLS_SHA1_VALIDATE_RET( ctx != NULL );
-    MBEDTLS_SHA1_VALIDATE_RET( input != NULL );
-
     left = ctx->total[0] & 0x3F;
     fill = 64 - left;