yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-30 04:44:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't return function pointers from MD info getters

Browse Source 
ARMC5 appears to use the heuristic that as soon as a function's address
is taken, the function can no longer be removed from the resulting object
file (which is not necessarily true if all uses of the functions address
can be inlined).

Circumvent this lack of optimization by not returning function pointers.
This commit is contained in:
Hanno Becker 2019-09-04 11:15:02 +01:00
parent 08cf43a9ec
commit 3a98eab2c4
1 changed files with 103 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

190
library/md.c
View File

@ -795,52 +795,58 @@ MBEDTLS_ALWAYS_INLINE static inline int mbedtls_md_info_block_size(
return( info->block_size ); return( info->block_size );
} }
MBEDTLS_ALWAYS_INLINE static inline mbedtls_md_starts_func_t *mbedtls_md_info_starts_func( MBEDTLS_ALWAYS_INLINE static inline int mbedtls_md_info_starts( mbedtls_md_handle_t info,
mbedtls_md_handle_t info ) void *ctx )
{ {
return( info->starts_func ); return( info->starts_func( ctx ) );
} }
MBEDTLS_ALWAYS_INLINE static inline mbedtls_md_update_func_t *mbedtls_md_info_update_func( MBEDTLS_ALWAYS_INLINE static inline int mbedtls_md_info_update( mbedtls_md_handle_t info,
mbedtls_md_handle_t info ) void *ctx,
const unsigned char *input,
size_t ilen )
{ {
return( info->update_func ); return( info->update_func( ctx, input, ilen ) );
} }
MBEDTLS_ALWAYS_INLINE static inline mbedtls_md_finish_func_t *mbedtls_md_info_finish_func( MBEDTLS_ALWAYS_INLINE static inline int mbedtls_md_info_finish( mbedtls_md_handle_t info,
mbedtls_md_handle_t info ) void *ctx,
unsigned char *output )
{ {
return( info->finish_func ); return( info->finish_func( ctx, output ) );
} }
MBEDTLS_ALWAYS_INLINE static inline mbedtls_md_digest_func_t *mbedtls_md_info_digest_func( MBEDTLS_ALWAYS_INLINE static inline int mbedtls_md_info_digest( mbedtls_md_handle_t info,
mbedtls_md_handle_t info ) const unsigned char *input,
size_t ilen,
unsigned char *output )
{ {
return( info->digest_func ); return( info->digest_func( input, ilen, output ) );
} }
MBEDTLS_ALWAYS_INLINE static inline mbedtls_md_ctx_alloc_func_t *mbedtls_md_info_ctx_alloc_func( MBEDTLS_ALWAYS_INLINE static inline void* mbedtls_md_info_ctx_alloc( mbedtls_md_handle_t info )
mbedtls_md_handle_t info )
{ {
return( info->ctx_alloc_func ); return( info->ctx_alloc_func() );
} }
MBEDTLS_ALWAYS_INLINE static inline mbedtls_md_ctx_free_func_t *mbedtls_md_info_ctx_free_func( MBEDTLS_ALWAYS_INLINE static inline void mbedtls_md_info_ctx_free( mbedtls_md_handle_t info,
mbedtls_md_handle_t info ) void *ctx )
{ {
return( info->ctx_free_func ); info->ctx_free_func( ctx );
} }
MBEDTLS_ALWAYS_INLINE static inline mbedtls_md_clone_func_t *mbedtls_md_info_clone_func( MBEDTLS_ALWAYS_INLINE static inline void mbedtls_md_info_clone( mbedtls_md_handle_t info,
mbedtls_md_handle_t info ) void *dst,
const void *src )
{ {
return( info->clone_func ); info->clone_func( dst, src );
} }
MBEDTLS_ALWAYS_INLINE static inline mbedtls_md_process_func_t *mbedtls_md_info_process_func( MBEDTLS_ALWAYS_INLINE static inline int mbedtls_md_info_process( mbedtls_md_handle_t info,
mbedtls_md_handle_t info ) void *ctx,
const unsigned char *input )
{ {
return( info->process_func ); return( info->process_func( ctx, input ) );
} }
#else /* !MBEDTLS_MD_SINGLE_HASH */ #else /* !MBEDTLS_MD_SINGLE_HASH */
@ -873,60 +879,70 @@ MBEDTLS_ALWAYS_INLINE static inline int mbedtls_md_info_block_size(
return( MBEDTLS_MD_INFO_BLOCKSIZE( MBEDTLS_MD_SINGLE_HASH ) ); return( MBEDTLS_MD_INFO_BLOCKSIZE( MBEDTLS_MD_SINGLE_HASH ) );
} }
MBEDTLS_ALWAYS_INLINE static inline mbedtls_md_starts_func_t *mbedtls_md_info_starts_func( MBEDTLS_ALWAYS_INLINE static inline int mbedtls_md_info_starts( mbedtls_md_handle_t info,
mbedtls_md_handle_t info ) void *ctx )
{ {
((void) info); ((void) info);
return( MBEDTLS_MD_INFO_STARTS_FUNC( MBEDTLS_MD_SINGLE_HASH ) ); return( MBEDTLS_MD_INFO_STARTS_FUNC( MBEDTLS_MD_SINGLE_HASH )( ctx ) );
} }
MBEDTLS_ALWAYS_INLINE static inline mbedtls_md_update_func_t *mbedtls_md_info_update_func( MBEDTLS_ALWAYS_INLINE static inline int mbedtls_md_info_update( mbedtls_md_handle_t info,
mbedtls_md_handle_t info ) void *ctx,
const unsigned char *input,
size_t ilen )
{ {
((void) info); ((void) info);
return( MBEDTLS_MD_INFO_UPDATE_FUNC( MBEDTLS_MD_SINGLE_HASH ) ); return( MBEDTLS_MD_INFO_UPDATE_FUNC( MBEDTLS_MD_SINGLE_HASH )
( ctx, input, ilen ) );
} }
MBEDTLS_ALWAYS_INLINE static inline mbedtls_md_finish_func_t *mbedtls_md_info_finish_func( MBEDTLS_ALWAYS_INLINE static inline int mbedtls_md_info_finish( mbedtls_md_handle_t info,
mbedtls_md_handle_t info ) void *ctx,
unsigned char *output )
{ {
((void) info); ((void) info);
return( MBEDTLS_MD_INFO_FINISH_FUNC( MBEDTLS_MD_SINGLE_HASH ) ); return( MBEDTLS_MD_INFO_FINISH_FUNC( MBEDTLS_MD_SINGLE_HASH )
( ctx, output ) );
} }
MBEDTLS_ALWAYS_INLINE static inline mbedtls_md_digest_func_t *mbedtls_md_info_digest_func( MBEDTLS_ALWAYS_INLINE static inline int mbedtls_md_info_digest( mbedtls_md_handle_t info,
mbedtls_md_handle_t info ) const unsigned char *input,
size_t ilen,
unsigned char *output )
{ {
((void) info); ((void) info);
return( MBEDTLS_MD_INFO_DIGEST_FUNC( MBEDTLS_MD_SINGLE_HASH ) ); return( MBEDTLS_MD_INFO_DIGEST_FUNC( MBEDTLS_MD_SINGLE_HASH )
( input, ilen, output ) );
} }
MBEDTLS_ALWAYS_INLINE static inline mbedtls_md_ctx_alloc_func_t *mbedtls_md_info_ctx_alloc_func( MBEDTLS_ALWAYS_INLINE static inline void* mbedtls_md_info_ctx_alloc( mbedtls_md_handle_t info )
mbedtls_md_handle_t info )
{ {
((void) info); ((void) info);
return( MBEDTLS_MD_INFO_ALLOC_FUNC( MBEDTLS_MD_SINGLE_HASH ) ); return( MBEDTLS_MD_INFO_ALLOC_FUNC( MBEDTLS_MD_SINGLE_HASH )() );
} }
MBEDTLS_ALWAYS_INLINE static inline mbedtls_md_ctx_free_func_t *mbedtls_md_info_ctx_free_func( MBEDTLS_ALWAYS_INLINE static inline void mbedtls_md_info_ctx_free( mbedtls_md_handle_t info,
mbedtls_md_handle_t info ) void *ctx )
{ {
((void) info); ((void) info);
return( MBEDTLS_MD_INFO_FREE_FUNC( MBEDTLS_MD_SINGLE_HASH ) ); MBEDTLS_MD_INFO_FREE_FUNC( MBEDTLS_MD_SINGLE_HASH )( ctx );
} }
MBEDTLS_ALWAYS_INLINE static inline mbedtls_md_clone_func_t *mbedtls_md_info_clone_func( MBEDTLS_ALWAYS_INLINE static inline void mbedtls_md_info_clone( mbedtls_md_handle_t info,
mbedtls_md_handle_t info ) void *dst,
const void *src )
{ {
((void) info); ((void) info);
return( MBEDTLS_MD_INFO_CLONE_FUNC( MBEDTLS_MD_SINGLE_HASH ) ); MBEDTLS_MD_INFO_CLONE_FUNC( MBEDTLS_MD_SINGLE_HASH )( dst, src );
} }
MBEDTLS_ALWAYS_INLINE static inline mbedtls_md_process_func_t *mbedtls_md_info_process_func( MBEDTLS_ALWAYS_INLINE static inline int mbedtls_md_info_process( mbedtls_md_handle_t info,
mbedtls_md_handle_t info ) void *ctx,
const unsigned char *input )
{ {
((void) info); ((void) info);
return( MBEDTLS_MD_INFO_PROCESS_FUNC( MBEDTLS_MD_SINGLE_HASH ) ); return( MBEDTLS_MD_INFO_PROCESS_FUNC( MBEDTLS_MD_SINGLE_HASH )
( ctx, input ) );
} }
#endif /* MBEDTLS_MD_SINGLE_HASH */ #endif /* MBEDTLS_MD_SINGLE_HASH */
@ -1111,8 +1127,7 @@ void mbedtls_md_free( mbedtls_md_context_t *ctx )
if( ctx->md_ctx != NULL ) if( ctx->md_ctx != NULL )
{ {
mbedtls_md_info_ctx_free_func( mbedtls_md_info_ctx_free( mbedtls_md_get_handle( ctx ), ctx->md_ctx );
mbedtls_md_get_handle( ctx ) )( ctx->md_ctx );
} }
if( ctx->hmac_ctx != NULL ) if( ctx->hmac_ctx != NULL )
@ -1135,8 +1150,8 @@ int mbedtls_md_clone( mbedtls_md_context_t *dst,
return( MBEDTLS_ERR_MD_BAD_INPUT_DATA ); return( MBEDTLS_ERR_MD_BAD_INPUT_DATA );
} }
mbedtls_md_info_clone_func( mbedtls_md_get_handle( dst ) ) mbedtls_md_info_clone( mbedtls_md_get_handle( dst ),
( dst->md_ctx, src->md_ctx ); dst->md_ctx, src->md_ctx );
return( 0 ); return( 0 );
} }
@ -1152,7 +1167,7 @@ int mbedtls_md_setup( mbedtls_md_context_t *ctx, mbedtls_md_handle_t md_info, in
if( md_info == MBEDTLS_MD_INVALID_HANDLE || ctx == NULL ) if( md_info == MBEDTLS_MD_INVALID_HANDLE || ctx == NULL )
return( MBEDTLS_ERR_MD_BAD_INPUT_DATA ); return( MBEDTLS_ERR_MD_BAD_INPUT_DATA );
ctx->md_ctx = mbedtls_md_info_ctx_alloc_func( md_info )(); ctx->md_ctx = mbedtls_md_info_ctx_alloc( md_info );
if( ctx->md_ctx == NULL ) if( ctx->md_ctx == NULL )
return( MBEDTLS_ERR_MD_ALLOC_FAILED ); return( MBEDTLS_ERR_MD_ALLOC_FAILED );
@ -1162,7 +1177,7 @@ int mbedtls_md_setup( mbedtls_md_context_t *ctx, mbedtls_md_handle_t md_info, in
mbedtls_md_info_block_size( md_info ) ); mbedtls_md_info_block_size( md_info ) );
if( ctx->hmac_ctx == NULL ) if( ctx->hmac_ctx == NULL )
{ {
mbedtls_md_info_ctx_free_func( md_info )( ctx->md_ctx ); mbedtls_md_info_ctx_free( md_info, ctx->md_ctx );
return( MBEDTLS_ERR_MD_ALLOC_FAILED ); return( MBEDTLS_ERR_MD_ALLOC_FAILED );
} }
} }
@ -1184,7 +1199,7 @@ int mbedtls_md_starts( mbedtls_md_context_t *ctx )
if( md_info == MBEDTLS_MD_INVALID_HANDLE ) if( md_info == MBEDTLS_MD_INVALID_HANDLE )
return( MBEDTLS_ERR_MD_BAD_INPUT_DATA ); return( MBEDTLS_ERR_MD_BAD_INPUT_DATA );
return( mbedtls_md_info_starts_func( md_info )( ctx->md_ctx ) ); return( mbedtls_md_info_starts( md_info, ctx->md_ctx ) );
} }
int mbedtls_md_update( mbedtls_md_context_t *ctx, const unsigned char *input, size_t ilen ) int mbedtls_md_update( mbedtls_md_context_t *ctx, const unsigned char *input, size_t ilen )
@ -1197,7 +1212,7 @@ int mbedtls_md_update( mbedtls_md_context_t *ctx, const unsigned char *input, si
if( md_info == MBEDTLS_MD_INVALID_HANDLE ) if( md_info == MBEDTLS_MD_INVALID_HANDLE )
return( MBEDTLS_ERR_MD_BAD_INPUT_DATA ); return( MBEDTLS_ERR_MD_BAD_INPUT_DATA );
return( mbedtls_md_info_update_func( md_info )( ctx->md_ctx, return( mbedtls_md_info_update( md_info, ctx->md_ctx,
input, ilen ) ); input, ilen ) );
} }
@ -1211,7 +1226,7 @@ int mbedtls_md_finish( mbedtls_md_context_t *ctx, unsigned char *output )
if( md_info == MBEDTLS_MD_INVALID_HANDLE ) if( md_info == MBEDTLS_MD_INVALID_HANDLE )
return( MBEDTLS_ERR_MD_BAD_INPUT_DATA ); return( MBEDTLS_ERR_MD_BAD_INPUT_DATA );
return( mbedtls_md_info_finish_func( md_info )( ctx->md_ctx, return( mbedtls_md_info_finish( md_info, ctx->md_ctx,
output ) ); output ) );
} }
@ -1221,8 +1236,8 @@ int mbedtls_md( mbedtls_md_handle_t md_info, const unsigned char *input, size_t
if( md_info == MBEDTLS_MD_INVALID_HANDLE ) if( md_info == MBEDTLS_MD_INVALID_HANDLE )
return( MBEDTLS_ERR_MD_BAD_INPUT_DATA ); return( MBEDTLS_ERR_MD_BAD_INPUT_DATA );
return( mbedtls_md_info_digest_func( md_info )( return( mbedtls_md_info_digest( md_info, input,
input, ilen, output) ); ilen, output) );
} }
#if defined(MBEDTLS_FS_IO) #if defined(MBEDTLS_FS_IO)
@ -1245,13 +1260,13 @@ int mbedtls_md_file( mbedtls_md_handle_t md_info, const char *path, unsigned cha
if( ( ret = mbedtls_md_setup( &ctx, md_info, 0 ) ) != 0 ) if( ( ret = mbedtls_md_setup( &ctx, md_info, 0 ) ) != 0 )
goto cleanup; goto cleanup;
ret = mbedtls_md_info_starts_func( md_info )( ctx.md_ctx ); ret = mbedtls_md_info_starts( md_info, ctx.md_ctx );
if( ret != 0 ) if( ret != 0 )
goto cleanup; goto cleanup;
while( ( n = fread( buf, 1, sizeof( buf ), f ) ) > 0 ) while( ( n = fread( buf, 1, sizeof( buf ), f ) ) > 0 )
{ {
ret = mbedtls_md_info_update_func( md_info )( ctx.md_ctx, ret = mbedtls_md_info_update( md_info, ctx.md_ctx,
buf, n ); buf, n );
if( ret != 0 ) if( ret != 0 )
goto cleanup; goto cleanup;
@ -1263,7 +1278,7 @@ int mbedtls_md_file( mbedtls_md_handle_t md_info, const char *path, unsigned cha
} }
else else
{ {
ret = mbedtls_md_info_finish_func( md_info )( ctx.md_ctx, ret = mbedtls_md_info_finish( md_info, ctx.md_ctx,
output ); output );
} }
@ -1283,10 +1298,6 @@ int mbedtls_md_hmac_starts( mbedtls_md_context_t *ctx, const unsigned char *key,
unsigned char *ipad, *opad; unsigned char *ipad, *opad;
size_t i; size_t i;
mbedtls_md_starts_func_t *starts;
mbedtls_md_update_func_t *update;
mbedtls_md_finish_func_t *finish;
mbedtls_md_handle_t md_info; mbedtls_md_handle_t md_info;
if( ctx == NULL || ctx->hmac_ctx == NULL ) if( ctx == NULL || ctx->hmac_ctx == NULL )
@ -1296,19 +1307,18 @@ int mbedtls_md_hmac_starts( mbedtls_md_context_t *ctx, const unsigned char *key,
if( md_info == MBEDTLS_MD_INVALID_HANDLE ) if( md_info == MBEDTLS_MD_INVALID_HANDLE )
return( MBEDTLS_ERR_MD_BAD_INPUT_DATA ); return( MBEDTLS_ERR_MD_BAD_INPUT_DATA );
starts = mbedtls_md_info_starts_func( md_info );
update = mbedtls_md_info_update_func( md_info );
finish = mbedtls_md_info_finish_func( md_info );
if( keylen > (size_t) mbedtls_md_info_block_size( md_info ) ) if( keylen > (size_t) mbedtls_md_info_block_size( md_info ) )
{ {
if( ( ret = starts( ctx->md_ctx ) ) != 0 ) if( ( ret = mbedtls_md_info_starts( md_info, ctx->md_ctx ) ) != 0 )
goto cleanup; goto cleanup;
if( ( ret = update( ctx->md_ctx, key, keylen ) ) ) if( ( ret = mbedtls_md_info_update( md_info, ctx->md_ctx,
key, keylen ) ) != 0 )
{
goto cleanup; goto cleanup;
}
if( ( ret = finish( ctx->md_ctx, sum ) ) != 0 ) if( ( ret = mbedtls_md_info_finish( md_info, ctx->md_ctx, sum ) ) != 0 )
goto cleanup; goto cleanup;
keylen = mbedtls_md_info_size( md_info ); keylen = mbedtls_md_info_size( md_info );
@ -1328,10 +1338,10 @@ int mbedtls_md_hmac_starts( mbedtls_md_context_t *ctx, const unsigned char *key,
opad[i] = (unsigned char)( opad[i] ^ key[i] ); opad[i] = (unsigned char)( opad[i] ^ key[i] );
} }
if( ( ret = starts( ctx->md_ctx ) ) != 0 ) if( ( ret = mbedtls_md_info_starts( md_info, ctx->md_ctx ) ) != 0 )
goto cleanup; goto cleanup;
if( ( ret = update( ctx->md_ctx, ipad, if( ( ret = mbedtls_md_info_update( md_info, ctx->md_ctx, ipad,
mbedtls_md_info_block_size( md_info ) ) ) != 0 ) mbedtls_md_info_block_size( md_info ) ) ) != 0 )
{ {
goto cleanup; goto cleanup;
@ -1355,8 +1365,9 @@ int mbedtls_md_hmac_update( mbedtls_md_context_t *ctx,
if( md_info == MBEDTLS_MD_INVALID_HANDLE ) if( md_info == MBEDTLS_MD_INVALID_HANDLE )
return( MBEDTLS_ERR_MD_BAD_INPUT_DATA ); return( MBEDTLS_ERR_MD_BAD_INPUT_DATA );
return( mbedtls_md_info_update_func( md_info )( return( mbedtls_md_info_update( md_info,
ctx->md_ctx, input, ilen ) ); ctx->md_ctx, input,
ilen ) );
} }
int mbedtls_md_hmac_finish( mbedtls_md_context_t *ctx, unsigned char *output ) int mbedtls_md_hmac_finish( mbedtls_md_context_t *ctx, unsigned char *output )
@ -1365,10 +1376,6 @@ int mbedtls_md_hmac_finish( mbedtls_md_context_t *ctx, unsigned char *output )
unsigned char tmp[MBEDTLS_MD_MAX_SIZE]; unsigned char tmp[MBEDTLS_MD_MAX_SIZE];
unsigned char *opad; unsigned char *opad;
mbedtls_md_starts_func_t *starts;
mbedtls_md_update_func_t *update;
mbedtls_md_finish_func_t *finish;
mbedtls_md_handle_t md_info; mbedtls_md_handle_t md_info;
if( ctx == NULL || ctx->hmac_ctx == NULL ) if( ctx == NULL || ctx->hmac_ctx == NULL )
@ -1378,32 +1385,28 @@ int mbedtls_md_hmac_finish( mbedtls_md_context_t *ctx, unsigned char *output )
if( md_info == MBEDTLS_MD_INVALID_HANDLE ) if( md_info == MBEDTLS_MD_INVALID_HANDLE )
return( MBEDTLS_ERR_MD_BAD_INPUT_DATA ); return( MBEDTLS_ERR_MD_BAD_INPUT_DATA );
starts = mbedtls_md_info_starts_func( md_info );
update = mbedtls_md_info_update_func( md_info );
finish = mbedtls_md_info_finish_func( md_info );
opad = (unsigned char *) ctx->hmac_ctx + opad = (unsigned char *) ctx->hmac_ctx +
mbedtls_md_info_block_size( md_info ); mbedtls_md_info_block_size( md_info );
if( ( ret = finish( ctx->md_ctx, tmp ) ) != 0 ) if( ( ret = mbedtls_md_info_finish( md_info, ctx->md_ctx, tmp ) ) != 0 )
return( ret ); return( ret );
if( ( ret = starts( ctx->md_ctx ) ) != 0 ) if( ( ret = mbedtls_md_info_starts( md_info, ctx->md_ctx ) ) != 0 )
return( ret ); return( ret );
if( ( ret = update( ctx->md_ctx, opad, if( ( ret = mbedtls_md_info_update( md_info, ctx->md_ctx, opad,
mbedtls_md_info_block_size( md_info ) ) ) != 0 ) mbedtls_md_info_block_size( md_info ) ) ) != 0 )
{ {
return( ret ); return( ret );
} }
if( ( ret = update( ctx->md_ctx, tmp, if( ( ret = mbedtls_md_info_update( md_info, ctx->md_ctx, tmp,
mbedtls_md_info_size( md_info ) ) ) != 0 ) mbedtls_md_info_size( md_info ) ) ) != 0 )
{ {
return( ret ); return( ret );
} }
if( ( ret = finish( ctx->md_ctx, output ) ) != 0 ) if( ( ret = mbedtls_md_info_finish( md_info, ctx->md_ctx, output ) ) != 0 )
return( ret ); return( ret );
return( 0 ); return( 0 );
@ -1425,11 +1428,11 @@ int mbedtls_md_hmac_reset( mbedtls_md_context_t *ctx )
ipad = (unsigned char *) ctx->hmac_ctx; ipad = (unsigned char *) ctx->hmac_ctx;
ret = mbedtls_md_info_starts_func( md_info )( ctx->md_ctx ); ret = mbedtls_md_info_starts( md_info, ctx->md_ctx );
if( ret != 0 ) if( ret != 0 )
return( ret ); return( ret );
ret = mbedtls_md_info_update_func( md_info )( ret = mbedtls_md_info_update( md_info,
ctx->md_ctx, ipad, ctx->md_ctx, ipad,
mbedtls_md_info_block_size( md_info ) ); mbedtls_md_info_block_size( md_info ) );
return( ret ); return( ret );
@ -1474,8 +1477,7 @@ int mbedtls_md_process( mbedtls_md_context_t *ctx, const unsigned char *data )
if( md_info == MBEDTLS_MD_INVALID_HANDLE ) if( md_info == MBEDTLS_MD_INVALID_HANDLE )
return( MBEDTLS_ERR_MD_BAD_INPUT_DATA ); return( MBEDTLS_ERR_MD_BAD_INPUT_DATA );
return( mbedtls_md_info_process_func( md_info )( return( mbedtls_md_info_process( md_info, ctx->md_ctx, data ) );
ctx->md_ctx, data ) );
} }
unsigned char mbedtls_md_get_size( mbedtls_md_handle_t md_info ) unsigned char mbedtls_md_get_size( mbedtls_md_handle_t md_info )