yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-25 19:15:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

cmac: improve argument order and naming

Browse Source 
- always use the pattern "buffer, length"
- avoid using unqualified "length" as a name when there are more than one
This commit is contained in:
Manuel Pégourié-Gonnard 2016-01-13 10:48:02 +00:00 committed by Simon Butcher
parent 3d23b1d5ed
commit 690083c21d
2 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/mbedtls/cmac.h
View File

@ -77,24 +77,24 @@ void mbedtls_cmac_free( mbedtls_cmac_context *ctx );
* \brief CMAC generate * \brief CMAC generate
* *
* \param ctx CMAC context * \param ctx CMAC context
* \param length length of the input data in bytes
* \param input buffer holding the input data * \param input buffer holding the input data
* \param in_len length of the input data in bytes
* \param tag buffer for holding the generated tag * \param tag buffer for holding the generated tag
* \param tag_len length of the tag to generate in bytes * \param tag_len length of the tag to generate in bytes
* must be between 4, 6, 8, 10, 14 or 16 * must be between 4, 6, 8, 10, 14 or 16
* *
* \return 0 if successful * \return 0 if successful
*/ */
int mbedtls_cmac_generate( mbedtls_cmac_context *ctx, size_t length, int mbedtls_cmac_generate( mbedtls_cmac_context *ctx,
const unsigned char *input, const unsigned char *input, size_t in_len,
unsigned char *tag, size_t tag_len ); unsigned char *tag, size_t tag_len );
/** /**
* \brief CMAC verify * \brief CMAC verify
* *
* \param ctx CMAC context * \param ctx CMAC context
* \param length length of the input data in bytes
* \param input buffer holding the input data * \param input buffer holding the input data
* \param in_len length of the input data in bytes
* \param tag buffer holding the tag to verify * \param tag buffer holding the tag to verify
* \param tag_len length of the tag to verify in bytes * \param tag_len length of the tag to verify in bytes
* must be 4, 6, 8, 10, 14 or 16 * must be 4, 6, 8, 10, 14 or 16
@ -102,25 +102,25 @@ int mbedtls_cmac_generate( mbedtls_cmac_context *ctx, size_t length,
* \return 0 if successful and authenticated, * \return 0 if successful and authenticated,
* MBEDTLS_ERR_CMAC_VERIFY_FAILED if tag does not match * MBEDTLS_ERR_CMAC_VERIFY_FAILED if tag does not match
*/ */
int mbedtls_cmac_verify( mbedtls_cmac_context *ctx, size_t length, int mbedtls_cmac_verify( mbedtls_cmac_context *ctx,
const unsigned char *input, const unsigned char *input, size_t in_len,
const unsigned char *tag, size_t tag_len ); const unsigned char *tag, size_t tag_len );
/** /**
* \brief AES-CMAC-128-PRF * \brief AES-CMAC-128-PRF
* *
* \param ctx CMAC context * \param ctx CMAC context
* \param length length of the input data in bytes
* \param key PRF key * \param key PRF key
* \param key_len PRF key length * \param key_len PRF key length
* \param input buffer holding the input data * \param input buffer holding the input data
* \param in_len length of the input data in bytes
* \param tag buffer holding the tag to verify (16 bytes) * \param tag buffer holding the tag to verify (16 bytes)
* *
* \return 0 if successful * \return 0 if successful
*/ */
int mbedtls_aes_cmac_prf_128( mbedtls_cmac_context *ctx, size_t length, int mbedtls_aes_cmac_prf_128( mbedtls_cmac_context *ctx,
const unsigned char *key, size_t key_len, const unsigned char *key, size_t key_len,
const unsigned char *input, const unsigned char *input, size_t in_len,
unsigned char *tag ); unsigned char *tag );
#if defined(MBEDTLS_SELF_TEST) && defined(MBEDTLS_AES_C) #if defined(MBEDTLS_SELF_TEST) && defined(MBEDTLS_AES_C)

38
library/cmac.c
View File

