Rename md process functions with _internal_

This commit is contained in:
Andres Amaya Garcia 2017-06-28 10:36:39 +01:00
parent 614c689e05
commit cccfe08530
14 changed files with 54 additions and 54 deletions

View file

@ -119,7 +119,7 @@ int mbedtls_md2_finish_ext( mbedtls_md2_context *ctx,
* *
* \return 0 if successful * \return 0 if successful
*/ */
int mbedtls_md2_process_ext( mbedtls_md2_context *ctx ); int mbedtls_internal_md2_process( mbedtls_md2_context *ctx );
#if !defined(MBEDTLS_DEPRECATED_REMOVED) #if !defined(MBEDTLS_DEPRECATED_REMOVED)
#if defined(MBEDTLS_DEPRECATED_WARNING) #if defined(MBEDTLS_DEPRECATED_WARNING)
@ -175,14 +175,14 @@ MBEDTLS_DEPRECATED static inline void mbedtls_md2_finish(
/** /**
* \brief MD2 process data block (internal use only) * \brief MD2 process data block (internal use only)
* *
* \deprecated Superseded by mbedtls_md2_process_ext() in 2.5.0 * \deprecated Superseded by mbedtls_internal_md2_process() in 2.5.0
* *
* \param ctx MD2 context * \param ctx MD2 context
*/ */
MBEDTLS_DEPRECATED static inline void mbedtls_md2_process( MBEDTLS_DEPRECATED static inline void mbedtls_md2_process(
mbedtls_md2_context *ctx ) mbedtls_md2_context *ctx )
{ {
mbedtls_md2_process_ext( ctx ); mbedtls_internal_md2_process( ctx );
} }
#undef MBEDTLS_DEPRECATED #undef MBEDTLS_DEPRECATED

View file

@ -120,7 +120,7 @@ int mbedtls_md4_finish_ext( mbedtls_md4_context *ctx,
* *
* \return 0 if successful * \return 0 if successful
*/ */
int mbedtls_md4_process_ext( mbedtls_md4_context *ctx, int mbedtls_internal_md4_process( mbedtls_md4_context *ctx,
const unsigned char data[64] ); const unsigned char data[64] );
#if !defined(MBEDTLS_DEPRECATED_REMOVED) #if !defined(MBEDTLS_DEPRECATED_REMOVED)
@ -177,7 +177,7 @@ MBEDTLS_DEPRECATED static inline void mbedtls_md4_finish(
/** /**
* \brief MD4 process data block (internal use only) * \brief MD4 process data block (internal use only)
* *
* \deprecated Superseded by mbedtls_md4_process_ext() in 2.5.0 * \deprecated Superseded by mbedtls_internal_md4_process() in 2.5.0
* *
* \param ctx MD4 context * \param ctx MD4 context
* \param data buffer holding one block of data * \param data buffer holding one block of data
@ -186,7 +186,7 @@ MBEDTLS_DEPRECATED static inline void mbedtls_md4_process(
mbedtls_md4_context *ctx, mbedtls_md4_context *ctx,
const unsigned char data[64] ) const unsigned char data[64] )
{ {
mbedtls_md4_process_ext( ctx, data ); mbedtls_internal_md4_process( ctx, data );
} }
#undef MBEDTLS_DEPRECATED #undef MBEDTLS_DEPRECATED

View file

@ -115,7 +115,7 @@ int mbedtls_md5_finish_ext( mbedtls_md5_context *ctx,
* *
* \return 0 if successful * \return 0 if successful
*/ */
int mbedtls_md5_process_ext( mbedtls_md5_context *ctx, int mbedtls_internal_md5_process( mbedtls_md5_context *ctx,
const unsigned char data[64] ); const unsigned char data[64] );
#if !defined(MBEDTLS_DEPRECATED_REMOVED) #if !defined(MBEDTLS_DEPRECATED_REMOVED)
@ -172,7 +172,7 @@ MBEDTLS_DEPRECATED static inline void mbedtls_md5_finish(
/** /**
* \brief MD5 process data block (internal use only) * \brief MD5 process data block (internal use only)
* *
* \deprecated Superseded by mbedtls_md5_process_ext() in 2.5.0 * \deprecated Superseded by mbedtls_internal_md5_process() in 2.5.0
* *
* \param ctx MD5 context * \param ctx MD5 context
* \param data buffer holding one block of data * \param data buffer holding one block of data
@ -181,7 +181,7 @@ MBEDTLS_DEPRECATED static inline void mbedtls_md5_process(
mbedtls_md5_context *ctx, mbedtls_md5_context *ctx,
const unsigned char data[64] ) const unsigned char data[64] )
{ {
mbedtls_md5_process_ext( ctx, data ); mbedtls_internal_md5_process( ctx, data );
} }
#undef MBEDTLS_DEPRECATED #undef MBEDTLS_DEPRECATED

View file

@ -120,7 +120,7 @@ int mbedtls_ripemd160_finish_ext( mbedtls_ripemd160_context *ctx,
* *
* \return 0 if successful * \return 0 if successful
*/ */
int mbedtls_ripemd160_process_ext( mbedtls_ripemd160_context *ctx, int mbedtls_internal_ripemd160_process( mbedtls_ripemd160_context *ctx,
const unsigned char data[64] ); const unsigned char data[64] );
#if !defined(MBEDTLS_DEPRECATED_REMOVED) #if !defined(MBEDTLS_DEPRECATED_REMOVED)
@ -177,7 +177,7 @@ MBEDTLS_DEPRECATED static inline void mbedtls_ripemd160_finish(
/** /**
* \brief RIPEMD-160 process data block (internal use only) * \brief RIPEMD-160 process data block (internal use only)
* *
* \deprecated Superseded by mbedtls_ripemd160_process_ext() in 2.5.0 * \deprecated Superseded by mbedtls_internal_ripemd160_process() in 2.5.0
* *
* \param ctx RIPEMD-160 context * \param ctx RIPEMD-160 context
* \param data buffer holding one block of data * \param data buffer holding one block of data
@ -186,7 +186,7 @@ MBEDTLS_DEPRECATED static inline void mbedtls_ripemd160_process(
mbedtls_ripemd160_context *ctx, mbedtls_ripemd160_context *ctx,
const unsigned char data[64] ) const unsigned char data[64] )
{ {
mbedtls_ripemd160_process_ext( ctx, data ); mbedtls_internal_ripemd160_process( ctx, data );
} }
#undef MBEDTLS_DEPRECATED #undef MBEDTLS_DEPRECATED

View file

@ -120,7 +120,7 @@ int mbedtls_sha1_finish_ext( mbedtls_sha1_context *ctx,
* *
* \return 0 if successful * \return 0 if successful
*/ */
int mbedtls_sha1_process_ext( mbedtls_sha1_context *ctx, int mbedtls_internal_sha1_process( mbedtls_sha1_context *ctx,
const unsigned char data[64] ); const unsigned char data[64] );
#if !defined(MBEDTLS_DEPRECATED_REMOVED) #if !defined(MBEDTLS_DEPRECATED_REMOVED)
@ -177,7 +177,7 @@ MBEDTLS_DEPRECATED static inline void mbedtls_sha1_finish(
/** /**
* \brief SHA-1 process data block (internal use only) * \brief SHA-1 process data block (internal use only)
* *
* \deprecated Superseded by mbedtls_sha1_process_ext() in 2.5.0 * \deprecated Superseded by mbedtls_internal_sha1_process() in 2.5.0
* *
* \param ctx SHA-1 context * \param ctx SHA-1 context
* \param data buffer holding one block of data * \param data buffer holding one block of data
@ -186,7 +186,7 @@ MBEDTLS_DEPRECATED static inline void mbedtls_sha1_process(
mbedtls_sha1_context *ctx, mbedtls_sha1_context *ctx,
const unsigned char data[64] ) const unsigned char data[64] )
{ {
mbedtls_sha1_process_ext( ctx, data ); mbedtls_internal_sha1_process( ctx, data );
} }
#undef MBEDTLS_DEPRECATED #undef MBEDTLS_DEPRECATED

View file

@ -122,7 +122,7 @@ int mbedtls_sha256_finish_ext( mbedtls_sha256_context *ctx,
* *
* \return 0 if successful * \return 0 if successful
*/ */
int mbedtls_sha256_process_ext( mbedtls_sha256_context *ctx, int mbedtls_internal_sha256_process( mbedtls_sha256_context *ctx,
const unsigned char data[64] ); const unsigned char data[64] );
#if !defined(MBEDTLS_DEPRECATED_REMOVED) #if !defined(MBEDTLS_DEPRECATED_REMOVED)
@ -181,7 +181,7 @@ MBEDTLS_DEPRECATED static inline void mbedtls_sha256_finish(
/** /**
* \brief SHA-256 process data block (internal use only) * \brief SHA-256 process data block (internal use only)
* *
* \deprecated Superseded by mbedtls_sha256_process_ext() in 2.5.0 * \deprecated Superseded by mbedtls_internal_sha256_process() in 2.5.0
* *
* \param ctx SHA-256 context * \param ctx SHA-256 context
* \param data buffer holding one block of data * \param data buffer holding one block of data
@ -190,7 +190,7 @@ MBEDTLS_DEPRECATED static inline void mbedtls_sha256_process(
mbedtls_sha256_context *ctx, mbedtls_sha256_context *ctx,
const unsigned char data[64] ) const unsigned char data[64] )
{ {
mbedtls_sha256_process_ext( ctx, data ); mbedtls_internal_sha256_process( ctx, data );
} }
#undef MBEDTLS_DEPRECATED #undef MBEDTLS_DEPRECATED

View file

@ -122,7 +122,7 @@ int mbedtls_sha512_finish_ext( mbedtls_sha512_context *ctx,
* *
* \return 0 if successful * \return 0 if successful
*/ */
int mbedtls_sha512_process_ext( mbedtls_sha512_context *ctx, int mbedtls_internal_sha512_process( mbedtls_sha512_context *ctx,
const unsigned char data[128] ); const unsigned char data[128] );
#if !defined(MBEDTLS_DEPRECATED_REMOVED) #if !defined(MBEDTLS_DEPRECATED_REMOVED)
@ -181,7 +181,7 @@ MBEDTLS_DEPRECATED static inline void mbedtls_sha512_finish(
/** /**
* \brief SHA-512 process data block (internal use only) * \brief SHA-512 process data block (internal use only)
* *
* \deprecated Superseded by mbedtls_sha512_process_ext() in 2.5.0 * \deprecated Superseded by mbedtls_internal_sha512_process() in 2.5.0
* *
* \param ctx SHA-512 context * \param ctx SHA-512 context
* \param data buffer holding one block of data * \param data buffer holding one block of data
@ -190,7 +190,7 @@ MBEDTLS_DEPRECATED static inline void mbedtls_sha512_process(
mbedtls_sha512_context *ctx, mbedtls_sha512_context *ctx,
const unsigned char data[128] ) const unsigned char data[128] )
{ {
mbedtls_sha512_process_ext( ctx, data ); mbedtls_internal_sha512_process( ctx, data );
} }
#undef MBEDTLS_DEPRECATED #undef MBEDTLS_DEPRECATED

View file

@ -116,7 +116,7 @@ int mbedtls_md2_starts_ext( mbedtls_md2_context *ctx )
} }
#if !defined(MBEDTLS_MD2_PROCESS_ALT) #if !defined(MBEDTLS_MD2_PROCESS_ALT)
int mbedtls_md2_process_ext( mbedtls_md2_context *ctx ) int mbedtls_internal_md2_process( mbedtls_md2_context *ctx )
{ {
int i, j; int i, j;
unsigned char t = 0; unsigned char t = 0;
@ -179,7 +179,7 @@ int mbedtls_md2_update_ext( mbedtls_md2_context *ctx,
if( ctx->left == 16 ) if( ctx->left == 16 )
{ {
ctx->left = 0; ctx->left = 0;
if( ( ret = mbedtls_md2_process_ext( ctx ) ) != 0 ) if( ( ret = mbedtls_internal_md2_process( ctx ) ) != 0 )
return( ret ); return( ret );
} }
} }
@ -202,11 +202,11 @@ int mbedtls_md2_finish_ext( mbedtls_md2_context *ctx,
for( i = ctx->left; i < 16; i++ ) for( i = ctx->left; i < 16; i++ )
ctx->buffer[i] = x; ctx->buffer[i] = x;
if( ( ret = mbedtls_md2_process_ext( ctx ) ) != 0 ) if( ( ret = mbedtls_internal_md2_process( ctx ) ) != 0 )
return( ret ); return( ret );
memcpy( ctx->buffer, ctx->cksum, 16 ); memcpy( ctx->buffer, ctx->cksum, 16 );
if( ( ret = mbedtls_md2_process_ext( ctx ) ) != 0 ) if( ( ret = mbedtls_internal_md2_process( ctx ) ) != 0 )
return( ret ); return( ret );
memcpy( output, ctx->state, 16 ); memcpy( output, ctx->state, 16 );

View file

@ -112,7 +112,7 @@ int mbedtls_md4_starts_ext( mbedtls_md4_context *ctx )
} }
#if !defined(MBEDTLS_MD4_PROCESS_ALT) #if !defined(MBEDTLS_MD4_PROCESS_ALT)
int mbedtls_md4_process_ext( mbedtls_md4_context *ctx, int mbedtls_internal_md4_process( mbedtls_md4_context *ctx,
const unsigned char data[64] ) const unsigned char data[64] )
{ {
uint32_t X[16], A, B, C, D; uint32_t X[16], A, B, C, D;
@ -247,7 +247,7 @@ int mbedtls_md4_update_ext( mbedtls_md4_context *ctx,
memcpy( (void *) (ctx->buffer + left), memcpy( (void *) (ctx->buffer + left),
(void *) input, fill ); (void *) input, fill );
if( ( ret = mbedtls_md4_process_ext( ctx, ctx->buffer ) ) != 0 ) if( ( ret = mbedtls_internal_md4_process( ctx, ctx->buffer ) ) != 0 )
return( ret ); return( ret );
input += fill; input += fill;
@ -257,7 +257,7 @@ int mbedtls_md4_update_ext( mbedtls_md4_context *ctx,
while( ilen >= 64 ) while( ilen >= 64 )
{ {
if( ( ret = mbedtls_md4_process_ext( ctx, input ) ) != 0 ) if( ( ret = mbedtls_internal_md4_process( ctx, input ) ) != 0 )
return( ret ); return( ret );
input += 64; input += 64;

View file

@ -111,7 +111,7 @@ int mbedtls_md5_starts_ext( mbedtls_md5_context *ctx )
} }
#if !defined(MBEDTLS_MD5_PROCESS_ALT) #if !defined(MBEDTLS_MD5_PROCESS_ALT)
int mbedtls_md5_process_ext( mbedtls_md5_context *ctx, int mbedtls_internal_md5_process( mbedtls_md5_context *ctx,
const unsigned char data[64] ) const unsigned char data[64] )
{ {
uint32_t X[16], A, B, C, D; uint32_t X[16], A, B, C, D;
@ -264,7 +264,7 @@ int mbedtls_md5_update_ext( mbedtls_md5_context *ctx,
if( left && ilen >= fill ) if( left && ilen >= fill )
{ {
memcpy( (void *) (ctx->buffer + left), input, fill ); memcpy( (void *) (ctx->buffer + left), input, fill );
if( ( ret = mbedtls_md5_process_ext( ctx, ctx->buffer ) ) != 0 ) if( ( ret = mbedtls_internal_md5_process( ctx, ctx->buffer ) ) != 0 )
return( ret ); return( ret );
input += fill; input += fill;
@ -274,7 +274,7 @@ int mbedtls_md5_update_ext( mbedtls_md5_context *ctx,
while( ilen >= 64 ) while( ilen >= 64 )
{ {
if( ( ret = mbedtls_md5_process_ext( ctx, input ) ) != 0 ) if( ( ret = mbedtls_internal_md5_process( ctx, input ) ) != 0 )
return( ret ); return( ret );
input += 64; input += 64;

View file

@ -114,7 +114,7 @@ int mbedtls_ripemd160_starts_ext( mbedtls_ripemd160_context *ctx )
/* /*
* Process one block * Process one block
*/ */
int mbedtls_ripemd160_process_ext( mbedtls_ripemd160_context *ctx, int mbedtls_internal_ripemd160_process( mbedtls_ripemd160_context *ctx,
const unsigned char data[64] ) const unsigned char data[64] )
{ {
uint32_t A, B, C, D, E, Ap, Bp, Cp, Dp, Ep, X[16]; uint32_t A, B, C, D, E, Ap, Bp, Cp, Dp, Ep, X[16];
@ -322,7 +322,7 @@ int mbedtls_ripemd160_update_ext( mbedtls_ripemd160_context *ctx,
{ {
memcpy( (void *) (ctx->buffer + left), input, fill ); memcpy( (void *) (ctx->buffer + left), input, fill );
if( ( ret = mbedtls_ripemd160_process_ext( ctx, ctx->buffer ) ) != 0 ) if( ( ret = mbedtls_internal_ripemd160_process( ctx, ctx->buffer ) ) != 0 )
return( ret ); return( ret );
input += fill; input += fill;
@ -332,7 +332,7 @@ int mbedtls_ripemd160_update_ext( mbedtls_ripemd160_context *ctx,
while( ilen >= 64 ) while( ilen >= 64 )
{ {
if( ( ret = mbedtls_ripemd160_process_ext( ctx, input ) ) != 0 ) if( ( ret = mbedtls_internal_ripemd160_process( ctx, input ) ) != 0 )
return( ret ); return( ret );
input += 64; input += 64;

View file

@ -112,7 +112,7 @@ int mbedtls_sha1_starts_ext( mbedtls_sha1_context *ctx )
} }
#if !defined(MBEDTLS_SHA1_PROCESS_ALT) #if !defined(MBEDTLS_SHA1_PROCESS_ALT)
int mbedtls_sha1_process_ext( mbedtls_sha1_context *ctx, int mbedtls_internal_sha1_process( mbedtls_sha1_context *ctx,
const unsigned char data[64] ) const unsigned char data[64] )
{ {
uint32_t temp, W[16], A, B, C, D, E; uint32_t temp, W[16], A, B, C, D, E;
@ -299,7 +299,7 @@ int mbedtls_sha1_update_ext( mbedtls_sha1_context *ctx,
{ {
memcpy( (void *) (ctx->buffer + left), input, fill ); memcpy( (void *) (ctx->buffer + left), input, fill );
if( ( ret = mbedtls_sha1_process_ext( ctx, ctx->buffer ) ) != 0 ) if( ( ret = mbedtls_internal_sha1_process( ctx, ctx->buffer ) ) != 0 )
return( ret ); return( ret );
input += fill; input += fill;
@ -309,7 +309,7 @@ int mbedtls_sha1_update_ext( mbedtls_sha1_context *ctx,
while( ilen >= 64 ) while( ilen >= 64 )
{ {
if( ( ret = mbedtls_sha1_process_ext( ctx, input ) ) != 0 ) if( ( ret = mbedtls_internal_sha1_process( ctx, input ) ) != 0 )
return( ret ); return( ret );
input += 64; input += 64;

View file

@ -181,7 +181,7 @@ static const uint32_t K[] =
d += temp1; h = temp1 + temp2; \ d += temp1; h = temp1 + temp2; \
} }
int mbedtls_sha256_process_ext( mbedtls_sha256_context *ctx, int mbedtls_internal_sha256_process( mbedtls_sha256_context *ctx,
const unsigned char data[64] ) const unsigned char data[64] )
{ {
uint32_t temp1, temp2, W[64]; uint32_t temp1, temp2, W[64];
@ -267,7 +267,7 @@ int mbedtls_sha256_update_ext( mbedtls_sha256_context *ctx,
{ {
memcpy( (void *) (ctx->buffer + left), input, fill ); memcpy( (void *) (ctx->buffer + left), input, fill );
if( ( ret = mbedtls_sha256_process_ext( ctx, ctx->buffer ) ) != 0 ) if( ( ret = mbedtls_internal_sha256_process( ctx, ctx->buffer ) ) != 0 )
return( ret ); return( ret );
input += fill; input += fill;
@ -277,7 +277,7 @@ int mbedtls_sha256_update_ext( mbedtls_sha256_context *ctx,
while( ilen >= 64 ) while( ilen >= 64 )
{ {
if( ( ret = mbedtls_sha256_process_ext( ctx, input ) ) != 0 ) if( ( ret = mbedtls_internal_sha256_process( ctx, input ) ) != 0 )
return( ret ); return( ret );
input += 64; input += 64;

View file

@ -198,7 +198,7 @@ static const uint64_t K[80] =
UL64(0x5FCB6FAB3AD6FAEC), UL64(0x6C44198C4A475817) UL64(0x5FCB6FAB3AD6FAEC), UL64(0x6C44198C4A475817)
}; };
int mbedtls_sha512_process_ext( mbedtls_sha512_context *ctx, int mbedtls_internal_sha512_process( mbedtls_sha512_context *ctx,
const unsigned char data[128] ) const unsigned char data[128] )
{ {
int i; int i;
@ -297,7 +297,7 @@ int mbedtls_sha512_update_ext( mbedtls_sha512_context *ctx,
{ {
memcpy( (void *) (ctx->buffer + left), input, fill ); memcpy( (void *) (ctx->buffer + left), input, fill );
if( ( ret = mbedtls_sha512_process_ext( ctx, ctx->buffer ) ) != 0 ) if( ( ret = mbedtls_internal_sha512_process( ctx, ctx->buffer ) ) != 0 )
return( ret ); return( ret );
input += fill; input += fill;
@ -307,7 +307,7 @@ int mbedtls_sha512_update_ext( mbedtls_sha512_context *ctx,
while( ilen >= 128 ) while( ilen >= 128 )
{ {
if( ( ret = mbedtls_sha512_process_ext( ctx, input ) ) != 0 ) if( ( ret = mbedtls_internal_sha512_process( ctx, input ) ) != 0 )
return( ret ); return( ret );
input += 128; input += 128;