mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2025-04-16 08:42:50 +00:00
Remove NULL pointer validation in sha1.c
Signed-off-by: Tuvshinzaya Erdenekhuu <tuvshinzaya.erdenekhuu@arm.com>
This commit is contained in:
parent
6d1fc45f08
commit
6b150ad8fa
@ -41,17 +41,10 @@
|
|||||||
#endif /* MBEDTLS_PLATFORM_C */
|
#endif /* MBEDTLS_PLATFORM_C */
|
||||||
#endif /* MBEDTLS_SELF_TEST */
|
#endif /* MBEDTLS_SELF_TEST */
|
||||||
|
|
||||||
#define SHA1_VALIDATE_RET(cond) \
|
|
||||||
MBEDTLS_INTERNAL_VALIDATE_RET( cond, MBEDTLS_ERR_SHA1_BAD_INPUT_DATA )
|
|
||||||
|
|
||||||
#define SHA1_VALIDATE(cond) MBEDTLS_INTERNAL_VALIDATE( cond )
|
|
||||||
|
|
||||||
#if !defined(MBEDTLS_SHA1_ALT)
|
#if !defined(MBEDTLS_SHA1_ALT)
|
||||||
|
|
||||||
void mbedtls_sha1_init( mbedtls_sha1_context *ctx )
|
void mbedtls_sha1_init( mbedtls_sha1_context *ctx )
|
||||||
{
|
{
|
||||||
SHA1_VALIDATE( ctx != NULL );
|
|
||||||
|
|
||||||
memset( ctx, 0, sizeof( mbedtls_sha1_context ) );
|
memset( ctx, 0, sizeof( mbedtls_sha1_context ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -66,9 +59,6 @@ void mbedtls_sha1_free( mbedtls_sha1_context *ctx )
|
|||||||
void mbedtls_sha1_clone( mbedtls_sha1_context *dst,
|
void mbedtls_sha1_clone( mbedtls_sha1_context *dst,
|
||||||
const mbedtls_sha1_context *src )
|
const mbedtls_sha1_context *src )
|
||||||
{
|
{
|
||||||
SHA1_VALIDATE( dst != NULL );
|
|
||||||
SHA1_VALIDATE( src != NULL );
|
|
||||||
|
|
||||||
*dst = *src;
|
*dst = *src;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -77,8 +67,6 @@ void mbedtls_sha1_clone( mbedtls_sha1_context *dst,
|
|||||||
*/
|
*/
|
||||||
int mbedtls_sha1_starts( mbedtls_sha1_context *ctx )
|
int mbedtls_sha1_starts( mbedtls_sha1_context *ctx )
|
||||||
{
|
{
|
||||||
SHA1_VALIDATE_RET( ctx != NULL );
|
|
||||||
|
|
||||||
ctx->total[0] = 0;
|
ctx->total[0] = 0;
|
||||||
ctx->total[1] = 0;
|
ctx->total[1] = 0;
|
||||||
|
|
||||||
@ -100,9 +88,6 @@ int mbedtls_internal_sha1_process( mbedtls_sha1_context *ctx,
|
|||||||
uint32_t temp, W[16], A, B, C, D, E;
|
uint32_t temp, W[16], A, B, C, D, E;
|
||||||
} local;
|
} local;
|
||||||
|
|
||||||
SHA1_VALIDATE_RET( ctx != NULL );
|
|
||||||
SHA1_VALIDATE_RET( (const unsigned char *)data != NULL );
|
|
||||||
|
|
||||||
local.W[ 0] = MBEDTLS_GET_UINT32_BE( data, 0 );
|
local.W[ 0] = MBEDTLS_GET_UINT32_BE( data, 0 );
|
||||||
local.W[ 1] = MBEDTLS_GET_UINT32_BE( data, 4 );
|
local.W[ 1] = MBEDTLS_GET_UINT32_BE( data, 4 );
|
||||||
local.W[ 2] = MBEDTLS_GET_UINT32_BE( data, 8 );
|
local.W[ 2] = MBEDTLS_GET_UINT32_BE( data, 8 );
|
||||||
@ -277,9 +262,6 @@ int mbedtls_sha1_update( mbedtls_sha1_context *ctx,
|
|||||||
size_t fill;
|
size_t fill;
|
||||||
uint32_t left;
|
uint32_t left;
|
||||||
|
|
||||||
SHA1_VALIDATE_RET( ctx != NULL );
|
|
||||||
SHA1_VALIDATE_RET( ilen == 0 || input != NULL );
|
|
||||||
|
|
||||||
if( ilen == 0 )
|
if( ilen == 0 )
|
||||||
return( 0 );
|
return( 0 );
|
||||||
|
|
||||||
@ -329,9 +311,6 @@ int mbedtls_sha1_finish( mbedtls_sha1_context *ctx,
|
|||||||
uint32_t used;
|
uint32_t used;
|
||||||
uint32_t high, low;
|
uint32_t high, low;
|
||||||
|
|
||||||
SHA1_VALIDATE_RET( ctx != NULL );
|
|
||||||
SHA1_VALIDATE_RET( (unsigned char *)output != NULL );
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Add padding: 0x80 then 0x00 until 8 bytes remain for the length
|
* Add padding: 0x80 then 0x00 until 8 bytes remain for the length
|
||||||
*/
|
*/
|
||||||
@ -392,9 +371,6 @@ int mbedtls_sha1( const unsigned char *input,
|
|||||||
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
|
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
|
||||||
mbedtls_sha1_context ctx;
|
mbedtls_sha1_context ctx;
|
||||||
|
|
||||||
SHA1_VALIDATE_RET( ilen == 0 || input != NULL );
|
|
||||||
SHA1_VALIDATE_RET( (unsigned char *)output != NULL );
|
|
||||||
|
|
||||||
mbedtls_sha1_init( &ctx );
|
mbedtls_sha1_init( &ctx );
|
||||||
|
|
||||||
if( ( ret = mbedtls_sha1_starts( &ctx ) ) != 0 )
|
if( ( ret = mbedtls_sha1_starts( &ctx ) ) != 0 )
|
||||||
|
Loading…
x
Reference in New Issue
Block a user