@ -200,8 +200,8 @@ static void padding(const unsigned char *lastb, unsigned char *pad, const size_t
/* /*
* Generate tag on complete message * Generate tag on complete message
*/ */
static int cmac_generate( mbedtls_cmac_context *ctx, size_t length, static int cmac_generate( mbedtls_cmac_context *ctx,
const unsigned char *input, const unsigned char *input, size_t in_len,
unsigned char *tag, size_t tag_len ) unsigned char *tag, size_t tag_len )
{ {
unsigned char Mn[16]; unsigned char Mn[16];
@ -211,7 +211,7 @@ static int cmac_generate( mbedtls_cmac_context *ctx, size_t length,
size_t olen; size_t olen;
/* /*
* Check length requirements: SP800-38B A * Check in_len requirements: SP800-38B A
* 4 is a worst case bottom limit * 4 is a worst case bottom limit
*/ */
if( tag_len < 4 || tag_len > 16 || tag_len % 2 != 0 ) if( tag_len < 4 || tag_len > 16 || tag_len % 2 != 0 )
@ -220,7 +220,7 @@ static int cmac_generate( mbedtls_cmac_context *ctx, size_t length,
/* TODO: Use cipher padding function? */ /* TODO: Use cipher padding function? */
// mbedtls_cipher_set_padding_mode( ctx->cipher, MBEDTLS_PADDING_ONE_AND_ZEROS ); // mbedtls_cipher_set_padding_mode( ctx->cipher, MBEDTLS_PADDING_ONE_AND_ZEROS );
n = ( length + 15 ) / 16; /* n is number of rounds */ n = ( in_len + 15 ) / 16; /* n is number of rounds */
if( n == 0 ) if( n == 0 )
{ {
@ -229,7 +229,7 @@ static int cmac_generate( mbedtls_cmac_context *ctx, size_t length,
} }
else else
{ {
flag = ( ( length % 16 ) == 0); flag = ( ( in_len % 16 ) == 0);
} }
/* Calculate last block */ /* Calculate last block */
@ -241,7 +241,7 @@ static int cmac_generate( mbedtls_cmac_context *ctx, size_t length,
else else
{ {
/* TODO: Use cipher padding function? */ /* TODO: Use cipher padding function? */
padding( &input[16 * (n - 1)], padded, length % 16 ); padding( &input[16 * (n - 1)], padded, in_len % 16 );
XOR_128( padded, ctx->K2, M_last ); XOR_128( padded, ctx->K2, M_last );
} }
@ -259,18 +259,18 @@ static int cmac_generate( mbedtls_cmac_context *ctx, size_t length,
return( 0 ); return( 0 );
} }
int mbedtls_cmac_generate( mbedtls_cmac_context *ctx, size_t length, int mbedtls_cmac_generate( mbedtls_cmac_context *ctx,
const unsigned char *input, const unsigned char *input, size_t in_len,
unsigned char *tag, size_t tag_len ) unsigned char *tag, size_t tag_len )
{ {
return( cmac_generate( ctx, length, input, tag, tag_len ) ); return( cmac_generate( ctx, input, in_len, tag, tag_len ) );
} }
/* /*
* Authenticated decryption * Authenticated decryption
*/ */
int mbedtls_cmac_verify( mbedtls_cmac_context *ctx, size_t length, int mbedtls_cmac_verify( mbedtls_cmac_context *ctx,
const unsigned char *input, const unsigned char *input, size_t in_len,
const unsigned char *tag, size_t tag_len ) const unsigned char *tag, size_t tag_len )
{ {
int ret; int ret;
@ -278,7 +278,7 @@ int mbedtls_cmac_verify( mbedtls_cmac_context *ctx, size_t length,
unsigned char i; unsigned char i;
int diff; int diff;
if( ( ret = cmac_generate( ctx, length, input, check_tag, tag_len) ) != 0 ) if( ( ret = cmac_generate( ctx, input, in_len, check_tag, tag_len) ) != 0 )
{ {
return ret; return ret;
} }
@ -297,9 +297,9 @@ int mbedtls_cmac_verify( mbedtls_cmac_context *ctx, size_t length,
return( 0 ); return( 0 );
} }
int mbedtls_aes_cmac_prf_128( mbedtls_cmac_context *ctx, size_t length, int mbedtls_aes_cmac_prf_128( mbedtls_cmac_context *ctx,
const unsigned char *key, size_t key_length, const unsigned char *key, size_t key_length,
const unsigned char *input, const unsigned char *input, size_t in_len,
unsigned char *tag ) unsigned char *tag )
{ {
int ret; int ret;
@ -323,7 +323,7 @@ int mbedtls_aes_cmac_prf_128( mbedtls_cmac_context *ctx, size_t length,
{ {
return( ret ); return( ret );
} }
ret = mbedtls_cmac_generate( &zero_ctx, key_length, key, int_key, 16 ); ret = mbedtls_cmac_generate( &zero_ctx, key, key_length, int_key, 16 );
if( ret != 0 ) if( ret != 0 )
{ {
return( ret ); return( ret );
@ -335,7 +335,7 @@ int mbedtls_aes_cmac_prf_128( mbedtls_cmac_context *ctx, size_t length,
{ {
return( ret ); return( ret );
} }
return( mbedtls_cmac_generate( ctx, length, input, tag, 16 ) ); return( mbedtls_cmac_generate( ctx, input, in_len, tag, 16 ) );
} }
#if defined(MBEDTLS_SELF_TEST) && defined(MBEDTLS_AES_C) #if defined(MBEDTLS_SELF_TEST) && defined(MBEDTLS_AES_C)
@ -473,7 +473,7 @@ int mbedtls_cmac_self_test( int verbose )
{ {
mbedtls_printf( " AES-128-CMAC #%u: ", i ); mbedtls_printf( " AES-128-CMAC #%u: ", i );
ret = mbedtls_cmac_generate( &ctx, Mlen[i], M, tag, 16 ); ret = mbedtls_cmac_generate( &ctx, M, Mlen[i], tag, 16 );
if( ret != 0 || if( ret != 0 ||
memcmp( tag, T[i], 16 ) != 0 ) memcmp( tag, T[i], 16 ) != 0 )
{ {
@ -482,7 +482,7 @@ int mbedtls_cmac_self_test( int verbose )
return( 1 ); return( 1 );
} }
ret = mbedtls_cmac_verify( &ctx, Mlen[i], M, T[i], 16 ); ret = mbedtls_cmac_verify( &ctx, M, Mlen[i], T[i], 16 );
if( ret != 0 ) if( ret != 0 )
{ {
if( verbose != 0 ) if( verbose != 0 )
@ -499,7 +499,7 @@ int mbedtls_cmac_self_test( int verbose )
{ {
mbedtls_printf( " AES-CMAC-128-PRF #%u: ", i ); mbedtls_printf( " AES-CMAC-128-PRF #%u: ", i );
mbedtls_aes_cmac_prf_128( &ctx, 20, PRFK, PRFKlen[i], PRFM, tag); mbedtls_aes_cmac_prf_128( &ctx, PRFK, PRFKlen[i], PRFM, 20, tag);
if( ret != 0 || if( ret != 0 ||
memcmp( tag, PRFT[i], 16 ) != 0 ) memcmp( tag, PRFT[i], 16 ) != 0 )