Replace memset() with mbedtls_platform_memset()
Steps:
1. sed -i 's/\bmemset(\([^)]\)/mbedtls_platform_memset(\1/g' library/*.c tinycrypt/*.c include/mbedtls/*.h scripts/data_files/*.fmt
2. Manually edit library/platform_util.c to revert to memset() in the
implementations of mbedtls_platform_memset() and mbedtls_platform_memcpy()
3. egrep -n '\<memset\>' library/*.c include/mbedtls/*.h tinycrypt/*.c
The remaining occurrences are in three categories:
a. From point 2 above.
b. In comments.
c. In the initialisation of memset_func, to be changed in a future commit.
diff --git a/library/aes.c b/library/aes.c
index aff0a99..4850fab 100644
--- a/library/aes.c
+++ b/library/aes.c
@@ -519,7 +519,7 @@
{
AES_VALIDATE( ctx != NULL );
- memset( ctx, 0, sizeof( mbedtls_aes_context ) );
+ mbedtls_platform_memset( ctx, 0, sizeof( mbedtls_aes_context ) );
}
void mbedtls_aes_free( mbedtls_aes_context *ctx )
@@ -1809,7 +1809,7 @@
#endif
mbedtls_aes_context ctx;
- memset( key, 0, 32 );
+ mbedtls_platform_memset( key, 0, 32 );
mbedtls_aes_init( &ctx );
/*
@@ -1825,7 +1825,7 @@
mbedtls_printf( " AES-ECB-%3d (%s): ", keybits,
( mode == MBEDTLS_AES_DECRYPT ) ? "dec" : "enc" );
- memset( buf, 0, 16 );
+ mbedtls_platform_memset( buf, 0, 16 );
if( mode == MBEDTLS_AES_DECRYPT )
{
@@ -1887,9 +1887,9 @@
mbedtls_printf( " AES-CBC-%3d (%s): ", keybits,
( mode == MBEDTLS_AES_DECRYPT ) ? "dec" : "enc" );
- memset( iv , 0, 16 );
- memset( prv, 0, 16 );
- memset( buf, 0, 16 );
+ mbedtls_platform_memset( iv , 0, 16 );
+ mbedtls_platform_memset( prv, 0, 16 );
+ mbedtls_platform_memset( buf, 0, 16 );
if( mode == MBEDTLS_AES_DECRYPT )
{
@@ -2147,7 +2147,7 @@
mbedtls_printf( " AES-XTS-128 (%s): ",
( mode == MBEDTLS_AES_DECRYPT ) ? "dec" : "enc" );
- memset( key, 0, sizeof( key ) );
+ mbedtls_platform_memset( key, 0, sizeof( key ) );
memcpy( key, aes_test_xts_key[u], 32 );
data_unit = aes_test_xts_data_unit[u];
diff --git a/library/arc4.c b/library/arc4.c
index b8998ac..eeebbdc 100644
--- a/library/arc4.c
+++ b/library/arc4.c
@@ -50,7 +50,7 @@
void mbedtls_arc4_init( mbedtls_arc4_context *ctx )
{
- memset( ctx, 0, sizeof( mbedtls_arc4_context ) );
+ mbedtls_platform_memset( ctx, 0, sizeof( mbedtls_arc4_context ) );
}
void mbedtls_arc4_free( mbedtls_arc4_context *ctx )
diff --git a/library/aria.c b/library/aria.c
index aff66d6..90501f8 100644
--- a/library/aria.c
+++ b/library/aria.c
@@ -467,7 +467,7 @@
GET_UINT32_LE( w[0][2], key, 8 );
GET_UINT32_LE( w[0][3], key, 12 );
- memset( w[1], 0, 16 );
+ mbedtls_platform_memset( w[1], 0, 16 );
if( keybits >= 192 )
{
GET_UINT32_LE( w[1][0], key, 16 ); // 192 bit key
@@ -600,7 +600,7 @@
void mbedtls_aria_init( mbedtls_aria_context *ctx )
{
ARIA_VALIDATE( ctx != NULL );
- memset( ctx, 0, sizeof( mbedtls_aria_context ) );
+ mbedtls_platform_memset( ctx, 0, sizeof( mbedtls_aria_context ) );
}
/* Clear context */
@@ -987,7 +987,7 @@
mbedtls_printf( " ARIA-CBC-%d (enc): ", 128 + 64 * i );
mbedtls_aria_setkey_enc( &ctx, aria_test2_key, 128 + 64 * i );
memcpy( iv, aria_test2_iv, MBEDTLS_ARIA_BLOCKSIZE );
- memset( buf, 0x55, sizeof( buf ) );
+ mbedtls_platform_memset( buf, 0x55, sizeof( buf ) );
mbedtls_aria_crypt_cbc( &ctx, MBEDTLS_ARIA_ENCRYPT, 48, iv,
aria_test2_pt, buf );
if( memcmp( buf, aria_test2_cbc_ct[i], 48 ) != 0 )
@@ -998,7 +998,7 @@
mbedtls_printf( " ARIA-CBC-%d (dec): ", 128 + 64 * i );
mbedtls_aria_setkey_dec( &ctx, aria_test2_key, 128 + 64 * i );
memcpy( iv, aria_test2_iv, MBEDTLS_ARIA_BLOCKSIZE );
- memset( buf, 0xAA, sizeof( buf ) );
+ mbedtls_platform_memset( buf, 0xAA, sizeof( buf ) );
mbedtls_aria_crypt_cbc( &ctx, MBEDTLS_ARIA_DECRYPT, 48, iv,
aria_test2_cbc_ct[i], buf );
if( memcmp( buf, aria_test2_pt, 48 ) != 0 )
@@ -1017,7 +1017,7 @@
mbedtls_printf( " ARIA-CFB-%d (enc): ", 128 + 64 * i );
mbedtls_aria_setkey_enc( &ctx, aria_test2_key, 128 + 64 * i );
memcpy( iv, aria_test2_iv, MBEDTLS_ARIA_BLOCKSIZE );
- memset( buf, 0x55, sizeof( buf ) );
+ mbedtls_platform_memset( buf, 0x55, sizeof( buf ) );
j = 0;
mbedtls_aria_crypt_cfb128( &ctx, MBEDTLS_ARIA_ENCRYPT, 48, &j, iv,
aria_test2_pt, buf );
@@ -1029,7 +1029,7 @@
mbedtls_printf( " ARIA-CFB-%d (dec): ", 128 + 64 * i );
mbedtls_aria_setkey_enc( &ctx, aria_test2_key, 128 + 64 * i );
memcpy( iv, aria_test2_iv, MBEDTLS_ARIA_BLOCKSIZE );
- memset( buf, 0xAA, sizeof( buf ) );
+ mbedtls_platform_memset( buf, 0xAA, sizeof( buf ) );
j = 0;
mbedtls_aria_crypt_cfb128( &ctx, MBEDTLS_ARIA_DECRYPT, 48, &j,
iv, aria_test2_cfb_ct[i], buf );
@@ -1047,8 +1047,8 @@
if( verbose )
mbedtls_printf( " ARIA-CTR-%d (enc): ", 128 + 64 * i );
mbedtls_aria_setkey_enc( &ctx, aria_test2_key, 128 + 64 * i );
- memset( iv, 0, MBEDTLS_ARIA_BLOCKSIZE ); // IV = 0
- memset( buf, 0x55, sizeof( buf ) );
+ mbedtls_platform_memset( iv, 0, MBEDTLS_ARIA_BLOCKSIZE ); // IV = 0
+ mbedtls_platform_memset( buf, 0x55, sizeof( buf ) );
j = 0;
mbedtls_aria_crypt_ctr( &ctx, 48, &j, iv, blk,
aria_test2_pt, buf );
@@ -1059,8 +1059,8 @@
if( verbose )
mbedtls_printf( " ARIA-CTR-%d (dec): ", 128 + 64 * i );
mbedtls_aria_setkey_enc( &ctx, aria_test2_key, 128 + 64 * i );
- memset( iv, 0, MBEDTLS_ARIA_BLOCKSIZE ); // IV = 0
- memset( buf, 0xAA, sizeof( buf ) );
+ mbedtls_platform_memset( iv, 0, MBEDTLS_ARIA_BLOCKSIZE ); // IV = 0
+ mbedtls_platform_memset( buf, 0xAA, sizeof( buf ) );
j = 0;
mbedtls_aria_crypt_ctr( &ctx, 48, &j, iv, blk,
aria_test2_ctr_ct[i], buf );
diff --git a/library/asn1parse.c b/library/asn1parse.c
index aac253b..ac3943a 100644
--- a/library/asn1parse.c
+++ b/library/asn1parse.c
@@ -337,7 +337,7 @@
int tag)
{
asn1_get_sequence_of_cb_ctx_t cb_ctx = { tag, cur };
- memset( cur, 0, sizeof( mbedtls_asn1_sequence ) );
+ mbedtls_platform_memset( cur, 0, sizeof( mbedtls_asn1_sequence ) );
return( mbedtls_asn1_traverse_sequence_of(
p, end, 0xFF, tag, 0, 0,
asn1_get_sequence_of_cb, &cb_ctx ) );
@@ -391,7 +391,7 @@
int ret;
mbedtls_asn1_buf params;
- memset( ¶ms, 0, sizeof(mbedtls_asn1_buf) );
+ mbedtls_platform_memset( ¶ms, 0, sizeof(mbedtls_asn1_buf) );
if( ( ret = mbedtls_asn1_get_alg( p, end, alg, ¶ms ) ) != 0 )
return( ret );
diff --git a/library/bignum.c b/library/bignum.c
index e45426c..8659d71 100644
--- a/library/bignum.c
+++ b/library/bignum.c
@@ -217,7 +217,7 @@
}
else
{
- memset( X->p + i, 0, ( X->n - i ) * ciL );
+ mbedtls_platform_memset( X->p + i, 0, ( X->n - i ) * ciL );
}
memcpy( X->p, Y->p, i * ciL );
@@ -318,7 +318,7 @@
MPI_VALIDATE_RET( X != NULL );
MBEDTLS_MPI_CHK( mbedtls_mpi_grow( X, 1 ) );
- memset( X->p, 0, X->n * ciL );
+ mbedtls_platform_memset( X->p, 0, X->n * ciL );
X->p[0] = ( z < 0 ) ? -z : z;
X->s = ( z < 0 ) ? -1 : 1;
@@ -673,7 +673,7 @@
if( radix < 2 || radix > 16 )
return( MBEDTLS_ERR_MPI_BAD_INPUT_DATA );
- memset( s, 0, sizeof( s ) );
+ mbedtls_platform_memset( s, 0, sizeof( s ) );
if( fgets( s, sizeof( s ) - 1, fin ) == NULL )
return( MBEDTLS_ERR_MPI_FILE_IO_ERROR );
@@ -709,7 +709,7 @@
if( radix < 2 || radix > 16 )
return( MBEDTLS_ERR_MPI_BAD_INPUT_DATA );
- memset( s, 0, sizeof( s ) );
+ mbedtls_platform_memset( s, 0, sizeof( s ) );
MBEDTLS_MPI_CHK( mbedtls_mpi_write_string( X, radix, s, sizeof( s ) - 2, &n ) );
@@ -888,7 +888,7 @@
* number. */
bytes_to_copy = stored_bytes;
p = buf + buflen - stored_bytes;
- memset( buf, 0, buflen - stored_bytes );
+ mbedtls_platform_memset( buf, 0, buflen - stored_bytes );
}
else
{
@@ -1797,7 +1797,7 @@
if( T->n < N->n + 1 || T->p == NULL )
return( MBEDTLS_ERR_MPI_BAD_INPUT_DATA );
- memset( T->p, 0, T->n * ciL );
+ mbedtls_platform_memset( T->p, 0, T->n * ciL );
d = T->p;
n = N->n;
@@ -1875,7 +1875,7 @@
mpi_montg_init( &mm, N );
mbedtls_mpi_init( &RR ); mbedtls_mpi_init( &T );
mbedtls_mpi_init( &Apos );
- memset( W, 0, sizeof( W ) );
+ mbedtls_platform_memset( W, 0, sizeof( W ) );
i = mbedtls_mpi_bitlen( E );
diff --git a/library/blowfish.c b/library/blowfish.c
index cbf9238..7e1cfbd 100644
--- a/library/blowfish.c
+++ b/library/blowfish.c
@@ -160,7 +160,7 @@
void mbedtls_blowfish_init( mbedtls_blowfish_context *ctx )
{
BLOWFISH_VALIDATE( ctx != NULL );
- memset( ctx, 0, sizeof( mbedtls_blowfish_context ) );
+ mbedtls_platform_memset( ctx, 0, sizeof( mbedtls_blowfish_context ) );
}
void mbedtls_blowfish_free( mbedtls_blowfish_context *ctx )
diff --git a/library/camellia.c b/library/camellia.c
index 22262b8..9021a9a 100644
--- a/library/camellia.c
+++ b/library/camellia.c
@@ -328,7 +328,7 @@
void mbedtls_camellia_init( mbedtls_camellia_context *ctx )
{
CAMELLIA_VALIDATE( ctx != NULL );
- memset( ctx, 0, sizeof( mbedtls_camellia_context ) );
+ mbedtls_platform_memset( ctx, 0, sizeof( mbedtls_camellia_context ) );
}
void mbedtls_camellia_free( mbedtls_camellia_context *ctx )
@@ -359,8 +359,8 @@
RK = ctx->rk;
- memset( t, 0, 64 );
- memset( RK, 0, sizeof(ctx->rk) );
+ mbedtls_platform_memset( t, 0, 64 );
+ mbedtls_platform_memset( RK, 0, sizeof(ctx->rk) );
switch( keybits )
{
@@ -390,7 +390,7 @@
* Key storage in KC
* Order: KL, KR, KA, KB
*/
- memset( KC, 0, sizeof(KC) );
+ mbedtls_platform_memset( KC, 0, sizeof(KC) );
/* Store KL, KR */
for( i = 0; i < 8; i++ )
@@ -951,7 +951,7 @@
mbedtls_camellia_context ctx;
- memset( key, 0, 32 );
+ mbedtls_platform_memset( key, 0, 32 );
for( j = 0; j < 6; j++ ) {
u = j >> 1;
diff --git a/library/ccm.c b/library/ccm.c
index c6211ee..a21e3c3 100644
--- a/library/ccm.c
+++ b/library/ccm.c
@@ -66,7 +66,7 @@
void mbedtls_ccm_init( mbedtls_ccm_context *ctx )
{
CCM_VALIDATE( ctx != NULL );
- memset( ctx, 0, sizeof( mbedtls_ccm_context ) );
+ mbedtls_platform_memset( ctx, 0, sizeof( mbedtls_ccm_context ) );
}
int mbedtls_ccm_setkey( mbedtls_ccm_context *ctx,
@@ -211,7 +211,7 @@
/* Start CBC-MAC with first block */
- memset( y, 0, 16 );
+ mbedtls_platform_memset( y, 0, 16 );
UPDATE_CBC_MAC;
/*
@@ -224,7 +224,7 @@
len_left = add_len;
src = add;
- memset( b, 0, 16 );
+ mbedtls_platform_memset( b, 0, 16 );
b[0] = (unsigned char)( ( add_len >> 8 ) & 0xFF );
b[1] = (unsigned char)( ( add_len ) & 0xFF );
@@ -239,7 +239,7 @@
{
use_len = len_left > 16 ? 16 : len_left;
- memset( b, 0, 16 );
+ mbedtls_platform_memset( b, 0, 16 );
memcpy( b, src, use_len );
UPDATE_CBC_MAC;
@@ -260,7 +260,7 @@
*/
ctr[0] = q - 1;
memcpy( ctr + 1, iv, iv_len );
- memset( ctr + 1 + iv_len, 0, q );
+ mbedtls_platform_memset( ctr + 1 + iv_len, 0, q );
ctr[15] = 1;
/*
@@ -279,7 +279,7 @@
if( mode == CCM_ENCRYPT )
{
- memset( b, 0, 16 );
+ mbedtls_platform_memset( b, 0, 16 );
memcpy( b, src, use_len );
UPDATE_CBC_MAC;
}
@@ -288,7 +288,7 @@
if( mode == CCM_DECRYPT )
{
- memset( b, 0, 16 );
+ mbedtls_platform_memset( b, 0, 16 );
memcpy( b, dst, use_len );
UPDATE_CBC_MAC;
}
@@ -495,8 +495,8 @@
if( verbose != 0 )
mbedtls_printf( " CCM-AES #%u: ", (unsigned int) i + 1 );
- memset( plaintext, 0, CCM_SELFTEST_PT_MAX_LEN );
- memset( ciphertext, 0, CCM_SELFTEST_CT_MAX_LEN );
+ mbedtls_platform_memset( plaintext, 0, CCM_SELFTEST_PT_MAX_LEN );
+ mbedtls_platform_memset( ciphertext, 0, CCM_SELFTEST_CT_MAX_LEN );
memcpy( plaintext, msg, msg_len[i] );
ret = mbedtls_ccm_encrypt_and_tag( &ctx, msg_len[i],
@@ -512,7 +512,7 @@
return( 1 );
}
- memset( plaintext, 0, CCM_SELFTEST_PT_MAX_LEN );
+ mbedtls_platform_memset( plaintext, 0, CCM_SELFTEST_PT_MAX_LEN );
ret = mbedtls_ccm_auth_decrypt( &ctx, msg_len[i],
iv, iv_len[i], ad, add_len[i],
diff --git a/library/chachapoly.c b/library/chachapoly.c
index dc643dd..419fe80 100644
--- a/library/chachapoly.c
+++ b/library/chachapoly.c
@@ -68,7 +68,7 @@
if( partial_block_len == 0U )
return( 0 );
- memset( zeroes, 0, sizeof( zeroes ) );
+ mbedtls_platform_memset( zeroes, 0, sizeof( zeroes ) );
return( mbedtls_poly1305_update( &ctx->poly1305_ctx,
zeroes,
@@ -88,7 +88,7 @@
if( partial_block_len == 0U )
return( 0 );
- memset( zeroes, 0, sizeof( zeroes ) );
+ mbedtls_platform_memset( zeroes, 0, sizeof( zeroes ) );
return( mbedtls_poly1305_update( &ctx->poly1305_ctx,
zeroes,
16U - partial_block_len ) );
@@ -150,7 +150,7 @@
* Only the first 256-bits (32 bytes) of the key is used for Poly1305.
* The other 256 bits are discarded.
*/
- memset( poly1305_key, 0, sizeof( poly1305_key ) );
+ mbedtls_platform_memset( poly1305_key, 0, sizeof( poly1305_key ) );
ret = mbedtls_chacha20_update( &ctx->chacha20_ctx, sizeof( poly1305_key ),
poly1305_key, poly1305_key );
if( ret != 0 )
diff --git a/library/cipher.c b/library/cipher.c
index 5821716..47dfe24 100644
--- a/library/cipher.c
+++ b/library/cipher.c
@@ -156,7 +156,7 @@
void mbedtls_cipher_init( mbedtls_cipher_context_t *ctx )
{
CIPHER_VALIDATE( ctx != NULL );
- memset( ctx, 0, sizeof( mbedtls_cipher_context_t ) );
+ mbedtls_platform_memset( ctx, 0, sizeof( mbedtls_cipher_context_t ) );
}
void mbedtls_cipher_free( mbedtls_cipher_context_t *ctx )
@@ -185,7 +185,7 @@
if( cipher_info == NULL )
return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
- memset( ctx, 0, sizeof( mbedtls_cipher_context_t ) );
+ mbedtls_platform_memset( ctx, 0, sizeof( mbedtls_cipher_context_t ) );
if( NULL == ( ctx->cipher_ctx = cipher_info->base->ctx_alloc_func() ) )
return( MBEDTLS_ERR_CIPHER_ALLOC_FAILED );
diff --git a/library/cmac.c b/library/cmac.c
index 5d101e1..ada0535 100644
--- a/library/cmac.c
+++ b/library/cmac.c
@@ -450,7 +450,7 @@
}
else
{
- memset( zero_key, 0, MBEDTLS_AES_BLOCK_SIZE );
+ mbedtls_platform_memset( zero_key, 0, MBEDTLS_AES_BLOCK_SIZE );
ret = mbedtls_cipher_cmac( cipher_info, zero_key, 128, key,
key_length, int_key );
diff --git a/library/ctr_drbg.c b/library/ctr_drbg.c
index fb12157..e7139cd 100644
--- a/library/ctr_drbg.c
+++ b/library/ctr_drbg.c
@@ -55,7 +55,7 @@
*/
void mbedtls_ctr_drbg_init( mbedtls_ctr_drbg_context *ctx )
{
- memset( ctx, 0, sizeof( mbedtls_ctr_drbg_context ) );
+ mbedtls_platform_memset( ctx, 0, sizeof( mbedtls_ctr_drbg_context ) );
#if defined(MBEDTLS_THREADING_C)
mbedtls_mutex_init( &ctx->mutex );
@@ -89,7 +89,7 @@
int ret;
unsigned char key[MBEDTLS_CTR_DRBG_KEYSIZE];
- memset( key, 0, MBEDTLS_CTR_DRBG_KEYSIZE );
+ mbedtls_platform_memset( key, 0, MBEDTLS_CTR_DRBG_KEYSIZE );
mbedtls_aes_init( &ctx->aes_ctx );
@@ -168,7 +168,7 @@
if( data_len > MBEDTLS_CTR_DRBG_MAX_SEED_INPUT )
return( MBEDTLS_ERR_CTR_DRBG_INPUT_TOO_BIG );
- memset( buf, 0, MBEDTLS_CTR_DRBG_MAX_SEED_INPUT + MBEDTLS_CTR_DRBG_BLOCKSIZE + 16 );
+ mbedtls_platform_memset( buf, 0, MBEDTLS_CTR_DRBG_MAX_SEED_INPUT + MBEDTLS_CTR_DRBG_BLOCKSIZE + 16 );
mbedtls_aes_init( &aes_ctx );
/*
@@ -204,7 +204,7 @@
for( j = 0; j < MBEDTLS_CTR_DRBG_SEEDLEN; j += MBEDTLS_CTR_DRBG_BLOCKSIZE )
{
p = buf;
- memset( chain, 0, MBEDTLS_CTR_DRBG_BLOCKSIZE );
+ mbedtls_platform_memset( chain, 0, MBEDTLS_CTR_DRBG_BLOCKSIZE );
use_len = buf_len;
while( use_len > 0 )
@@ -284,7 +284,7 @@
int i, j;
int ret = 0;
- memset( tmp, 0, MBEDTLS_CTR_DRBG_SEEDLEN );
+ mbedtls_platform_memset( tmp, 0, MBEDTLS_CTR_DRBG_SEEDLEN );
for( j = 0; j < MBEDTLS_CTR_DRBG_SEEDLEN; j += MBEDTLS_CTR_DRBG_BLOCKSIZE )
{
@@ -387,7 +387,7 @@
len > MBEDTLS_CTR_DRBG_MAX_SEED_INPUT - ctx->entropy_len )
return( MBEDTLS_ERR_CTR_DRBG_INPUT_TOO_BIG );
- memset( seed, 0, MBEDTLS_CTR_DRBG_MAX_SEED_INPUT );
+ mbedtls_platform_memset( seed, 0, MBEDTLS_CTR_DRBG_MAX_SEED_INPUT );
/*
* Gather entropy_len bytes of entropy to seed state
@@ -464,7 +464,7 @@
if( add_len > MBEDTLS_CTR_DRBG_MAX_INPUT )
return( MBEDTLS_ERR_CTR_DRBG_INPUT_TOO_BIG );
- memset( add_input, 0, MBEDTLS_CTR_DRBG_SEEDLEN );
+ mbedtls_platform_memset( add_input, 0, MBEDTLS_CTR_DRBG_SEEDLEN );
if( ctx->reseed_counter > ctx->reseed_interval ||
ctx->prediction_resistance )
diff --git a/library/debug.c b/library/debug.c
index da4ceac..9c8c2f6 100644
--- a/library/debug.c
+++ b/library/debug.c
@@ -170,7 +170,7 @@
debug_send_line( ssl, level, file, line, str );
idx = 0;
- memset( txt, 0, sizeof( txt ) );
+ mbedtls_platform_memset( txt, 0, sizeof( txt ) );
for( i = 0; i < len; i++ )
{
if( i >= 4096 )
@@ -184,7 +184,7 @@
debug_send_line( ssl, level, file, line, str );
idx = 0;
- memset( txt, 0, sizeof( txt ) );
+ mbedtls_platform_memset( txt, 0, sizeof( txt ) );
}
idx += mbedtls_snprintf( str + idx, sizeof( str ) - idx, "%04x: ",
@@ -309,7 +309,7 @@
mbedtls_pk_debug_item items[MBEDTLS_PK_DEBUG_MAX_ITEMS];
char name[16];
- memset( items, 0, sizeof( items ) );
+ mbedtls_platform_memset( items, 0, sizeof( items ) );
if( mbedtls_pk_debug( pk, items ) != 0 )
{
diff --git a/library/des.c b/library/des.c
index 8a33d82..fca2ece 100644
--- a/library/des.c
+++ b/library/des.c
@@ -311,7 +311,7 @@
void mbedtls_des_init( mbedtls_des_context *ctx )
{
- memset( ctx, 0, sizeof( mbedtls_des_context ) );
+ mbedtls_platform_memset( ctx, 0, sizeof( mbedtls_des_context ) );
}
void mbedtls_des_free( mbedtls_des_context *ctx )
@@ -324,7 +324,7 @@
void mbedtls_des3_init( mbedtls_des3_context *ctx )
{
- memset( ctx, 0, sizeof( mbedtls_des3_context ) );
+ mbedtls_platform_memset( ctx, 0, sizeof( mbedtls_des3_context ) );
}
void mbedtls_des3_free( mbedtls_des3_context *ctx )
diff --git a/library/dhm.c b/library/dhm.c
index 8255632..0d7ee24 100644
--- a/library/dhm.c
+++ b/library/dhm.c
@@ -127,7 +127,7 @@
void mbedtls_dhm_init( mbedtls_dhm_context *ctx )
{
DHM_VALIDATE( ctx != NULL );
- memset( ctx, 0, sizeof( mbedtls_dhm_context ) );
+ mbedtls_platform_memset( ctx, 0, sizeof( mbedtls_dhm_context ) );
}
/*
diff --git a/library/ecdh.c b/library/ecdh.c
index c572687..03763ff 100644
--- a/library/ecdh.c
+++ b/library/ecdh.c
@@ -179,7 +179,7 @@
mbedtls_ecp_point_init( &ctx->Vf );
mbedtls_mpi_init( &ctx->_d );
#else
- memset( ctx, 0, sizeof( mbedtls_ecdh_context ) );
+ mbedtls_platform_memset( ctx, 0, sizeof( mbedtls_ecdh_context ) );
ctx->var = MBEDTLS_ECDH_VARIANT_NONE;
#endif
diff --git a/library/ecjpake.c b/library/ecjpake.c
index 3381c7c..cee56b4 100644
--- a/library/ecjpake.c
+++ b/library/ecjpake.c
@@ -1104,7 +1104,7 @@
TEST_ASSERT( len == sizeof( ecjpake_test_pms ) );
TEST_ASSERT( memcmp( buf, ecjpake_test_pms, len ) == 0 );
- memset( buf, 0, len ); /* Avoid interferences with next step */
+ mbedtls_platform_memset( buf, 0, len ); /* Avoid interferences with next step */
/* Client derives PMS */
TEST_ASSERT( mbedtls_ecjpake_derive_secret( &cli,
diff --git a/library/ecp.c b/library/ecp.c
index db36191..5c2e0f1 100644
--- a/library/ecp.c
+++ b/library/ecp.c
@@ -1553,7 +1553,7 @@
size_t i, j;
unsigned char c, cc, adjust;
- memset( x, 0, d+1 );
+ mbedtls_platform_memset( x, 0, d+1 );
/* First get the classical comb values (except for x_d = 0) */
for( i = 0; i < d; i++ )
diff --git a/library/ecp_curves.c b/library/ecp_curves.c
index 282481d..2d5c0b2 100644
--- a/library/ecp_curves.c
+++ b/library/ecp_curves.c
@@ -1001,7 +1001,7 @@
C.s = 1; \
C.n = (b) / 8 / sizeof( mbedtls_mpi_uint) + 1; \
C.p = Cp; \
- memset( Cp, 0, C.n * sizeof( mbedtls_mpi_uint ) ); \
+ mbedtls_platform_memset( Cp, 0, C.n * sizeof( mbedtls_mpi_uint ) ); \
\
MBEDTLS_MPI_CHK( mbedtls_mpi_grow( N, (b) * 2 / 8 / \
sizeof( mbedtls_mpi_uint ) ) ); \
@@ -1248,7 +1248,7 @@
if( M.n > P255_WIDTH + 1 )
return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
M.p = Mp;
- memset( Mp, 0, sizeof Mp );
+ mbedtls_platform_memset( Mp, 0, sizeof Mp );
memcpy( Mp, N->p + P255_WIDTH - 1, M.n * sizeof( mbedtls_mpi_uint ) );
MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &M, 255 % ( 8 * sizeof( mbedtls_mpi_uint ) ) ) );
M.n++; /* Make room for multiplication by 19 */
@@ -1306,7 +1306,7 @@
/* Shouldn't be called with N larger than 2^896! */
return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
M.p = Mp;
- memset( Mp, 0, sizeof( Mp ) );
+ mbedtls_platform_memset( Mp, 0, sizeof( Mp ) );
memcpy( Mp, N->p + P448_WIDTH, M.n * sizeof( mbedtls_mpi_uint ) );
/* N = A0 */
@@ -1374,7 +1374,7 @@
M.n = N->n - ( p_limbs - adjust );
if( M.n > p_limbs + adjust )
M.n = p_limbs + adjust;
- memset( Mp, 0, sizeof Mp );
+ mbedtls_platform_memset( Mp, 0, sizeof Mp );
memcpy( Mp, N->p + p_limbs - adjust, M.n * sizeof( mbedtls_mpi_uint ) );
if( shift != 0 )
MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &M, shift ) );
@@ -1396,7 +1396,7 @@
M.n = N->n - ( p_limbs - adjust );
if( M.n > p_limbs + adjust )
M.n = p_limbs + adjust;
- memset( Mp, 0, sizeof Mp );
+ mbedtls_platform_memset( Mp, 0, sizeof Mp );
memcpy( Mp, N->p + p_limbs - adjust, M.n * sizeof( mbedtls_mpi_uint ) );
if( shift != 0 )
MBEDTLS_MPI_CHK( mbedtls_mpi_shift_r( &M, shift ) );
diff --git a/library/entropy.c b/library/entropy.c
index f8db1a5..4e29b31 100644
--- a/library/entropy.c
+++ b/library/entropy.c
@@ -65,7 +65,7 @@
void mbedtls_entropy_init( mbedtls_entropy_context *ctx )
{
ctx->source_count = 0;
- memset( ctx->source, 0, sizeof( ctx->source ) );
+ mbedtls_platform_memset( ctx->source, 0, sizeof( ctx->source ) );
#if defined(MBEDTLS_THREADING_C)
mbedtls_mutex_init( &ctx->mutex );
@@ -370,7 +370,7 @@
}
while( ! done );
- memset( buf, 0, MBEDTLS_ENTROPY_BLOCK_SIZE );
+ mbedtls_platform_memset( buf, 0, MBEDTLS_ENTROPY_BLOCK_SIZE );
#if defined(MBEDTLS_ENTROPY_SHA512_ACCUMULATOR)
/*
@@ -453,7 +453,7 @@
return( MBEDTLS_ERR_ENTROPY_FILE_IO_ERROR );
/* Manually update the remaining stream with a separator value to diverge */
- memset( buf, 0, MBEDTLS_ENTROPY_BLOCK_SIZE );
+ mbedtls_platform_memset( buf, 0, MBEDTLS_ENTROPY_BLOCK_SIZE );
ret = mbedtls_entropy_update_manual( ctx, buf, MBEDTLS_ENTROPY_BLOCK_SIZE );
return( ret );
@@ -531,7 +531,7 @@
{
((void) data);
- memset( output, 0x2a, len );
+ mbedtls_platform_memset( output, 0x2a, len );
*olen = len;
return( 0 );
@@ -602,8 +602,8 @@
if( verbose != 0 )
mbedtls_printf( " ENTROPY_BIAS test: " );
- memset( buf0, 0x00, sizeof( buf0 ) );
- memset( buf1, 0x00, sizeof( buf1 ) );
+ mbedtls_platform_memset( buf0, 0x00, sizeof( buf0 ) );
+ mbedtls_platform_memset( buf1, 0x00, sizeof( buf1 ) );
if( ( ret = mbedtls_entropy_source_self_test_gather( buf0, sizeof( buf0 ) ) ) != 0 )
goto cleanup;
diff --git a/library/entropy_poll.c b/library/entropy_poll.c
index 4556f88..413be4a 100644
--- a/library/entropy_poll.c
+++ b/library/entropy_poll.c
@@ -106,7 +106,7 @@
/* MemSan cannot understand that the syscall writes to the buffer */
#if defined(__has_feature)
#if __has_feature(memory_sanitizer)
- memset( buf, 0, buflen );
+ mbedtls_platform_memset( buf, 0, buflen );
#endif
#endif
return( syscall( SYS_getrandom, buf, buflen, flags ) );
@@ -218,7 +218,7 @@
size_t use_len = MBEDTLS_ENTROPY_BLOCK_SIZE;
((void) data);
- memset( buf, 0, MBEDTLS_ENTROPY_BLOCK_SIZE );
+ mbedtls_platform_memset( buf, 0, MBEDTLS_ENTROPY_BLOCK_SIZE );
if( mbedtls_nv_seed_read( buf, MBEDTLS_ENTROPY_BLOCK_SIZE ) < 0 )
return( MBEDTLS_ERR_ENTROPY_SOURCE_FAILED );
diff --git a/library/error.c b/library/error.c
index f250fe4..5a813f1 100644
--- a/library/error.c
+++ b/library/error.c
@@ -218,7 +218,7 @@
if( buflen == 0 )
return;
- memset( buf, 0x00, buflen );
+ mbedtls_platform_memset( buf, 0x00, buflen );
if( ret < 0 )
ret = -ret;
diff --git a/library/gcm.c b/library/gcm.c
index 675926a..c40c5dd 100644
--- a/library/gcm.c
+++ b/library/gcm.c
@@ -92,7 +92,7 @@
void mbedtls_gcm_init( mbedtls_gcm_context *ctx )
{
GCM_VALIDATE( ctx != NULL );
- memset( ctx, 0, sizeof( mbedtls_gcm_context ) );
+ mbedtls_platform_memset( ctx, 0, sizeof( mbedtls_gcm_context ) );
}
/*
@@ -111,7 +111,7 @@
unsigned char h[16];
size_t olen = 0;
- memset( h, 0, 16 );
+ mbedtls_platform_memset( h, 0, 16 );
if( ( ret = mbedtls_cipher_update( &ctx->cipher_ctx, h, 16, h, &olen ) ) != 0 )
return( ret );
@@ -298,8 +298,8 @@
return( MBEDTLS_ERR_GCM_BAD_INPUT );
}
- memset( ctx->y, 0x00, sizeof(ctx->y) );
- memset( ctx->buf, 0x00, sizeof(ctx->buf) );
+ mbedtls_platform_memset( ctx->y, 0x00, sizeof(ctx->y) );
+ mbedtls_platform_memset( ctx->buf, 0x00, sizeof(ctx->buf) );
ctx->mode = mode;
ctx->len = 0;
@@ -312,7 +312,7 @@
}
else
{
- memset( work_buf, 0x00, 16 );
+ mbedtls_platform_memset( work_buf, 0x00, 16 );
PUT_UINT32_BE( iv_len * 8, work_buf, 12 );
p = iv;
@@ -444,7 +444,7 @@
if( orig_len || orig_add_len )
{
- memset( work_buf, 0x00, 16 );
+ mbedtls_platform_memset( work_buf, 0x00, 16 );
PUT_UINT32_BE( ( orig_add_len >> 32 ), work_buf, 0 );
PUT_UINT32_BE( ( orig_add_len ), work_buf, 4 );
diff --git a/library/havege.c b/library/havege.c
index c139e1d..d989115 100644
--- a/library/havege.c
+++ b/library/havege.c
@@ -184,7 +184,7 @@
(void)PTX;
- memset( RES, 0, sizeof( RES ) );
+ mbedtls_platform_memset( RES, 0, sizeof( RES ) );
while( n < MBEDTLS_HAVEGE_COLLECT_SIZE * 4 )
{
@@ -206,7 +206,7 @@
*/
void mbedtls_havege_init( mbedtls_havege_state *hs )
{
- memset( hs, 0, sizeof( mbedtls_havege_state ) );
+ mbedtls_platform_memset( hs, 0, sizeof( mbedtls_havege_state ) );
havege_fill( hs );
}
diff --git a/library/hmac_drbg.c b/library/hmac_drbg.c
index b51e9b1..e00a834 100644
--- a/library/hmac_drbg.c
+++ b/library/hmac_drbg.c
@@ -56,7 +56,7 @@
*/
void mbedtls_hmac_drbg_init( mbedtls_hmac_drbg_context *ctx )
{
- memset( ctx, 0, sizeof( mbedtls_hmac_drbg_context ) );
+ mbedtls_platform_memset( ctx, 0, sizeof( mbedtls_hmac_drbg_context ) );
#if defined(MBEDTLS_THREADING_C)
mbedtls_mutex_init( &ctx->mutex );
@@ -141,7 +141,7 @@
if( ( ret = mbedtls_md_hmac_starts( &ctx->md_ctx, ctx->V,
mbedtls_md_get_size( md_info ) ) ) != 0 )
return( ret );
- memset( ctx->V, 0x01, mbedtls_md_get_size( md_info ) );
+ mbedtls_platform_memset( ctx->V, 0x01, mbedtls_md_get_size( md_info ) );
if( ( ret = mbedtls_hmac_drbg_update_ret( ctx, data, data_len ) ) != 0 )
return( ret );
@@ -178,7 +178,7 @@
}
}
- memset( seed, 0, MBEDTLS_HMAC_DRBG_MAX_SEED_INPUT );
+ mbedtls_platform_memset( seed, 0, MBEDTLS_HMAC_DRBG_MAX_SEED_INPUT );
/* IV. Gather entropy_len bytes of entropy for the seed */
if( ( ret = ctx->f_entropy( ctx->p_entropy,
@@ -268,7 +268,7 @@
*/
if( ( ret = mbedtls_md_hmac_starts( &ctx->md_ctx, ctx->V, md_size ) ) != 0 )
return( ret );
- memset( ctx->V, 0x01, md_size );
+ mbedtls_platform_memset( ctx->V, 0x01, md_size );
ctx->f_entropy = f_entropy;
ctx->p_entropy = p_entropy;
diff --git a/library/md.c b/library/md.c
index 882942e..92fe3a4 100644
--- a/library/md.c
+++ b/library/md.c
@@ -387,7 +387,7 @@
void mbedtls_md_init( mbedtls_md_context_t *ctx )
{
- memset( ctx, 0, sizeof( mbedtls_md_context_t ) );
+ mbedtls_platform_memset( ctx, 0, sizeof( mbedtls_md_context_t ) );
#if defined(MBEDTLS_MD_SINGLE_HASH)
mbedtls_md_info_init( mbedtls_md_get_handle( ctx ),
@@ -563,8 +563,8 @@
opad = (unsigned char *) ctx->hmac_ctx +
mbedtls_md_info_block_size( md_info );
- memset( ipad, 0x36, mbedtls_md_info_block_size( md_info ) );
- memset( opad, 0x5C, mbedtls_md_info_block_size( md_info ) );
+ mbedtls_platform_memset( ipad, 0x36, mbedtls_md_info_block_size( md_info ) );
+ mbedtls_platform_memset( opad, 0x5C, mbedtls_md_info_block_size( md_info ) );
for( i = 0; i < keylen; i++ )
{
diff --git a/library/md2.c b/library/md2.c
index 1c0b3df..fbec008 100644
--- a/library/md2.c
+++ b/library/md2.c
@@ -81,7 +81,7 @@
void mbedtls_md2_init( mbedtls_md2_context *ctx )
{
- memset( ctx, 0, sizeof( mbedtls_md2_context ) );
+ mbedtls_platform_memset( ctx, 0, sizeof( mbedtls_md2_context ) );
}
void mbedtls_md2_free( mbedtls_md2_context *ctx )
@@ -103,9 +103,9 @@
*/
int mbedtls_md2_starts_ret( mbedtls_md2_context *ctx )
{
- memset( ctx->cksum, 0, 16 );
- memset( ctx->state, 0, 46 );
- memset( ctx->buffer, 0, 16 );
+ mbedtls_platform_memset( ctx->cksum, 0, 16 );
+ mbedtls_platform_memset( ctx->state, 0, 46 );
+ mbedtls_platform_memset( ctx->buffer, 0, 16 );
ctx->left = 0;
return( 0 );
diff --git a/library/md4.c b/library/md4.c
index 828fd42..6a45df6 100644
--- a/library/md4.c
+++ b/library/md4.c
@@ -74,7 +74,7 @@
void mbedtls_md4_init( mbedtls_md4_context *ctx )
{
- memset( ctx, 0, sizeof( mbedtls_md4_context ) );
+ mbedtls_platform_memset( ctx, 0, sizeof( mbedtls_md4_context ) );
}
void mbedtls_md4_free( mbedtls_md4_context *ctx )
diff --git a/library/md5.c b/library/md5.c
index a93da8a..762923d 100644
--- a/library/md5.c
+++ b/library/md5.c
@@ -73,7 +73,7 @@
void mbedtls_md5_init( mbedtls_md5_context *ctx )
{
- memset( ctx, 0, sizeof( mbedtls_md5_context ) );
+ mbedtls_platform_memset( ctx, 0, sizeof( mbedtls_md5_context ) );
}
void mbedtls_md5_free( mbedtls_md5_context *ctx )
@@ -332,17 +332,17 @@
if( used <= 56 )
{
/* Enough room for padding + length in current block */
- memset( ctx->buffer + used, 0, 56 - used );
+ mbedtls_platform_memset( ctx->buffer + used, 0, 56 - used );
}
else
{
/* We'll need an extra block */
- memset( ctx->buffer + used, 0, 64 - used );
+ mbedtls_platform_memset( ctx->buffer + used, 0, 64 - used );
if( ( ret = mbedtls_internal_md5_process( ctx, ctx->buffer ) ) != 0 )
return( ret );
- memset( ctx->buffer, 0, 56 );
+ mbedtls_platform_memset( ctx->buffer, 0, 56 );
}
/*
diff --git a/library/memory_buffer_alloc.c b/library/memory_buffer_alloc.c
index 51ea7c4..ca08e04 100644
--- a/library/memory_buffer_alloc.c
+++ b/library/memory_buffer_alloc.c
@@ -315,7 +315,7 @@
mbedtls_exit( 1 );
ret = (unsigned char *) cur + sizeof( memory_header );
- memset( ret, 0, original_len );
+ mbedtls_platform_memset( ret, 0, original_len );
return( ret );
}
@@ -373,7 +373,7 @@
mbedtls_exit( 1 );
ret = (unsigned char *) cur + sizeof( memory_header );
- memset( ret, 0, original_len );
+ mbedtls_platform_memset( ret, 0, original_len );
return( ret );
}
@@ -438,7 +438,7 @@
if( hdr->next != NULL )
hdr->next->prev = hdr;
- memset( old, 0, sizeof(memory_header) );
+ mbedtls_platform_memset( old, 0, sizeof(memory_header) );
}
// Regroup with block after
@@ -477,7 +477,7 @@
if( hdr->next != NULL )
hdr->next->prev = hdr;
- memset( old, 0, sizeof(memory_header) );
+ mbedtls_platform_memset( old, 0, sizeof(memory_header) );
}
// Prepend to free_list if we have not merged
@@ -572,7 +572,7 @@
void mbedtls_memory_buffer_alloc_init( unsigned char *buf, size_t len )
{
- memset( &heap, 0, sizeof( buffer_alloc_ctx ) );
+ mbedtls_platform_memset( &heap, 0, sizeof( buffer_alloc_ctx ) );
#if defined(MBEDTLS_THREADING_C)
mbedtls_mutex_init( &heap.mutex );
@@ -593,7 +593,7 @@
- (size_t)buf % MBEDTLS_MEMORY_ALIGN_MULTIPLE;
}
- memset( buf, 0, len );
+ mbedtls_platform_memset( buf, 0, len );
heap.buf = buf;
heap.len = len;
diff --git a/library/net_sockets.c b/library/net_sockets.c
index 8d6c788..58244e5 100644
--- a/library/net_sockets.c
+++ b/library/net_sockets.c
@@ -154,7 +154,7 @@
return( ret );
/* Do name resolution with both IPv6 and IPv4 */
- memset( &hints, 0, sizeof( hints ) );
+ mbedtls_platform_memset( &hints, 0, sizeof( hints ) );
hints.ai_family = AF_UNSPEC;
hints.ai_socktype = proto == MBEDTLS_NET_PROTO_UDP ? SOCK_DGRAM : SOCK_STREAM;
hints.ai_protocol = proto == MBEDTLS_NET_PROTO_UDP ? IPPROTO_UDP : IPPROTO_TCP;
@@ -201,7 +201,7 @@
return( ret );
/* Bind to IPv6 and/or IPv4, but only in the desired protocol */
- memset( &hints, 0, sizeof( hints ) );
+ mbedtls_platform_memset( &hints, 0, sizeof( hints ) );
hints.ai_family = AF_UNSPEC;
hints.ai_socktype = proto == MBEDTLS_NET_PROTO_UDP ? SOCK_DGRAM : SOCK_STREAM;
hints.ai_protocol = proto == MBEDTLS_NET_PROTO_UDP ? IPPROTO_UDP : IPPROTO_TCP;
@@ -471,8 +471,8 @@
/* Ensure that memory sanitizers consider read_fds and write_fds as
* initialized even on platforms such as Glibc/x86_64 where FD_ZERO
* is implemented in assembly. */
- memset( &read_fds, 0, sizeof( read_fds ) );
- memset( &write_fds, 0, sizeof( write_fds ) );
+ mbedtls_platform_memset( &read_fds, 0, sizeof( read_fds ) );
+ mbedtls_platform_memset( &write_fds, 0, sizeof( write_fds ) );
#endif
#endif
diff --git a/library/nist_kw.c b/library/nist_kw.c
index 317a242..4758144 100644
--- a/library/nist_kw.c
+++ b/library/nist_kw.c
@@ -107,7 +107,7 @@
*/
void mbedtls_nist_kw_init( mbedtls_nist_kw_context *ctx )
{
- memset( ctx, 0, sizeof( mbedtls_nist_kw_context ) );
+ mbedtls_platform_memset( ctx, 0, sizeof( mbedtls_nist_kw_context ) );
}
int mbedtls_nist_kw_setkey( mbedtls_nist_kw_context *ctx,
@@ -254,7 +254,7 @@
KW_SEMIBLOCK_LENGTH / 2 );
memcpy( output + KW_SEMIBLOCK_LENGTH, input, in_len );
- memset( output + KW_SEMIBLOCK_LENGTH + in_len, 0, padlen );
+ mbedtls_platform_memset( output + KW_SEMIBLOCK_LENGTH + in_len, 0, padlen );
}
semiblocks = ( ( in_len + padlen ) / KW_SEMIBLOCK_LENGTH ) + 1;
@@ -307,7 +307,7 @@
if( ret != 0)
{
- memset( output, 0, semiblocks * KW_SEMIBLOCK_LENGTH );
+ mbedtls_platform_memset( output, 0, semiblocks * KW_SEMIBLOCK_LENGTH );
}
mbedtls_platform_zeroize( inbuff, KW_SEMIBLOCK_LENGTH * 2 );
mbedtls_platform_zeroize( outbuff, KW_SEMIBLOCK_LENGTH * 2 );
@@ -373,7 +373,7 @@
cleanup:
if( ret != 0)
- memset( output, 0, ( semiblocks - 1 ) * KW_SEMIBLOCK_LENGTH );
+ mbedtls_platform_memset( output, 0, ( semiblocks - 1 ) * KW_SEMIBLOCK_LENGTH );
mbedtls_platform_zeroize( inbuff, sizeof( inbuff ) );
mbedtls_platform_zeroize( outbuff, sizeof( outbuff ) );
@@ -509,7 +509,7 @@
{
goto cleanup;
}
- memset( output + Plen, 0, padlen );
+ mbedtls_platform_memset( output + Plen, 0, padlen );
*out_len = Plen;
}
else
@@ -521,7 +521,7 @@
cleanup:
if( ret != 0 )
{
- memset( output, 0, *out_len );
+ mbedtls_platform_memset( output, 0, *out_len );
*out_len = 0;
}
diff --git a/library/pem.c b/library/pem.c
index 897c8a0..96e4718 100644
--- a/library/pem.c
+++ b/library/pem.c
@@ -48,7 +48,7 @@
#if defined(MBEDTLS_PEM_PARSE_C)
void mbedtls_pem_init( mbedtls_pem_context *ctx )
{
- memset( ctx, 0, sizeof( mbedtls_pem_context ) );
+ mbedtls_platform_memset( ctx, 0, sizeof( mbedtls_pem_context ) );
}
#if defined(MBEDTLS_MD5_C) && defined(MBEDTLS_CIPHER_MODE_CBC) && \
@@ -61,7 +61,7 @@
{
size_t i, j, k;
- memset( iv, 0, iv_len );
+ mbedtls_platform_memset( iv, 0, iv_len );
for( i = 0; i < iv_len * 2; i++, s++ )
{
diff --git a/library/pk.c b/library/pk.c
index fb563d0..a2d86e1 100644
--- a/library/pk.c
+++ b/library/pk.c
@@ -511,7 +511,7 @@
return( MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
padding_len = to_len - unpadded_len;
- memset( to, 0x00, padding_len );
+ mbedtls_platform_memset( to, 0x00, padding_len );
memcpy( to + padding_len, *from, unpadded_len );
( *from ) += unpadded_len;
@@ -941,7 +941,7 @@
if( rsa_alt_get_bitlen( prv ) != rsa_get_bitlen( pub ) )
return( MBEDTLS_ERR_RSA_KEY_CHECK_FAILED );
- memset( hash, 0x2a, sizeof( hash ) );
+ mbedtls_platform_memset( hash, 0x2a, sizeof( hash ) );
if( ( ret = rsa_alt_sign_wrap( (void *) prv, MBEDTLS_MD_NONE,
hash, sizeof( hash ),
@@ -965,7 +965,7 @@
void *ctx = mbedtls_calloc( 1, sizeof( mbedtls_rsa_alt_context ) );
if( ctx != NULL )
- memset( ctx, 0, sizeof( mbedtls_rsa_alt_context ) );
+ mbedtls_platform_memset( ctx, 0, sizeof( mbedtls_rsa_alt_context ) );
return( ctx );
}
diff --git a/library/pkcs11.c b/library/pkcs11.c
index 9ef5353..ecdfde9 100644
--- a/library/pkcs11.c
+++ b/library/pkcs11.c
@@ -43,7 +43,7 @@
void mbedtls_pkcs11_init( mbedtls_pkcs11_context *ctx )
{
- memset( ctx, 0, sizeof( mbedtls_pkcs11_context ) );
+ mbedtls_platform_memset( ctx, 0, sizeof( mbedtls_pkcs11_context ) );
}
int mbedtls_pkcs11_x509_cert_bind( mbedtls_x509_crt *cert, pkcs11h_certificate_t pkcs11_cert )
diff --git a/library/pkcs12.c b/library/pkcs12.c
index e16d0a9..85eb31e 100644
--- a/library/pkcs12.c
+++ b/library/pkcs12.c
@@ -99,8 +99,8 @@
if( pwdlen > PKCS12_MAX_PWDLEN )
return( MBEDTLS_ERR_PKCS12_BAD_INPUT_DATA );
- memset( &salt, 0, sizeof(mbedtls_asn1_buf) );
- memset( &unipwd, 0, sizeof(unipwd) );
+ mbedtls_platform_memset( &salt, 0, sizeof(mbedtls_asn1_buf) );
+ mbedtls_platform_memset( &unipwd, 0, sizeof(unipwd) );
if( ( ret = pkcs12_parse_pbe_params( pbe_params, &salt,
&iterations ) ) != 0 )
@@ -283,7 +283,7 @@
else
v = 128;
- memset( diversifier, (unsigned char) id, v );
+ mbedtls_platform_memset( diversifier, (unsigned char) id, v );
pkcs12_fill_buffer( salt_block, v, salt, saltlen );
pkcs12_fill_buffer( pwd_block, v, pwd, pwdlen );
diff --git a/library/pkcs5.c b/library/pkcs5.c
index a517778..e551547 100644
--- a/library/pkcs5.c
+++ b/library/pkcs5.c
@@ -231,7 +231,7 @@
unsigned char *out_p = output;
unsigned char counter[4];
- memset( counter, 0, 4 );
+ mbedtls_platform_memset( counter, 0, 4 );
counter[3] = 1;
#if UINT_MAX > 0xFFFFFFFF
diff --git a/library/pkparse.c b/library/pkparse.c
index 4cff8d7..cea5a7f 100644
--- a/library/pkparse.c
+++ b/library/pkparse.c
@@ -654,7 +654,7 @@
int ret;
mbedtls_asn1_buf alg_oid;
- memset( params, 0, sizeof(mbedtls_asn1_buf) );
+ mbedtls_platform_memset( params, 0, sizeof(mbedtls_asn1_buf) );
if( ( ret = mbedtls_asn1_get_alg( p, end, &alg_oid, params ) ) != 0 )
return( MBEDTLS_ERR_PK_INVALID_ALG + ret );
diff --git a/library/poly1305.c b/library/poly1305.c
index 2b56c5f..6fd9044 100644
--- a/library/poly1305.c
+++ b/library/poly1305.c
@@ -404,7 +404,7 @@
ctx->queue_len++;
/* Pad with zeroes */
- memset( &ctx->queue[ctx->queue_len],
+ mbedtls_platform_memset( &ctx->queue[ctx->queue_len],
0,
POLY1305_BLOCK_SIZE_BYTES - ctx->queue_len );
diff --git a/library/ripemd160.c b/library/ripemd160.c
index 0791ae4..3a896ae 100644
--- a/library/ripemd160.c
+++ b/library/ripemd160.c
@@ -74,7 +74,7 @@
void mbedtls_ripemd160_init( mbedtls_ripemd160_context *ctx )
{
- memset( ctx, 0, sizeof( mbedtls_ripemd160_context ) );
+ mbedtls_platform_memset( ctx, 0, sizeof( mbedtls_ripemd160_context ) );
}
void mbedtls_ripemd160_free( mbedtls_ripemd160_context *ctx )
@@ -520,7 +520,7 @@
int i, ret = 0;
unsigned char output[20];
- memset( output, 0, sizeof output );
+ mbedtls_platform_memset( output, 0, sizeof output );
for( i = 0; i < TESTS; i++ )
{
diff --git a/library/rsa.c b/library/rsa.c
index 3bfc73e..a66de52 100644
--- a/library/rsa.c
+++ b/library/rsa.c
@@ -481,7 +481,7 @@
RSA_VALIDATE( padding == MBEDTLS_RSA_PKCS_V15 ||
padding == MBEDTLS_RSA_PKCS_V21 );
- memset( ctx, 0, sizeof( mbedtls_rsa_context ) );
+ mbedtls_platform_memset( ctx, 0, sizeof( mbedtls_rsa_context ) );
mbedtls_rsa_set_padding( ctx, padding, hash_id );
@@ -1073,8 +1073,8 @@
size_t i, use_len;
int ret = 0;
- memset( mask, 0, MBEDTLS_MD_MAX_SIZE );
- memset( counter, 0, 4 );
+ mbedtls_platform_memset( mask, 0, MBEDTLS_MD_MAX_SIZE );
+ mbedtls_platform_memset( counter, 0, 4 );
hlen = mbedtls_md_get_size( mbedtls_md_get_handle( md_ctx ) );
@@ -1155,7 +1155,7 @@
if( ilen + 2 * hlen + 2 < ilen || olen < ilen + 2 * hlen + 2 )
return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
- memset( output, 0, olen );
+ mbedtls_platform_memset( output, 0, olen );
*p++ = 0;
@@ -1510,7 +1510,7 @@
* `mem_move_to_left(start, total, offset)` is functionally equivalent to
* ```
* memmove(start, start + offset, total - offset);
- * memset(start + offset, 0, total - offset);
+ * mbedtls_platform_memset(start + offset, 0, total - offset);
* ```
* but it strives to use a memory access pattern (and thus total timing)
* that does not depend on \p offset. This timing independence comes at
@@ -1815,7 +1815,7 @@
else
slen = olen - hlen - 2;
- memset( sig, 0, olen );
+ mbedtls_platform_memset( sig, 0, olen );
/* Generate salt of length slen */
if( ( ret = f_rng( p_rng, salt, slen ) ) != 0 )
@@ -1958,7 +1958,7 @@
/* Write signature header and padding */
*p++ = 0;
*p++ = MBEDTLS_RSA_SIGN;
- memset( p, 0xFF, nb_pad );
+ mbedtls_platform_memset( p, 0xFF, nb_pad );
p += nb_pad;
*p++ = 0;
@@ -2198,7 +2198,7 @@
hlen = mbedtls_md_get_size( md_info );
- memset( zeros, 0, 8 );
+ mbedtls_platform_memset( zeros, 0, 8 );
/*
* Note: EMSA-PSS verification is over the length of N - 1 bits
diff --git a/library/sha1.c b/library/sha1.c
index 355c83d..842c11e 100644
--- a/library/sha1.c
+++ b/library/sha1.c
@@ -80,7 +80,7 @@
{
SHA1_VALIDATE( ctx != NULL );
- memset( ctx, 0, sizeof( mbedtls_sha1_context ) );
+ mbedtls_platform_memset( ctx, 0, sizeof( mbedtls_sha1_context ) );
}
void mbedtls_sha1_free( mbedtls_sha1_context *ctx )
@@ -385,17 +385,17 @@
if( used <= 56 )
{
/* Enough room for padding + length in current block */
- memset( ctx->buffer + used, 0, 56 - used );
+ mbedtls_platform_memset( ctx->buffer + used, 0, 56 - used );
}
else
{
/* We'll need an extra block */
- memset( ctx->buffer + used, 0, 64 - used );
+ mbedtls_platform_memset( ctx->buffer + used, 0, 64 - used );
if( ( ret = mbedtls_internal_sha1_process( ctx, ctx->buffer ) ) != 0 )
return( ret );
- memset( ctx->buffer, 0, 56 );
+ mbedtls_platform_memset( ctx->buffer, 0, 56 );
}
/*
@@ -523,7 +523,7 @@
if( i == 2 )
{
- memset( buf, 'a', buflen = 1000 );
+ mbedtls_platform_memset( buf, 'a', buflen = 1000 );
for( j = 0; j < 1000; j++ )
{
diff --git a/library/sha256.c b/library/sha256.c
index 98965f7..10d3ff5 100644
--- a/library/sha256.c
+++ b/library/sha256.c
@@ -59,7 +59,7 @@
{
SHA256_VALIDATE( ctx != NULL );
- memset( ctx, 0, sizeof( mbedtls_sha256_context ) );
+ mbedtls_platform_memset( ctx, 0, sizeof( mbedtls_sha256_context ) );
}
void mbedtls_sha256_free( mbedtls_sha256_context *ctx )
@@ -337,17 +337,17 @@
if( used <= 56 )
{
/* Enough room for padding + length in current block */
- memset( ctx->buffer + used, 0, 56 - used );
+ mbedtls_platform_memset( ctx->buffer + used, 0, 56 - used );
}
else
{
/* We'll need an extra block */
- memset( ctx->buffer + used, 0, 64 - used );
+ mbedtls_platform_memset( ctx->buffer + used, 0, 64 - used );
if( ( ret = mbedtls_internal_sha256_process( ctx, ctx->buffer ) ) != 0 )
return( ret );
- memset( ctx->buffer, 0, 56 );
+ mbedtls_platform_memset( ctx->buffer, 0, 56 );
}
/*
@@ -527,7 +527,7 @@
if( j == 2 )
{
- memset( buf, 'a', buflen = 1000 );
+ mbedtls_platform_memset( buf, 'a', buflen = 1000 );
for( j = 0; j < 1000; j++ )
{
diff --git a/library/sha512.c b/library/sha512.c
index bdd20b2..44c087d 100644
--- a/library/sha512.c
+++ b/library/sha512.c
@@ -96,7 +96,7 @@
{
SHA512_VALIDATE( ctx != NULL );
- memset( ctx, 0, sizeof( mbedtls_sha512_context ) );
+ mbedtls_platform_memset( ctx, 0, sizeof( mbedtls_sha512_context ) );
}
void mbedtls_sha512_free( mbedtls_sha512_context *ctx )
@@ -383,17 +383,17 @@
if( used <= 112 )
{
/* Enough room for padding + length in current block */
- memset( ctx->buffer + used, 0, 112 - used );
+ mbedtls_platform_memset( ctx->buffer + used, 0, 112 - used );
}
else
{
/* We'll need an extra block */
- memset( ctx->buffer + used, 0, 128 - used );
+ mbedtls_platform_memset( ctx->buffer + used, 0, 128 - used );
if( ( ret = mbedtls_internal_sha512_process( ctx, ctx->buffer ) ) != 0 )
return( ret );
- memset( ctx->buffer, 0, 112 );
+ mbedtls_platform_memset( ctx->buffer, 0, 112 );
}
/*
@@ -585,7 +585,7 @@
if( j == 2 )
{
- memset( buf, 'a', buflen = 1000 );
+ mbedtls_platform_memset( buf, 'a', buflen = 1000 );
for( j = 0; j < 1000; j++ )
{
diff --git a/library/ssl_cache.c b/library/ssl_cache.c
index 90e2a81..fefc6d0 100644
--- a/library/ssl_cache.c
+++ b/library/ssl_cache.c
@@ -46,7 +46,7 @@
void mbedtls_ssl_cache_init( mbedtls_ssl_cache_context *cache )
{
- memset( cache, 0, sizeof( mbedtls_ssl_cache_context ) );
+ mbedtls_platform_memset( cache, 0, sizeof( mbedtls_ssl_cache_context ) );
cache->timeout = MBEDTLS_SSL_CACHE_DEFAULT_TIMEOUT;
cache->max_entries = MBEDTLS_SSL_CACHE_DEFAULT_MAX_ENTRIES;
@@ -260,7 +260,7 @@
if( cur->peer_cert.p != NULL )
{
mbedtls_free( cur->peer_cert.p );
- memset( &cur->peer_cert, 0, sizeof(mbedtls_x509_buf) );
+ mbedtls_platform_memset( &cur->peer_cert, 0, sizeof(mbedtls_x509_buf) );
}
#endif /* MBEDTLS_X509_CRT_PARSE_C && MBEDTLS_SSL_KEEP_PEER_CERTIFICATE */
diff --git a/library/ssl_srv.c b/library/ssl_srv.c
index 747b9f4..ad04934 100644
--- a/library/ssl_srv.c
+++ b/library/ssl_srv.c
@@ -1215,12 +1215,12 @@
p = buf + 6 + ciph_len;
ssl->session_negotiate->id_len = sess_len;
- memset( ssl->session_negotiate->id, 0,
+ mbedtls_platform_memset( ssl->session_negotiate->id, 0,
sizeof( ssl->session_negotiate->id ) );
memcpy( ssl->session_negotiate->id, p, ssl->session_negotiate->id_len );
p += sess_len;
- memset( ssl->handshake->randbytes, 0, 64 );
+ mbedtls_platform_memset( ssl->handshake->randbytes, 0, 64 );
memcpy( ssl->handshake->randbytes + 32 - chal_len, p, chal_len );
/*
@@ -1735,7 +1735,7 @@
MBEDTLS_SSL_DEBUG_BUF( 3, "client hello, session id", buf + 35, sess_len );
ssl->session_negotiate->id_len = sess_len;
- memset( ssl->session_negotiate->id, 0,
+ mbedtls_platform_memset( ssl->session_negotiate->id, 0,
sizeof( ssl->session_negotiate->id ) );
memcpy( ssl->session_negotiate->id, buf + 35,
ssl->session_negotiate->id_len );
@@ -2863,7 +2863,7 @@
if( ssl->handshake->new_session_ticket != 0 )
{
ssl->session_negotiate->id_len = n = 0;
- memset( ssl->session_negotiate->id, 0, 32 );
+ mbedtls_platform_memset( ssl->session_negotiate->id, 0, 32 );
}
else
#endif /* MBEDTLS_SSL_SESSION_TICKETS */
diff --git a/library/ssl_ticket.c b/library/ssl_ticket.c
index 285e736..30f04ab 100644
--- a/library/ssl_ticket.c
+++ b/library/ssl_ticket.c
@@ -45,7 +45,7 @@
*/
void mbedtls_ssl_ticket_init( mbedtls_ssl_ticket_context *ctx )
{
- memset( ctx, 0, sizeof( mbedtls_ssl_ticket_context ) );
+ mbedtls_platform_memset( ctx, 0, sizeof( mbedtls_ssl_ticket_context ) );
#if defined(MBEDTLS_THREADING_C)
mbedtls_mutex_init( &ctx->mutex );
diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 9810090..64d3335 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -615,7 +615,7 @@
*/
for( i = 0; i < dlen / 16; i++ )
{
- memset( padding, (unsigned char) ('A' + i), 1 + i );
+ mbedtls_platform_memset( padding, (unsigned char) ('A' + i), 1 + i );
if( ( ret = mbedtls_sha1_starts_ret( &sha1 ) ) != 0 )
goto exit;
@@ -942,7 +942,7 @@
sender = ( from == MBEDTLS_SSL_IS_CLIENT ) ? "CLNT"
: "SRVR";
- memset( padbuf, 0x36, 48 );
+ mbedtls_platform_memset( padbuf, 0x36, 48 );
mbedtls_md5_update_ret( &md5, (const unsigned char *) sender, 4 );
mbedtls_md5_update_ret( &md5, session->master, 48 );
@@ -954,7 +954,7 @@
mbedtls_sha1_update_ret( &sha1, padbuf, 40 );
mbedtls_sha1_finish_ret( &sha1, sha1sum );
- memset( padbuf, 0x5C, 48 );
+ mbedtls_platform_memset( padbuf, 0x5C, 48 );
mbedtls_md5_starts_ret( &md5 );
mbedtls_md5_update_ret( &md5, session->master, 48 );
@@ -1600,8 +1600,8 @@
{
MBEDTLS_SSL_DEBUG_MSG( 3, ( "Initializing zlib states" ) );
- memset( &transform->ctx_deflate, 0, sizeof( transform->ctx_deflate ) );
- memset( &transform->ctx_inflate, 0, sizeof( transform->ctx_inflate ) );
+ mbedtls_platform_memset( &transform->ctx_deflate, 0, sizeof( transform->ctx_deflate ) );
+ mbedtls_platform_memset( &transform->ctx_inflate, 0, sizeof( transform->ctx_inflate ) );
if( deflateInit( &transform->ctx_deflate,
Z_DEFAULT_COMPRESSION ) != Z_OK ||
@@ -1634,8 +1634,8 @@
mbedtls_md5_clone( &md5, &ssl->handshake->fin_md5 );
mbedtls_sha1_clone( &sha1, &ssl->handshake->fin_sha1 );
- memset( pad_1, 0x36, 48 );
- memset( pad_2, 0x5C, 48 );
+ mbedtls_platform_memset( pad_1, 0x36, 48 );
+ mbedtls_platform_memset( pad_2, 0x5C, 48 );
mbedtls_md5_update_ret( &md5, ssl->session_negotiate->master, 48 );
mbedtls_md5_update_ret( &md5, pad_1, 48 );
@@ -2116,7 +2116,7 @@
if( end < p || (size_t)( end - p ) < psk_len )
return( MBEDTLS_ERR_SSL_BAD_INPUT_DATA );
- memset( p, 0, psk_len );
+ mbedtls_platform_memset( p, 0, psk_len );
p += psk_len;
}
else
@@ -2247,7 +2247,7 @@
header[8] = (unsigned char) type;
(void)mbedtls_platform_put_uint16_be( &header[9], len );
- memset( padding, 0x36, padlen );
+ mbedtls_platform_memset( padding, 0x36, padlen );
mbedtls_md_starts( md_ctx );
mbedtls_md_update( md_ctx, secret, md_size );
mbedtls_md_update( md_ctx, padding, padlen );
@@ -2255,7 +2255,7 @@
mbedtls_md_update( md_ctx, buf, len );
mbedtls_md_finish( md_ctx, out );
- memset( padding, 0x5C, padlen );
+ mbedtls_platform_memset( padding, 0x5C, padlen );
mbedtls_md_starts( md_ctx );
mbedtls_md_update( md_ctx, secret, md_size );
mbedtls_md_update( md_ctx, padding, padlen );
@@ -2335,7 +2335,7 @@
if( remaining < pad )
return( -1 );
- memset( content + len, 0, pad );
+ mbedtls_platform_memset( content + len, 0, pad );
len += pad;
remaining -= pad;
@@ -3376,7 +3376,7 @@
const size_t max_len = rec->data_len + padlen;
const size_t min_len = ( max_len > 256 ) ? max_len - 256 : 0;
- memset( tmp, 0, sizeof( tmp ) );
+ mbedtls_platform_memset( tmp, 0, sizeof( tmp ) );
switch( mbedtls_md_get_type(
mbedtls_md_get_handle( &transform->md_ctx_dec ) ) )
@@ -4400,7 +4400,7 @@
/* Handshake hashes are computed without fragmentation,
* so set frag_offset = 0 and frag_len = hs_len for now */
- memset( ssl->out_msg + 6, 0x00, 3 );
+ mbedtls_platform_memset( ssl->out_msg + 6, 0x00, 3 );
memcpy( ssl->out_msg + 9, ssl->out_msg + 1, 3 );
}
#endif /* MBEDTLS_SSL_PROTO_DTLS */
@@ -4712,7 +4712,7 @@
mask[last_byte_idx] |= 1 << ( 8 - end_bits );
}
- memset( mask + offset / 8, 0xFF, len / 8 );
+ mbedtls_platform_memset( mask + offset / 8, 0xFF, len / 8 );
}
/*
@@ -4886,7 +4886,7 @@
}
/* Create a fresh last entry */
- memset( hs_buf, 0, sizeof( mbedtls_ssl_hs_buffer ) );
+ mbedtls_platform_memset( hs_buf, 0, sizeof( mbedtls_ssl_hs_buffer ) );
}
#endif
}
@@ -6003,7 +6003,7 @@
/* Prepare final header: copy msg_type, length and message_seq,
* then add standardised fragment_offset and fragment_length */
memcpy( hs_buf->data, ssl->in_msg, 6 );
- memset( hs_buf->data + 6, 0, 3 );
+ mbedtls_platform_memset( hs_buf->data + 6, 0, 3 );
memcpy( hs_buf->data + 9, hs_buf->data + 1, 3 );
hs_buf->is_valid = 1;
@@ -7594,7 +7594,7 @@
#endif /* MBEDTLS_SSL_PROTO_DTLS */
#if defined(MBEDTLS_SSL_PROTO_TLS)
{
- memset( ssl->in_ctr, 0, 8 );
+ mbedtls_platform_memset( ssl->in_ctr, 0, 8 );
}
#endif
@@ -7799,7 +7799,7 @@
memcpy( ssl->handshake->alt_out_ctr, ssl->cur_out_ctr, 8 );
/* Set sequence_number to zero */
- memset( ssl->cur_out_ctr + 2, 0, 6 );
+ mbedtls_platform_memset( ssl->cur_out_ctr + 2, 0, 6 );
/* Increment epoch */
for( i = 2; i > 0; i-- )
@@ -7817,7 +7817,7 @@
#endif /* MBEDTLS_SSL_PROTO_DTLS */
#if defined(MBEDTLS_SSL_PROTO_TLS)
{
- memset( ssl->cur_out_ctr, 0, 8 );
+ mbedtls_platform_memset( ssl->cur_out_ctr, 0, 8 );
}
#endif
@@ -7955,7 +7955,7 @@
static void ssl_handshake_params_init( mbedtls_ssl_handshake_params *handshake )
{
- memset( handshake, 0, sizeof( mbedtls_ssl_handshake_params ) );
+ mbedtls_platform_memset( handshake, 0, sizeof( mbedtls_ssl_handshake_params ) );
#if defined(MBEDTLS_SSL_PROTO_SSL3) || defined(MBEDTLS_SSL_PROTO_TLS1) || \
defined(MBEDTLS_SSL_PROTO_TLS1_1)
@@ -8010,7 +8010,7 @@
void mbedtls_ssl_transform_init( mbedtls_ssl_transform *transform )
{
- memset( transform, 0, sizeof(mbedtls_ssl_transform) );
+ mbedtls_platform_memset( transform, 0, sizeof(mbedtls_ssl_transform) );
mbedtls_cipher_init( &transform->cipher_ctx_enc );
mbedtls_cipher_init( &transform->cipher_ctx_dec );
@@ -8023,7 +8023,7 @@
void mbedtls_ssl_session_init( mbedtls_ssl_session *session )
{
- memset( session, 0, sizeof(mbedtls_ssl_session) );
+ mbedtls_platform_memset( session, 0, sizeof(mbedtls_ssl_session) );
}
static int ssl_handshake_init( mbedtls_ssl_context *ssl )
@@ -8226,7 +8226,7 @@
*/
void mbedtls_ssl_init( mbedtls_ssl_context *ssl )
{
- memset( ssl, 0, sizeof( mbedtls_ssl_context ) );
+ mbedtls_platform_memset( ssl, 0, sizeof( mbedtls_ssl_context ) );
}
/*
@@ -8348,8 +8348,8 @@
ssl->renego_records_seen = 0;
ssl->verify_data_len = 0;
- memset( ssl->own_verify_data, 0, MBEDTLS_SSL_VERIFY_DATA_MAX_LEN );
- memset( ssl->peer_verify_data, 0, MBEDTLS_SSL_VERIFY_DATA_MAX_LEN );
+ mbedtls_platform_memset( ssl->own_verify_data, 0, MBEDTLS_SSL_VERIFY_DATA_MAX_LEN );
+ mbedtls_platform_memset( ssl->peer_verify_data, 0, MBEDTLS_SSL_VERIFY_DATA_MAX_LEN );
#endif
ssl->secure_renegotiation = MBEDTLS_SSL_LEGACY_RENEGOTIATION;
@@ -8379,7 +8379,7 @@
ssl->split_done = 0;
#endif
- memset( ssl->cur_out_ctr, 0, sizeof( ssl->cur_out_ctr ) );
+ mbedtls_platform_memset( ssl->cur_out_ctr, 0, sizeof( ssl->cur_out_ctr ) );
ssl->transform_in = NULL;
ssl->transform_out = NULL;
@@ -8387,14 +8387,14 @@
ssl->session_in = NULL;
ssl->session_out = NULL;
- memset( ssl->out_buf, 0, MBEDTLS_SSL_OUT_BUFFER_LEN );
+ mbedtls_platform_memset( ssl->out_buf, 0, MBEDTLS_SSL_OUT_BUFFER_LEN );
#if defined(MBEDTLS_SSL_DTLS_CLIENT_PORT_REUSE) && defined(MBEDTLS_SSL_SRV_C)
if( partial == 0 )
#endif /* MBEDTLS_SSL_DTLS_CLIENT_PORT_REUSE && MBEDTLS_SSL_SRV_C */
{
ssl->in_left = 0;
- memset( ssl->in_buf, 0, MBEDTLS_SSL_IN_BUFFER_LEN );
+ mbedtls_platform_memset( ssl->in_buf, 0, MBEDTLS_SSL_IN_BUFFER_LEN );
}
#if defined(MBEDTLS_SSL_HW_RECORD_ACCEL)
@@ -10992,7 +10992,7 @@
hs->buffering.total_bytes_buffered -= hs_buf->data_len;
mbedtls_platform_zeroize( hs_buf->data, hs_buf->data_len );
mbedtls_free( hs_buf->data );
- memset( hs_buf, 0, sizeof( mbedtls_ssl_hs_buffer ) );
+ mbedtls_platform_memset( hs_buf, 0, sizeof( mbedtls_ssl_hs_buffer ) );
}
}
@@ -11773,7 +11773,7 @@
*/
void mbedtls_ssl_config_init( mbedtls_ssl_config *conf )
{
- memset( conf, 0, sizeof( mbedtls_ssl_config ) );
+ mbedtls_platform_memset( conf, 0, sizeof( mbedtls_ssl_config ) );
#if !defined(MBEDTLS_SSL_PROTO_TLS)
conf->transport = MBEDTLS_SSL_TRANSPORT_DATAGRAM;
@@ -11908,8 +11908,8 @@
#if defined(MBEDTLS_SSL_RENEGOTIATION)
conf->renego_max_records = MBEDTLS_SSL_RENEGO_MAX_RECORDS_DEFAULT;
- memset( conf->renego_period, 0x00, 2 );
- memset( conf->renego_period + 2, 0xFF, 6 );
+ mbedtls_platform_memset( conf->renego_period, 0x00, 2 );
+ mbedtls_platform_memset( conf->renego_period + 2, 0xFF, 6 );
#endif
#if defined(MBEDTLS_DHM_C) && defined(MBEDTLS_SSL_SRV_C)
diff --git a/library/x509.c b/library/x509.c
index d570f71..33dc0b9 100644
--- a/library/x509.c
+++ b/library/x509.c
@@ -650,7 +650,7 @@
mbedtls_x509_name *cur )
{
mbedtls_x509_buf_raw name_buf = { p, len };
- memset( cur, 0, sizeof( mbedtls_x509_name ) );
+ mbedtls_platform_memset( cur, 0, sizeof( mbedtls_x509_name ) );
return( mbedtls_x509_name_cmp_raw( &name_buf, &name_buf,
x509_get_name_cb,
&cur ) );
@@ -943,7 +943,7 @@
const char *short_name = NULL;
char s[MBEDTLS_X509_MAX_DN_NAME_SIZE], *p;
- memset( s, 0, sizeof( s ) );
+ mbedtls_platform_memset( s, 0, sizeof( s ) );
name = dn;
p = buf;
diff --git a/library/x509_crl.c b/library/x509_crl.c
index 3113de4..bf8ab5c 100644
--- a/library/x509_crl.c
+++ b/library/x509_crl.c
@@ -313,9 +313,9 @@
if( crl == NULL || buf == NULL )
return( MBEDTLS_ERR_X509_BAD_INPUT_DATA );
- memset( &sig_params1, 0, sizeof( mbedtls_x509_buf ) );
- memset( &sig_params2, 0, sizeof( mbedtls_x509_buf ) );
- memset( &sig_oid2, 0, sizeof( mbedtls_x509_buf ) );
+ mbedtls_platform_memset( &sig_params1, 0, sizeof( mbedtls_x509_buf ) );
+ mbedtls_platform_memset( &sig_params2, 0, sizeof( mbedtls_x509_buf ) );
+ mbedtls_platform_memset( &sig_oid2, 0, sizeof( mbedtls_x509_buf ) );
/*
* Add new CRL on the end of the chain if needed.
@@ -709,7 +709,7 @@
*/
void mbedtls_x509_crl_init( mbedtls_x509_crl *crl )
{
- memset( crl, 0, sizeof(mbedtls_x509_crl) );
+ mbedtls_platform_memset( crl, 0, sizeof(mbedtls_x509_crl) );
}
/*
diff --git a/library/x509_crt.c b/library/x509_crt.c
index 1923abf..0aebb39 100644
--- a/library/x509_crt.c
+++ b/library/x509_crt.c
@@ -292,7 +292,7 @@
static void x509_crt_cache_init( mbedtls_x509_crt_cache *cache )
{
- memset( cache, 0, sizeof( *cache ) );
+ mbedtls_platform_memset( cache, 0, sizeof( *cache ) );
#if defined(MBEDTLS_THREADING_C)
mbedtls_mutex_init( &cache->frame_mutex );
mbedtls_mutex_init( &cache->pk_mutex );
@@ -332,7 +332,7 @@
x509_crt_cache_clear_frame( cache );
x509_crt_cache_clear_pk( cache );
- memset( cache, 0, sizeof( *cache ) );
+ mbedtls_platform_memset( cache, 0, sizeof( *cache ) );
}
#if !defined(MBEDTLS_X509_REMOVE_HOSTNAME_VERIFICATION)
@@ -1182,7 +1182,7 @@
size_t inner_sig_alg_len;
unsigned char *inner_sig_alg_start;
- memset( frame, 0, sizeof( *frame ) );
+ mbedtls_platform_memset( frame, 0, sizeof( *frame ) );
/*
* Certificate ::= SEQUENCE {
@@ -1484,7 +1484,7 @@
unsigned char *p = frame->subject_alt_raw.p;
unsigned char *end = p + frame->subject_alt_raw.len;
- memset( subject_alt, 0, sizeof( *subject_alt ) );
+ mbedtls_platform_memset( subject_alt, 0, sizeof( *subject_alt ) );
if( ( frame->ext_types & MBEDTLS_X509_EXT_SUBJECT_ALT_NAME ) == 0 )
return( 0 );
@@ -1503,7 +1503,7 @@
unsigned char *p = frame->ext_key_usage_raw.p;
unsigned char *end = p + frame->ext_key_usage_raw.len;
- memset( ext_key_usage, 0, sizeof( *ext_key_usage ) );
+ mbedtls_platform_memset( ext_key_usage, 0, sizeof( *ext_key_usage ) );
if( ( frame->ext_types & MBEDTLS_X509_EXT_EXTENDED_KEY_USAGE ) == 0 )
return( 0 );
@@ -1940,8 +1940,8 @@
if( len > MAX_PATH - 3 )
return( MBEDTLS_ERR_X509_BAD_INPUT_DATA );
- memset( szDir, 0, sizeof(szDir) );
- memset( filename, 0, MAX_PATH );
+ mbedtls_platform_memset( szDir, 0, sizeof(szDir) );
+ mbedtls_platform_memset( filename, 0, MAX_PATH );
memcpy( filename, path, len );
filename[len++] = '\\';
p = filename + len;
@@ -1959,7 +1959,7 @@
len = MAX_PATH - len;
do
{
- memset( p, 0, len );
+ mbedtls_platform_memset( p, 0, len );
if( file_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY )
continue;
@@ -2271,7 +2271,7 @@
p = buf;
n = size;
- memset( &sig_info, 0, sizeof( mbedtls_x509_crt_sig_info ) );
+ mbedtls_platform_memset( &sig_info, 0, sizeof( mbedtls_x509_crt_sig_info ) );
mbedtls_pk_init( &pk );
if( NULL == crt )
@@ -3834,7 +3834,7 @@
*/
void mbedtls_x509_crt_init( mbedtls_x509_crt *crt )
{
- memset( crt, 0, sizeof(mbedtls_x509_crt) );
+ mbedtls_platform_memset( crt, 0, sizeof(mbedtls_x509_crt) );
}
/*
diff --git a/library/x509_csr.c b/library/x509_csr.c
index 9b58a86..4407742 100644
--- a/library/x509_csr.c
+++ b/library/x509_csr.c
@@ -96,7 +96,7 @@
unsigned char *p, *end;
mbedtls_x509_buf sig_params;
- memset( &sig_params, 0, sizeof( mbedtls_x509_buf ) );
+ mbedtls_platform_memset( &sig_params, 0, sizeof( mbedtls_x509_buf ) );
/*
* Check for valid input
@@ -383,7 +383,7 @@
*/
void mbedtls_x509_csr_init( mbedtls_x509_csr *csr )
{
- memset( csr, 0, sizeof(mbedtls_x509_csr) );
+ mbedtls_platform_memset( csr, 0, sizeof(mbedtls_x509_csr) );
}
/*
diff --git a/library/x509write_crt.c b/library/x509write_crt.c
index 4804d7a..40db15a 100644
--- a/library/x509write_crt.c
+++ b/library/x509write_crt.c
@@ -58,7 +58,7 @@
void mbedtls_x509write_crt_init( mbedtls_x509write_cert *ctx )
{
- memset( ctx, 0, sizeof( mbedtls_x509write_cert ) );
+ mbedtls_platform_memset( ctx, 0, sizeof( mbedtls_x509write_cert ) );
mbedtls_mpi_init( &ctx->serial );
ctx->version = MBEDTLS_X509_CRT_VERSION_3;
@@ -150,7 +150,7 @@
unsigned char *c = buf + sizeof(buf);
size_t len = 0;
- memset( buf, 0, sizeof(buf) );
+ mbedtls_platform_memset( buf, 0, sizeof(buf) );
if( is_ca && max_pathlen > 127 )
return( MBEDTLS_ERR_X509_BAD_INPUT_DATA );
@@ -181,7 +181,7 @@
unsigned char *c = buf + sizeof(buf);
size_t len = 0;
- memset( buf, 0, sizeof(buf) );
+ mbedtls_platform_memset( buf, 0, sizeof(buf) );
MBEDTLS_ASN1_CHK_ADD( len, mbedtls_pk_write_pubkey( &c, buf, ctx->subject_key ) );
ret = mbedtls_sha1_ret( buf + sizeof( buf ) - len, len,
@@ -206,7 +206,7 @@
unsigned char *c = buf + sizeof( buf );
size_t len = 0;
- memset( buf, 0, sizeof(buf) );
+ mbedtls_platform_memset( buf, 0, sizeof(buf) );
MBEDTLS_ASN1_CHK_ADD( len, mbedtls_pk_write_pubkey( &c, buf, ctx->issuer_key ) );
ret = mbedtls_sha1_ret( buf + sizeof( buf ) - len, len,
diff --git a/library/x509write_csr.c b/library/x509write_csr.c
index 6105f14..77059c1 100644
--- a/library/x509write_csr.c
+++ b/library/x509write_csr.c
@@ -57,7 +57,7 @@
void mbedtls_x509write_csr_init( mbedtls_x509write_csr *ctx )
{
- memset( ctx, 0, sizeof( mbedtls_x509write_csr ) );
+ mbedtls_platform_memset( ctx, 0, sizeof( mbedtls_x509write_csr ) );
}
void mbedtls_x509write_csr_free( mbedtls_x509write_csr *ctx )
diff --git a/library/xtea.c b/library/xtea.c
index a33707b..5cb45c9 100644
--- a/library/xtea.c
+++ b/library/xtea.c
@@ -68,7 +68,7 @@
void mbedtls_xtea_init( mbedtls_xtea_context *ctx )
{
- memset( ctx, 0, sizeof( mbedtls_xtea_context ) );
+ mbedtls_platform_memset( ctx, 0, sizeof( mbedtls_xtea_context ) );
}
void mbedtls_xtea_free( mbedtls_xtea_context *ctx )
@@ -86,7 +86,7 @@
{
int i;
- memset( ctx, 0, sizeof(mbedtls_xtea_context) );
+ mbedtls_platform_memset( ctx, 0, sizeof(mbedtls_xtea_context) );
for( i = 0; i < 4; i++ )
{