commit 85eeda01222e6632639b6ae30f65bd807c158950
author Pol Henarejos <pol.henarejos@cttc.es> Tue May 17 11:43:15 2022 +0200
committer Pol Henarejos <pol.henarejos@cttc.es> Fri May 20 20:07:39 2022 +0200
tree 6ece7b39b71ecef5bc10157dd05940e1d1a46009
parent 084649d189a9e25f065d420b38f6383793896e1e

olen = 0 is not allowed for SHA-3.

Sanity checks are moved to mbedtls_sha3_xxx() functions.

Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>

library/sha3.c

diff --git a/library/sha3.c b/library/sha3.c
index 4a08131..705f48c 100644
--- a/library/sha3.c
+++ b/library/sha3.c
@@ -241,12 +241,9 @@
 int mbedtls_sha3_finish( mbedtls_sha3_context *ctx,
                               uint8_t *output, size_t olen )
 {
-    if( ctx == NULL )
+    if( ctx == NULL || output == NULL )
         return( MBEDTLS_ERR_SHA3_BAD_INPUT_DATA );
 
-    if( olen == 0 )
-        return( 0 );
-
     if( ctx->olen > 0 && ctx->olen != olen )
         return( MBEDTLS_ERR_SHA3_BAD_INPUT_DATA );
 
@@ -275,14 +272,9 @@
     int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
     mbedtls_sha3_context ctx;
 
-    if( ilen != 0 && input == NULL )
-        return( MBEDTLS_ERR_SHA3_BAD_INPUT_DATA );
-
-    if( output == NULL )
-        return( MBEDTLS_ERR_SHA3_BAD_INPUT_DATA );
-
     mbedtls_sha3_init( &ctx );
 
+    /* Sanity checks are performed in every mbedtls_sha3_xxx() */
     if( ( ret = mbedtls_sha3_starts( &ctx, id ) ) != 0 )
         goto exit;