Commit 562535d1 authored by Paul Bakker's avatar Paul Bakker
Browse files

- Split current md_starts() and md_hmac_starts() functionality into separate...

 - Split current md_starts() and md_hmac_starts() functionality into separate md_init_ctx() for allocating the context and the existing starts() functions to initialize the message digest for use.
parent a885d683
......@@ -31,7 +31,8 @@
#define POLARSSL_MD_H
typedef enum {
POLARSSL_MD_MD2=0,
POLARSSL_MD_NONE=0,
POLARSSL_MD_MD2,
POLARSSL_MD_MD4,
POLARSSL_MD_MD5,
POLARSSL_MD_SHA1,
......@@ -148,6 +149,31 @@ const md_info_t *md_info_from_string( const char *md_name );
*/
const md_info_t *md_info_from_type( md_type_t md_type );
/**
* \brief Initialises and fills the message digest context structure with
* the appropriate values.
*
* \param ctx context to initialise. May not be NULL. The
* digest-specific context (ctx->md_ctx) must be NULL. It will
* be allocated, and must be freed using md_free_ctx() later.
* \param md_info message digest to use.
*
* \returns \c 0 on success, \c 1 on parameter failure, \c 2 if
* allocation of the cipher-specific context failed.
*/
int md_init_ctx( md_context_t *ctx, const md_info_t *md_info );
/**
* \brief Free the message-specific context of ctx. Freeing ctx itself
* remains the responsibility of the caller.
*
* \param ctx Free the -specific context
* \param output Generic message digest checksum result
*
* \returns 0 on success, 1 if parameter verification fails.
*/
int md_free_ctx( md_context_t *ctx );
/**
* \brief Returns the size of the message digest output.
*
......@@ -185,16 +211,13 @@ static inline const char *md_get_name ( const md_info_t *md_info )
}
/**
* \brief Generic message digest context setup.
* \brief Set-up the given context for a new message digest
*
* \param md_info message digest info
* \param ctx generic message digest context. May not be NULL. The
* digest-specific context (ctx->md_ctx) must be NULL. It will
* be allocated, and must be freed using md_free() later.
* \param ctx generic message digest context.
*
* \returns 0 on success, 1 if parameter verification fails.
*/
int md_starts( const md_info_t *md_info, md_context_t *ctx );
int md_starts( md_context_t *ctx );
/**
* \brief Generic message digest process buffer
......@@ -217,17 +240,6 @@ int md_update( md_context_t *ctx, const unsigned char *input, int ilen );
*/
int md_finish( md_context_t *ctx, unsigned char *output );
/**
* \brief Free the message-specific context of ctx. Freeing ctx itself
* remains the responsibility of the caller.
*
* \param ctx Free the -specific context
* \param output Generic message digest checksum result
*
* \returns 0 on success, 1 if parameter verification fails.
*/
int md_free_ctx( md_context_t *ctx );
/**
* \brief Output = message_digest( input buffer )
*
......@@ -256,15 +268,13 @@ int md_file( const md_info_t *md_info, const char *path, unsigned char *output )
/**
* \brief Generic HMAC context setup
*
* \param md_info message digest info
* \param ctx HMAC context to be initialized
* \param key HMAC secret key
* \param keylen length of the HMAC key
*
* \returns 0 on success, 1 if parameter verification fails.
*/
int md_hmac_starts( const md_info_t *md_info, md_context_t *ctx,
const unsigned char *key, int keylen );
int md_hmac_starts( md_context_t *ctx, const unsigned char *key, int keylen );
/**
* \brief Generic HMAC process buffer
......
......@@ -147,7 +147,7 @@ const md_info_t *md_info_from_type( md_type_t md_type )
}
}
int md_starts( const md_info_t *md_info, md_context_t *ctx )
int md_init_ctx( md_context_t *ctx, const md_info_t *md_info )
{
if( md_info == NULL )
return 1;
......@@ -165,32 +165,43 @@ int md_starts( const md_info_t *md_info, md_context_t *ctx )
return 0;
}
int md_update( md_context_t *ctx, const unsigned char *input, int ilen )
int md_free_ctx( md_context_t *ctx )
{
if( ctx == NULL || ctx->md_info == NULL )
return 1;
ctx->md_info->update_func( ctx->md_ctx, input, ilen );
ctx->md_info->ctx_free_func( ctx->md_ctx );
ctx->md_ctx = NULL;
return 0;
}
int md_finish( md_context_t *ctx, unsigned char *output )
int md_starts( md_context_t *ctx )
{
if( ctx == NULL || ctx->md_info == NULL )
return 1;
ctx->md_info->finish_func( ctx->md_ctx, output );
ctx->md_info->starts_func( ctx->md_ctx );
return 0;
}
int md_free_ctx( md_context_t *ctx )
int md_update( md_context_t *ctx, const unsigned char *input, int ilen )
{
if( ctx == NULL || ctx->md_info == NULL )
return 1;
ctx->md_info->ctx_free_func( ctx->md_ctx );
ctx->md_info->update_func( ctx->md_ctx, input, ilen );
return 0;
}
int md_finish( md_context_t *ctx, unsigned char *output )
{
if( ctx == NULL || ctx->md_info == NULL )
return 1;
ctx->md_info->finish_func( ctx->md_ctx, output );
return 0;
}
......@@ -214,21 +225,12 @@ int md_file( const md_info_t *md_info, const char *path, unsigned char *output )
return md_info->file_func( path, output );
}
int md_hmac_starts( const md_info_t *md_info, md_context_t *ctx,
const unsigned char *key, int keylen )
int md_hmac_starts( md_context_t *ctx, const unsigned char *key, int keylen )
{
if(md_info == NULL )
return 1;
if( ctx == NULL || ctx->md_ctx != NULL )
return 1;
if( ( ctx->md_ctx = md_info->ctx_alloc_func() ) == NULL )
if( ctx == NULL || ctx->md_info == NULL )
return 1;
ctx->md_info = md_info;
md_info->hmac_starts_func( ctx->md_ctx, key, keylen);
ctx->md_info->hmac_starts_func( ctx->md_ctx, key, keylen);
return 0;
}
......
......@@ -85,8 +85,9 @@ md_text_multi:text_md_name:text_src_string:hex_hash_string
strncpy( (char *) md_name, {text_md_name}, 100 );
md_info = md_info_from_string(md_name);
TEST_ASSERT( md_info != NULL );
TEST_ASSERT ( 0 == md_init_ctx( &ctx, md_info ) );
TEST_ASSERT ( 0 == md_starts( md_info, &ctx ) );
TEST_ASSERT ( 0 == md_starts( &ctx ) );
TEST_ASSERT ( ctx.md_ctx != NULL );
TEST_ASSERT ( 0 == md_update( &ctx, src_str, strlen( (char *) src_str ) ) );
TEST_ASSERT ( 0 == md_finish( &ctx, output ) );
......@@ -117,10 +118,11 @@ md_hex_multi:text_md_name:hex_src_string:hex_hash_string
strncpy( (char *) md_name, {text_md_name}, 100 );
md_info = md_info_from_string(md_name);
TEST_ASSERT( md_info != NULL );
TEST_ASSERT ( 0 == md_init_ctx( &ctx, md_info ) );
src_len = unhexify( src_str, {hex_src_string} );
TEST_ASSERT ( 0 == md_starts( md_info, &ctx ) );
TEST_ASSERT ( 0 == md_starts( &ctx ) );
TEST_ASSERT ( ctx.md_ctx != NULL );
TEST_ASSERT ( 0 == md_update( &ctx, src_str, src_len ) );
TEST_ASSERT ( 0 == md_finish( &ctx, output ) );
......@@ -184,11 +186,12 @@ md_hmac_multi:text_md_name:trunc_size:hex_key_string:hex_src_string:hex_hash_str
strncpy( (char *) md_name, {text_md_name}, 100 );
md_info = md_info_from_string( md_name );
TEST_ASSERT( md_info != NULL );
TEST_ASSERT ( 0 == md_init_ctx( &ctx, md_info ) );
key_len = unhexify( key_str, {hex_key_string} );
src_len = unhexify( src_str, {hex_src_string} );
TEST_ASSERT ( 0 == md_hmac_starts( md_info, &ctx, key_str, key_len ) );
TEST_ASSERT ( 0 == md_hmac_starts( &ctx, key_str, key_len ) );
TEST_ASSERT ( ctx.md_ctx != NULL );
TEST_ASSERT ( 0 == md_hmac_update( &ctx, src_str, src_len ) );
TEST_ASSERT ( 0 == md_hmac_finish( &ctx, output ) );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment