The Great Renaming
A simple execution of tmp/invoke-rename.pl
diff --git a/library/hmac_drbg.c b/library/hmac_drbg.c
index 159d72e..48d5b48 100644
--- a/library/hmac_drbg.c
+++ b/library/hmac_drbg.c
@@ -26,78 +26,78 @@
* References below are based on rev. 1 (January 2012).
*/
-#if !defined(POLARSSL_CONFIG_FILE)
+#if !defined(MBEDTLS_CONFIG_FILE)
#include "mbedtls/config.h"
#else
-#include POLARSSL_CONFIG_FILE
+#include MBEDTLS_CONFIG_FILE
#endif
-#if defined(POLARSSL_HMAC_DRBG_C)
+#if defined(MBEDTLS_HMAC_DRBG_C)
#include "mbedtls/hmac_drbg.h"
#include <string.h>
-#if defined(POLARSSL_FS_IO)
+#if defined(MBEDTLS_FS_IO)
#include <stdio.h>
#endif
-#if defined(POLARSSL_SELF_TEST)
-#if defined(POLARSSL_PLATFORM_C)
+#if defined(MBEDTLS_SELF_TEST)
+#if defined(MBEDTLS_PLATFORM_C)
#include "mbedtls/platform.h"
#else
#include <stdio.h>
-#define polarssl_printf printf
-#endif /* POLARSSL_SELF_TEST */
-#endif /* POLARSSL_PLATFORM_C */
+#define mbedtls_printf printf
+#endif /* MBEDTLS_SELF_TEST */
+#endif /* MBEDTLS_PLATFORM_C */
/* Implementation that should never be optimized out by the compiler */
-static void polarssl_zeroize( void *v, size_t n ) {
+static void mbedtls_zeroize( void *v, size_t n ) {
volatile unsigned char *p = v; while( n-- ) *p++ = 0;
}
/*
* HMAC_DRBG update, using optional additional data (10.1.2.2)
*/
-void hmac_drbg_update( hmac_drbg_context *ctx,
+void mbedtls_hmac_drbg_update( mbedtls_hmac_drbg_context *ctx,
const unsigned char *additional, size_t add_len )
{
- size_t md_len = md_get_size( ctx->md_ctx.md_info );
+ size_t md_len = mbedtls_md_get_size( ctx->md_ctx.md_info );
unsigned char rounds = ( additional != NULL && add_len != 0 ) ? 2 : 1;
unsigned char sep[1];
- unsigned char K[POLARSSL_MD_MAX_SIZE];
+ unsigned char K[MBEDTLS_MD_MAX_SIZE];
for( sep[0] = 0; sep[0] < rounds; sep[0]++ )
{
/* Step 1 or 4 */
- md_hmac_reset( &ctx->md_ctx );
- md_hmac_update( &ctx->md_ctx, ctx->V, md_len );
- md_hmac_update( &ctx->md_ctx, sep, 1 );
+ mbedtls_md_hmac_reset( &ctx->md_ctx );
+ mbedtls_md_hmac_update( &ctx->md_ctx, ctx->V, md_len );
+ mbedtls_md_hmac_update( &ctx->md_ctx, sep, 1 );
if( rounds == 2 )
- md_hmac_update( &ctx->md_ctx, additional, add_len );
- md_hmac_finish( &ctx->md_ctx, K );
+ mbedtls_md_hmac_update( &ctx->md_ctx, additional, add_len );
+ mbedtls_md_hmac_finish( &ctx->md_ctx, K );
/* Step 2 or 5 */
- md_hmac_starts( &ctx->md_ctx, K, md_len );
- md_hmac_update( &ctx->md_ctx, ctx->V, md_len );
- md_hmac_finish( &ctx->md_ctx, ctx->V );
+ mbedtls_md_hmac_starts( &ctx->md_ctx, K, md_len );
+ mbedtls_md_hmac_update( &ctx->md_ctx, ctx->V, md_len );
+ mbedtls_md_hmac_finish( &ctx->md_ctx, ctx->V );
}
}
/*
* Simplified HMAC_DRBG initialisation (for use with deterministic ECDSA)
*/
-int hmac_drbg_init_buf( hmac_drbg_context *ctx,
- const md_info_t * md_info,
+int mbedtls_hmac_drbg_init_buf( mbedtls_hmac_drbg_context *ctx,
+ const mbedtls_md_info_t * md_info,
const unsigned char *data, size_t data_len )
{
int ret;
- memset( ctx, 0, sizeof( hmac_drbg_context ) );
+ memset( ctx, 0, sizeof( mbedtls_hmac_drbg_context ) );
- md_init( &ctx->md_ctx );
+ mbedtls_md_init( &ctx->md_ctx );
- if( ( ret = md_setup( &ctx->md_ctx, md_info, 1 ) ) != 0 )
+ if( ( ret = mbedtls_md_setup( &ctx->md_ctx, md_info, 1 ) ) != 0 )
return( ret );
/*
@@ -105,10 +105,10 @@
* Use the V memory location, which is currently all 0, to initialize the
* MD context with an all-zero key. Then set V to its initial value.
*/
- md_hmac_starts( &ctx->md_ctx, ctx->V, md_get_size( md_info ) );
- memset( ctx->V, 0x01, md_get_size( md_info ) );
+ mbedtls_md_hmac_starts( &ctx->md_ctx, ctx->V, mbedtls_md_get_size( md_info ) );
+ memset( ctx->V, 0x01, mbedtls_md_get_size( md_info ) );
- hmac_drbg_update( ctx, data, data_len );
+ mbedtls_hmac_drbg_update( ctx, data, data_len );
return( 0 );
}
@@ -116,24 +116,24 @@
/*
* HMAC_DRBG reseeding: 10.1.2.4 (arabic) + 9.2 (Roman)
*/
-int hmac_drbg_reseed( hmac_drbg_context *ctx,
+int mbedtls_hmac_drbg_reseed( mbedtls_hmac_drbg_context *ctx,
const unsigned char *additional, size_t len )
{
- unsigned char seed[POLARSSL_HMAC_DRBG_MAX_SEED_INPUT];
+ unsigned char seed[MBEDTLS_HMAC_DRBG_MAX_SEED_INPUT];
size_t seedlen;
/* III. Check input length */
- if( len > POLARSSL_HMAC_DRBG_MAX_INPUT ||
- ctx->entropy_len + len > POLARSSL_HMAC_DRBG_MAX_SEED_INPUT )
+ if( len > MBEDTLS_HMAC_DRBG_MAX_INPUT ||
+ ctx->entropy_len + len > MBEDTLS_HMAC_DRBG_MAX_SEED_INPUT )
{
- return( POLARSSL_ERR_HMAC_DRBG_INPUT_TOO_BIG );
+ return( MBEDTLS_ERR_HMAC_DRBG_INPUT_TOO_BIG );
}
- memset( seed, 0, POLARSSL_HMAC_DRBG_MAX_SEED_INPUT );
+ memset( seed, 0, MBEDTLS_HMAC_DRBG_MAX_SEED_INPUT );
/* IV. Gather entropy_len bytes of entropy for the seed */
if( ctx->f_entropy( ctx->p_entropy, seed, ctx->entropy_len ) != 0 )
- return( POLARSSL_ERR_HMAC_DRBG_ENTROPY_SOURCE_FAILED );
+ return( MBEDTLS_ERR_HMAC_DRBG_ENTROPY_SOURCE_FAILED );
seedlen = ctx->entropy_len;
@@ -145,7 +145,7 @@
}
/* 2. Update state */
- hmac_drbg_update( ctx, seed, seedlen );
+ mbedtls_hmac_drbg_update( ctx, seed, seedlen );
/* 3. Reset reseed_counter */
ctx->reseed_counter = 1;
@@ -157,8 +157,8 @@
/*
* HMAC_DRBG initialisation (10.1.2.3 + 9.1)
*/
-int hmac_drbg_init( hmac_drbg_context *ctx,
- const md_info_t * md_info,
+int mbedtls_hmac_drbg_init( mbedtls_hmac_drbg_context *ctx,
+ const mbedtls_md_info_t * md_info,
int (*f_entropy)(void *, unsigned char *, size_t),
void *p_entropy,
const unsigned char *custom,
@@ -167,27 +167,27 @@
int ret;
size_t entropy_len, md_size;
- memset( ctx, 0, sizeof( hmac_drbg_context ) );
+ memset( ctx, 0, sizeof( mbedtls_hmac_drbg_context ) );
- md_init( &ctx->md_ctx );
+ mbedtls_md_init( &ctx->md_ctx );
- if( ( ret = md_setup( &ctx->md_ctx, md_info, 1 ) ) != 0 )
+ if( ( ret = mbedtls_md_setup( &ctx->md_ctx, md_info, 1 ) ) != 0 )
return( ret );
- md_size = md_get_size( md_info );
+ md_size = mbedtls_md_get_size( md_info );
/*
* Set initial working state.
* Use the V memory location, which is currently all 0, to initialize the
* MD context with an all-zero key. Then set V to its initial value.
*/
- md_hmac_starts( &ctx->md_ctx, ctx->V, md_size );
+ mbedtls_md_hmac_starts( &ctx->md_ctx, ctx->V, md_size );
memset( ctx->V, 0x01, md_size );
ctx->f_entropy = f_entropy;
ctx->p_entropy = p_entropy;
- ctx->reseed_interval = POLARSSL_HMAC_DRBG_RESEED_INTERVAL;
+ ctx->reseed_interval = MBEDTLS_HMAC_DRBG_RESEED_INTERVAL;
/*
* See SP800-57 5.6.1 (p. 65-66) for the security strength provided by
@@ -206,7 +206,7 @@
*/
ctx->entropy_len = entropy_len * 3 / 2;
- if( ( ret = hmac_drbg_reseed( ctx, custom, len ) ) != 0 )
+ if( ( ret = mbedtls_hmac_drbg_reseed( ctx, custom, len ) ) != 0 )
return( ret );
ctx->entropy_len = entropy_len;
@@ -217,7 +217,7 @@
/*
* Set prediction resistance
*/
-void hmac_drbg_set_prediction_resistance( hmac_drbg_context *ctx,
+void mbedtls_hmac_drbg_set_prediction_resistance( mbedtls_hmac_drbg_context *ctx,
int resistance )
{
ctx->prediction_resistance = resistance;
@@ -226,7 +226,7 @@
/*
* Set entropy length grabbed for reseeds
*/
-void hmac_drbg_set_entropy_len( hmac_drbg_context *ctx, size_t len )
+void mbedtls_hmac_drbg_set_entropy_len( mbedtls_hmac_drbg_context *ctx, size_t len )
{
ctx->entropy_len = len;
}
@@ -234,7 +234,7 @@
/*
* Set reseed interval
*/
-void hmac_drbg_set_reseed_interval( hmac_drbg_context *ctx, int interval )
+void mbedtls_hmac_drbg_set_reseed_interval( mbedtls_hmac_drbg_context *ctx, int interval )
{
ctx->reseed_interval = interval;
}
@@ -243,30 +243,30 @@
* HMAC_DRBG random function with optional additional data:
* 10.1.2.5 (arabic) + 9.3 (Roman)
*/
-int hmac_drbg_random_with_add( void *p_rng,
+int mbedtls_hmac_drbg_random_with_add( void *p_rng,
unsigned char *output, size_t out_len,
const unsigned char *additional, size_t add_len )
{
int ret;
- hmac_drbg_context *ctx = (hmac_drbg_context *) p_rng;
- size_t md_len = md_get_size( ctx->md_ctx.md_info );
+ mbedtls_hmac_drbg_context *ctx = (mbedtls_hmac_drbg_context *) p_rng;
+ size_t md_len = mbedtls_md_get_size( ctx->md_ctx.md_info );
size_t left = out_len;
unsigned char *out = output;
/* II. Check request length */
- if( out_len > POLARSSL_HMAC_DRBG_MAX_REQUEST )
- return( POLARSSL_ERR_HMAC_DRBG_REQUEST_TOO_BIG );
+ if( out_len > MBEDTLS_HMAC_DRBG_MAX_REQUEST )
+ return( MBEDTLS_ERR_HMAC_DRBG_REQUEST_TOO_BIG );
/* III. Check input length */
- if( add_len > POLARSSL_HMAC_DRBG_MAX_INPUT )
- return( POLARSSL_ERR_HMAC_DRBG_INPUT_TOO_BIG );
+ if( add_len > MBEDTLS_HMAC_DRBG_MAX_INPUT )
+ return( MBEDTLS_ERR_HMAC_DRBG_INPUT_TOO_BIG );
/* 1. (aka VII and IX) Check reseed counter and PR */
if( ctx->f_entropy != NULL && /* For no-reseeding instances */
- ( ctx->prediction_resistance == POLARSSL_HMAC_DRBG_PR_ON ||
+ ( ctx->prediction_resistance == MBEDTLS_HMAC_DRBG_PR_ON ||
ctx->reseed_counter > ctx->reseed_interval ) )
{
- if( ( ret = hmac_drbg_reseed( ctx, additional, add_len ) ) != 0 )
+ if( ( ret = mbedtls_hmac_drbg_reseed( ctx, additional, add_len ) ) != 0 )
return( ret );
add_len = 0; /* VII.4 */
@@ -274,16 +274,16 @@
/* 2. Use additional data if any */
if( additional != NULL && add_len != 0 )
- hmac_drbg_update( ctx, additional, add_len );
+ mbedtls_hmac_drbg_update( ctx, additional, add_len );
/* 3, 4, 5. Generate bytes */
while( left != 0 )
{
size_t use_len = left > md_len ? md_len : left;
- md_hmac_reset( &ctx->md_ctx );
- md_hmac_update( &ctx->md_ctx, ctx->V, md_len );
- md_hmac_finish( &ctx->md_ctx, ctx->V );
+ mbedtls_md_hmac_reset( &ctx->md_ctx );
+ mbedtls_md_hmac_update( &ctx->md_ctx, ctx->V, md_len );
+ mbedtls_md_hmac_finish( &ctx->md_ctx, ctx->V );
memcpy( out, ctx->V, use_len );
out += use_len;
@@ -291,7 +291,7 @@
}
/* 6. Update */
- hmac_drbg_update( ctx, additional, add_len );
+ mbedtls_hmac_drbg_update( ctx, additional, add_len );
/* 7. Update reseed counter */
ctx->reseed_counter++;
@@ -303,40 +303,40 @@
/*
* HMAC_DRBG random function
*/
-int hmac_drbg_random( void *p_rng, unsigned char *output, size_t out_len )
+int mbedtls_hmac_drbg_random( void *p_rng, unsigned char *output, size_t out_len )
{
- return( hmac_drbg_random_with_add( p_rng, output, out_len, NULL, 0 ) );
+ return( mbedtls_hmac_drbg_random_with_add( p_rng, output, out_len, NULL, 0 ) );
}
/*
* Free an HMAC_DRBG context
*/
-void hmac_drbg_free( hmac_drbg_context *ctx )
+void mbedtls_hmac_drbg_free( mbedtls_hmac_drbg_context *ctx )
{
if( ctx == NULL )
return;
- md_free( &ctx->md_ctx );
+ mbedtls_md_free( &ctx->md_ctx );
- polarssl_zeroize( ctx, sizeof( hmac_drbg_context ) );
+ mbedtls_zeroize( ctx, sizeof( mbedtls_hmac_drbg_context ) );
}
-#if defined(POLARSSL_FS_IO)
-int hmac_drbg_write_seed_file( hmac_drbg_context *ctx, const char *path )
+#if defined(MBEDTLS_FS_IO)
+int mbedtls_hmac_drbg_write_seed_file( mbedtls_hmac_drbg_context *ctx, const char *path )
{
int ret;
FILE *f;
- unsigned char buf[ POLARSSL_HMAC_DRBG_MAX_INPUT ];
+ unsigned char buf[ MBEDTLS_HMAC_DRBG_MAX_INPUT ];
if( ( f = fopen( path, "wb" ) ) == NULL )
- return( POLARSSL_ERR_HMAC_DRBG_FILE_IO_ERROR );
+ return( MBEDTLS_ERR_HMAC_DRBG_FILE_IO_ERROR );
- if( ( ret = hmac_drbg_random( ctx, buf, sizeof( buf ) ) ) != 0 )
+ if( ( ret = mbedtls_hmac_drbg_random( ctx, buf, sizeof( buf ) ) ) != 0 )
goto exit;
if( fwrite( buf, 1, sizeof( buf ), f ) != sizeof( buf ) )
{
- ret = POLARSSL_ERR_HMAC_DRBG_FILE_IO_ERROR;
+ ret = MBEDTLS_ERR_HMAC_DRBG_FILE_IO_ERROR;
goto exit;
}
@@ -347,49 +347,49 @@
return( ret );
}
-int hmac_drbg_update_seed_file( hmac_drbg_context *ctx, const char *path )
+int mbedtls_hmac_drbg_update_seed_file( mbedtls_hmac_drbg_context *ctx, const char *path )
{
FILE *f;
size_t n;
- unsigned char buf[ POLARSSL_HMAC_DRBG_MAX_INPUT ];
+ unsigned char buf[ MBEDTLS_HMAC_DRBG_MAX_INPUT ];
if( ( f = fopen( path, "rb" ) ) == NULL )
- return( POLARSSL_ERR_HMAC_DRBG_FILE_IO_ERROR );
+ return( MBEDTLS_ERR_HMAC_DRBG_FILE_IO_ERROR );
fseek( f, 0, SEEK_END );
n = (size_t) ftell( f );
fseek( f, 0, SEEK_SET );
- if( n > POLARSSL_HMAC_DRBG_MAX_INPUT )
+ if( n > MBEDTLS_HMAC_DRBG_MAX_INPUT )
{
fclose( f );
- return( POLARSSL_ERR_HMAC_DRBG_INPUT_TOO_BIG );
+ return( MBEDTLS_ERR_HMAC_DRBG_INPUT_TOO_BIG );
}
if( fread( buf, 1, n, f ) != n )
{
fclose( f );
- return( POLARSSL_ERR_HMAC_DRBG_FILE_IO_ERROR );
+ return( MBEDTLS_ERR_HMAC_DRBG_FILE_IO_ERROR );
}
fclose( f );
- hmac_drbg_update( ctx, buf, n );
+ mbedtls_hmac_drbg_update( ctx, buf, n );
- return( hmac_drbg_write_seed_file( ctx, path ) );
+ return( mbedtls_hmac_drbg_write_seed_file( ctx, path ) );
}
-#endif /* POLARSSL_FS_IO */
+#endif /* MBEDTLS_FS_IO */
-#if defined(POLARSSL_SELF_TEST)
+#if defined(MBEDTLS_SELF_TEST)
-#if !defined(POLARSSL_SHA1_C)
+#if !defined(MBEDTLS_SHA1_C)
/* Dummy checkup routine */
-int hmac_drbg_self_test( int verbose )
+int mbedtls_hmac_drbg_self_test( int verbose )
{
if( verbose != 0 )
- polarssl_printf( "\n" );
+ mbedtls_printf( "\n" );
return( 0 );
}
@@ -442,63 +442,63 @@
#define CHK( c ) if( (c) != 0 ) \
{ \
if( verbose != 0 ) \
- polarssl_printf( "failed\n" ); \
+ mbedtls_printf( "failed\n" ); \
return( 1 ); \
}
/*
* Checkup routine for HMAC_DRBG with SHA-1
*/
-int hmac_drbg_self_test( int verbose )
+int mbedtls_hmac_drbg_self_test( int verbose )
{
- hmac_drbg_context ctx;
+ mbedtls_hmac_drbg_context ctx;
unsigned char buf[OUTPUT_LEN];
- const md_info_t *md_info = md_info_from_type( POLARSSL_MD_SHA1 );
+ const mbedtls_md_info_t *md_info = mbedtls_md_info_from_type( MBEDTLS_MD_SHA1 );
/*
* PR = True
*/
if( verbose != 0 )
- polarssl_printf( " HMAC_DRBG (PR = True) : " );
+ mbedtls_printf( " HMAC_DRBG (PR = True) : " );
test_offset = 0;
- CHK( hmac_drbg_init( &ctx, md_info,
+ CHK( mbedtls_hmac_drbg_init( &ctx, md_info,
hmac_drbg_self_test_entropy, (void *) entropy_pr,
NULL, 0 ) );
- hmac_drbg_set_prediction_resistance( &ctx, POLARSSL_HMAC_DRBG_PR_ON );
- CHK( hmac_drbg_random( &ctx, buf, OUTPUT_LEN ) );
- CHK( hmac_drbg_random( &ctx, buf, OUTPUT_LEN ) );
+ mbedtls_hmac_drbg_set_prediction_resistance( &ctx, MBEDTLS_HMAC_DRBG_PR_ON );
+ CHK( mbedtls_hmac_drbg_random( &ctx, buf, OUTPUT_LEN ) );
+ CHK( mbedtls_hmac_drbg_random( &ctx, buf, OUTPUT_LEN ) );
CHK( memcmp( buf, result_pr, OUTPUT_LEN ) );
- hmac_drbg_free( &ctx );
+ mbedtls_hmac_drbg_free( &ctx );
if( verbose != 0 )
- polarssl_printf( "passed\n" );
+ mbedtls_printf( "passed\n" );
/*
* PR = False
*/
if( verbose != 0 )
- polarssl_printf( " HMAC_DRBG (PR = False) : " );
+ mbedtls_printf( " HMAC_DRBG (PR = False) : " );
test_offset = 0;
- CHK( hmac_drbg_init( &ctx, md_info,
+ CHK( mbedtls_hmac_drbg_init( &ctx, md_info,
hmac_drbg_self_test_entropy, (void *) entropy_nopr,
NULL, 0 ) );
- CHK( hmac_drbg_reseed( &ctx, NULL, 0 ) );
- CHK( hmac_drbg_random( &ctx, buf, OUTPUT_LEN ) );
- CHK( hmac_drbg_random( &ctx, buf, OUTPUT_LEN ) );
+ CHK( mbedtls_hmac_drbg_reseed( &ctx, NULL, 0 ) );
+ CHK( mbedtls_hmac_drbg_random( &ctx, buf, OUTPUT_LEN ) );
+ CHK( mbedtls_hmac_drbg_random( &ctx, buf, OUTPUT_LEN ) );
CHK( memcmp( buf, result_nopr, OUTPUT_LEN ) );
- hmac_drbg_free( &ctx );
+ mbedtls_hmac_drbg_free( &ctx );
if( verbose != 0 )
- polarssl_printf( "passed\n" );
+ mbedtls_printf( "passed\n" );
if( verbose != 0 )
- polarssl_printf( "\n" );
+ mbedtls_printf( "\n" );
return( 0 );
}
-#endif /* POLARSSL_SHA1_C */
-#endif /* POLARSSL_SELF_TEST */
+#endif /* MBEDTLS_SHA1_C */
+#endif /* MBEDTLS_SELF_TEST */
-#endif /* POLARSSL_HMAC_DRBG_C */
+#endif /* MBEDTLS_HMAC_DRBG_C */