yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-12-23 11:35:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename len to bitlen in function parameters

Browse source 
Clarify a few comments too.
This commit is contained in:
Manuel Pégourié-Gonnard 2015-06-18 14:58:58 +02:00
parent 6934afa234
commit b8186a5e54
15 changed files with 58 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/mbedtls/aes.h
View file

@ -83,24 +83,24 @@ void mbedtls_aes_free( mbedtls_aes_context *ctx );
* *
* \param ctx AES context to be initialized * \param ctx AES context to be initialized
* \param key encryption key * \param key encryption key
* \param keysize must be 128, 192 or 256 * \param keybits must be 128, 192 or 256
* *
* \return 0 if successful, or MBEDTLS_ERR_AES_INVALID_KEY_LENGTH * \return 0 if successful, or MBEDTLS_ERR_AES_INVALID_KEY_LENGTH
*/ */
int mbedtls_aes_setkey_enc( mbedtls_aes_context *ctx, const unsigned char *key, int mbedtls_aes_setkey_enc( mbedtls_aes_context *ctx, const unsigned char *key,
unsigned int keysize ); unsigned int keybits );
/** /**
* \brief AES key schedule (decryption) * \brief AES key schedule (decryption)
* *
* \param ctx AES context to be initialized * \param ctx AES context to be initialized
* \param key decryption key * \param key decryption key
* \param keysize must be 128, 192 or 256 * \param keybits must be 128, 192 or 256
* *
* \return 0 if successful, or MBEDTLS_ERR_AES_INVALID_KEY_LENGTH * \return 0 if successful, or MBEDTLS_ERR_AES_INVALID_KEY_LENGTH
*/ */
int mbedtls_aes_setkey_dec( mbedtls_aes_context *ctx, const unsigned char *key, int mbedtls_aes_setkey_dec( mbedtls_aes_context *ctx, const unsigned char *key,
unsigned int keysize ); unsigned int keybits );
/** /**
* \brief AES-ECB block encryption/decryption * \brief AES-ECB block encryption/decryption

4
include/mbedtls/asn1.h
View file

@ -119,7 +119,7 @@ extern "C" {
typedef struct mbedtls_asn1_buf typedef struct mbedtls_asn1_buf
{ {
int tag; /**< ASN1 type, e.g. MBEDTLS_ASN1_UTF8_STRING. */ int tag; /**< ASN1 type, e.g. MBEDTLS_ASN1_UTF8_STRING. */
size_t len; /**< ASN1 length, e.g. in octets. */ size_t len; /**< ASN1 length, in octets. */
unsigned char *p; /**< ASN1 data, e.g. in ASCII. */ unsigned char *p; /**< ASN1 data, e.g. in ASCII. */
} }
mbedtls_asn1_buf; mbedtls_asn1_buf;
@ -129,7 +129,7 @@ mbedtls_asn1_buf;
*/ */
typedef struct mbedtls_asn1_bitstring typedef struct mbedtls_asn1_bitstring
{ {
size_t len; /**< ASN1 length, e.g. in octets. */ size_t len; /**< ASN1 length, in octets. */
unsigned char unused_bits; /**< Number of unused bits at the end of the string */ unsigned char unused_bits; /**< Number of unused bits at the end of the string */
unsigned char *p; /**< Raw ASN1 data for the bit string */ unsigned char *p; /**< Raw ASN1 data for the bit string */
} }

4
include/mbedtls/blowfish.h
View file

@ -80,12 +80,12 @@ void mbedtls_blowfish_free( mbedtls_blowfish_context *ctx );
* *
* \param ctx Blowfish context to be initialized * \param ctx Blowfish context to be initialized
* \param key encryption key * \param key encryption key
* \param keysize must be between 32 and 448 bits * \param keybits must be between 32 and 448 bits
* *
* \return 0 if successful, or MBEDTLS_ERR_BLOWFISH_INVALID_KEY_LENGTH * \return 0 if successful, or MBEDTLS_ERR_BLOWFISH_INVALID_KEY_LENGTH
*/ */
int mbedtls_blowfish_setkey( mbedtls_blowfish_context *ctx, const unsigned char *key, int mbedtls_blowfish_setkey( mbedtls_blowfish_context *ctx, const unsigned char *key,
unsigned int keysize ); unsigned int keybits );
/** /**
* \brief Blowfish-ECB block encryption/decryption * \brief Blowfish-ECB block encryption/decryption

8
include/mbedtls/camellia.h
View file

@ -76,24 +76,24 @@ void mbedtls_camellia_free( mbedtls_camellia_context *ctx );
* *
* \param ctx CAMELLIA context to be initialized * \param ctx CAMELLIA context to be initialized
* \param key encryption key * \param key encryption key
* \param keysize must be 128, 192 or 256 * \param keybits must be 128, 192 or 256
* *
* \return 0 if successful, or MBEDTLS_ERR_CAMELLIA_INVALID_KEY_LENGTH * \return 0 if successful, or MBEDTLS_ERR_CAMELLIA_INVALID_KEY_LENGTH
*/ */
int mbedtls_camellia_setkey_enc( mbedtls_camellia_context *ctx, const unsigned char *key, int mbedtls_camellia_setkey_enc( mbedtls_camellia_context *ctx, const unsigned char *key,
unsigned int keysize ); unsigned int keybits );
/** /**
* \brief CAMELLIA key schedule (decryption) * \brief CAMELLIA key schedule (decryption)
* *
* \param ctx CAMELLIA context to be initialized * \param ctx CAMELLIA context to be initialized
* \param key decryption key * \param key decryption key
* \param keysize must be 128, 192 or 256 * \param keybits must be 128, 192 or 256
* *
* \return 0 if successful, or MBEDTLS_ERR_CAMELLIA_INVALID_KEY_LENGTH * \return 0 if successful, or MBEDTLS_ERR_CAMELLIA_INVALID_KEY_LENGTH
*/ */
int mbedtls_camellia_setkey_dec( mbedtls_camellia_context *ctx, const unsigned char *key, int mbedtls_camellia_setkey_dec( mbedtls_camellia_context *ctx, const unsigned char *key,
unsigned int keysize ); unsigned int keybits );
/** /**
* \brief CAMELLIA-ECB block encryption/decryption * \brief CAMELLIA-ECB block encryption/decryption

4
include/mbedtls/ccm.h
View file

@ -56,14 +56,14 @@ void mbedtls_ccm_init( mbedtls_ccm_context *ctx );
* \param ctx CCM context to be initialized * \param ctx CCM context to be initialized
* \param cipher cipher to use (a 128-bit block cipher) * \param cipher cipher to use (a 128-bit block cipher)
* \param key encryption key * \param key encryption key
* \param keysize key size in bits (must be acceptable by the cipher) * \param keybits key size in bits (must be acceptable by the cipher)
* *
* \return 0 if successful, or a cipher specific error code * \return 0 if successful, or a cipher specific error code
*/ */
int mbedtls_ccm_setkey( mbedtls_ccm_context *ctx, int mbedtls_ccm_setkey( mbedtls_ccm_context *ctx,
mbedtls_cipher_id_t cipher, mbedtls_cipher_id_t cipher,
const unsigned char *key, const unsigned char *key,
unsigned int keysize ); unsigned int keybits );
/** /**
* \brief Free a CCM context and underlying cipher sub-context * \brief Free a CCM context and underlying cipher sub-context

8
include/mbedtls/cipher.h
View file

@ -282,14 +282,14 @@ const mbedtls_cipher_info_t *mbedtls_cipher_info_from_type( const mbedtls_cipher
* *
* \param cipher_id Id of the cipher to search for * \param cipher_id Id of the cipher to search for
* (e.g. MBEDTLS_CIPHER_ID_AES) * (e.g. MBEDTLS_CIPHER_ID_AES)
* \param key_length Length of the key in bits * \param key_bitlen Length of the key in bits
* \param mode Cipher mode (e.g. MBEDTLS_MODE_CBC) * \param mode Cipher mode (e.g. MBEDTLS_MODE_CBC)
* *
* \return the cipher information structure associated with the * \return the cipher information structure associated with the
* given cipher_type, or NULL if not found. * given cipher_type, or NULL if not found.
*/ */
const mbedtls_cipher_info_t *mbedtls_cipher_info_from_values( const mbedtls_cipher_id_t cipher_id, const mbedtls_cipher_info_t *mbedtls_cipher_info_from_values( const mbedtls_cipher_id_t cipher_id,
int key_length, int key_bitlen,
const mbedtls_cipher_mode_t mode ); const mbedtls_cipher_mode_t mode );
/** /**
@ -447,7 +447,7 @@ static inline mbedtls_operation_t mbedtls_cipher_get_operation( const mbedtls_ci
* initialised using cipher_context_from_type or * initialised using cipher_context_from_type or
* cipher_context_from_string. * cipher_context_from_string.
* \param key The key to use. * \param key The key to use.
* \param key_length key length to use, in bits. * \param key_bitlen key length to use, in bits.
* \param operation Operation that the key will be used for, either * \param operation Operation that the key will be used for, either
* MBEDTLS_ENCRYPT or MBEDTLS_DECRYPT. * MBEDTLS_ENCRYPT or MBEDTLS_DECRYPT.
* *
@ -456,7 +456,7 @@ static inline mbedtls_operation_t mbedtls_cipher_get_operation( const mbedtls_ci
* error code. * error code.
*/ */
int mbedtls_cipher_setkey( mbedtls_cipher_context_t *ctx, const unsigned char *key, int mbedtls_cipher_setkey( mbedtls_cipher_context_t *ctx, const unsigned char *key,
int key_length, const mbedtls_operation_t operation ); int key_bitlen, const mbedtls_operation_t operation );
#if defined(MBEDTLS_CIPHER_MODE_WITH_PADDING) #if defined(MBEDTLS_CIPHER_MODE_WITH_PADDING)
/** /**

4
include/mbedtls/gcm.h
View file

@ -69,14 +69,14 @@ void mbedtls_gcm_init( mbedtls_gcm_context *ctx );
* \param ctx GCM context to be initialized * \param ctx GCM context to be initialized
* \param cipher cipher to use (a 128-bit block cipher) * \param cipher cipher to use (a 128-bit block cipher)
* \param key encryption key * \param key encryption key
* \param keysize must be 128, 192 or 256 * \param keybits must be 128, 192 or 256
* *
* \return 0 if successful, or a cipher specific error code * \return 0 if successful, or a cipher specific error code
*/ */
int mbedtls_gcm_setkey( mbedtls_gcm_context *ctx, int mbedtls_gcm_setkey( mbedtls_gcm_context *ctx,
mbedtls_cipher_id_t cipher, mbedtls_cipher_id_t cipher,
const unsigned char *key, const unsigned char *key,
unsigned int keysize ); unsigned int keybits );
/** /**
* \brief GCM buffer encryption/decryption using a block cipher * \brief GCM buffer encryption/decryption using a block cipher

6
include/mbedtls/md.h
View file

@ -172,7 +172,7 @@ int mbedtls_md_setup( mbedtls_md_context_t *ctx, const mbedtls_md_info_t *md_inf
* *
* \param md_info message digest info * \param md_info message digest info
* *
* \return size of the message digest output. * \return size of the message digest output in bytes.
*/ */
unsigned char mbedtls_md_get_size( const mbedtls_md_info_t *md_info ); unsigned char mbedtls_md_get_size( const mbedtls_md_info_t *md_info );
@ -269,7 +269,7 @@ int mbedtls_md_file( const mbedtls_md_info_t *md_info, const char *path,
* *
* \param ctx HMAC context * \param ctx HMAC context
* \param key HMAC secret key * \param key HMAC secret key
* \param keylen length of the HMAC key * \param keylen length of the HMAC key in bytes
* *
* \returns 0 on success, MBEDTLS_ERR_MD_BAD_INPUT_DATA if parameter * \returns 0 on success, MBEDTLS_ERR_MD_BAD_INPUT_DATA if parameter
* verification fails. * verification fails.
@ -323,7 +323,7 @@ int mbedtls_md_hmac_reset( mbedtls_md_context_t *ctx );
* *
* \param md_info message digest info * \param md_info message digest info
* \param key HMAC secret key * \param key HMAC secret key
* \param keylen length of the HMAC key * \param keylen length of the HMAC key in bytes
* \param input buffer holding the data * \param input buffer holding the data
* \param ilen length of the input data * \param ilen length of the input data
* \param output Generic HMAC-result * \param output Generic HMAC-result

4
include/mbedtls/md_internal.h
View file

@ -52,10 +52,10 @@ struct mbedtls_md_info_t
/** Name of the message digest */ /** Name of the message digest */
const char * name; const char * name;
/** Output length of the digest function */ /** Output length of the digest function in bytes */
int size; int size;
/** Block length of the digest function */ /** Block length of the digest function in bytes */
int block_size; int block_size;
/** Digest initialisation function */ /** Digest initialisation function */

14
library/aes.c
View file

@ -483,7 +483,7 @@ void mbedtls_aes_free( mbedtls_aes_context *ctx )
*/ */
#if !defined(MBEDTLS_AES_SETKEY_ENC_ALT) #if !defined(MBEDTLS_AES_SETKEY_ENC_ALT)
int mbedtls_aes_setkey_enc( mbedtls_aes_context *ctx, const unsigned char *key, int mbedtls_aes_setkey_enc( mbedtls_aes_context *ctx, const unsigned char *key,
unsigned int keysize ) unsigned int keybits )
{ {
unsigned int i; unsigned int i;
uint32_t *RK; uint32_t *RK;
@ -497,7 +497,7 @@ int mbedtls_aes_setkey_enc( mbedtls_aes_context *ctx, const unsigned char *key,
} }
#endif #endif
switch( keysize ) switch( keybits )
{ {
case 128: ctx->nr = 10; break; case 128: ctx->nr = 10; break;
case 192: ctx->nr = 12; break; case 192: ctx->nr = 12; break;
@ -517,10 +517,10 @@ int mbedtls_aes_setkey_enc( mbedtls_aes_context *ctx, const unsigned char *key,
#if defined(MBEDTLS_AESNI_C) && defined(MBEDTLS_HAVE_X86_64) #if defined(MBEDTLS_AESNI_C) && defined(MBEDTLS_HAVE_X86_64)
if( mbedtls_aesni_has_support( MBEDTLS_AESNI_AES ) ) if( mbedtls_aesni_has_support( MBEDTLS_AESNI_AES ) )
return( mbedtls_aesni_setkey_enc( (unsigned char *) ctx->rk, key, keysize ) ); return( mbedtls_aesni_setkey_enc( (unsigned char *) ctx->rk, key, keybits ) );
#endif #endif
for( i = 0; i < ( keysize >> 5 ); i++ ) for( i = 0; i < ( keybits >> 5 ); i++ )
{ {
GET_UINT32_LE( RK[i], key, i << 2 ); GET_UINT32_LE( RK[i], key, i << 2 );
} }
@ -597,7 +597,7 @@ int mbedtls_aes_setkey_enc( mbedtls_aes_context *ctx, const unsigned char *key,
*/ */
#if !defined(MBEDTLS_AES_SETKEY_DEC_ALT) #if !defined(MBEDTLS_AES_SETKEY_DEC_ALT)
int mbedtls_aes_setkey_dec( mbedtls_aes_context *ctx, const unsigned char *key, int mbedtls_aes_setkey_dec( mbedtls_aes_context *ctx, const unsigned char *key,
unsigned int keysize ) unsigned int keybits )
{ {
int i, j, ret; int i, j, ret;
mbedtls_aes_context cty; mbedtls_aes_context cty;
@ -616,8 +616,8 @@ int mbedtls_aes_setkey_dec( mbedtls_aes_context *ctx, const unsigned char *key,
#endif #endif
ctx->rk = RK = ctx->buf; ctx->rk = RK = ctx->buf;
/* Also checks keysize */ /* Also checks keybits */
if( ( ret = mbedtls_aes_setkey_enc( &cty, key, keysize ) ) != 0 ) if( ( ret = mbedtls_aes_setkey_enc( &cty, key, keybits ) ) != 0 )
goto exit; goto exit;
ctx->nr = cty.nr; ctx->nr = cty.nr;

10
library/blowfish.c
View file

@ -173,18 +173,18 @@ void mbedtls_blowfish_free( mbedtls_blowfish_context *ctx )
* Blowfish key schedule * Blowfish key schedule
*/ */
int mbedtls_blowfish_setkey( mbedtls_blowfish_context *ctx, const unsigned char *key, int mbedtls_blowfish_setkey( mbedtls_blowfish_context *ctx, const unsigned char *key,
unsigned int keysize ) unsigned int keybits )
{ {
unsigned int i, j, k; unsigned int i, j, k;
uint32_t data, datal, datar; uint32_t data, datal, datar;
if( keysize < MBEDTLS_BLOWFISH_MIN_KEY || keysize > MBEDTLS_BLOWFISH_MAX_KEY || if( keybits < MBEDTLS_BLOWFISH_MIN_KEY || keybits > MBEDTLS_BLOWFISH_MAX_KEY ||
( keysize % 8 ) ) ( keybits % 8 ) )
{ {
return( MBEDTLS_ERR_BLOWFISH_INVALID_KEY_LENGTH ); return( MBEDTLS_ERR_BLOWFISH_INVALID_KEY_LENGTH );
} }
keysize >>= 3; keybits >>= 3;
for( i = 0; i < 4; i++ ) for( i = 0; i < 4; i++ )
{ {
@ -199,7 +199,7 @@ int mbedtls_blowfish_setkey( mbedtls_blowfish_context *ctx, const unsigned char
for( k = 0; k < 4; ++k ) for( k = 0; k < 4; ++k )
{ {
data = ( data << 8 ) | key[j++]; data = ( data << 8 ) | key[j++];
if( j >= keysize ) if( j >= keybits )
j = 0; j = 0;
} }
ctx->P[i] = P[i] ^ data; ctx->P[i] = P[i] ^ data;

20
library/camellia.c
View file

@ -341,7 +341,7 @@ void mbedtls_camellia_free( mbedtls_camellia_context *ctx )
* Camellia key schedule (encryption) * Camellia key schedule (encryption)
*/ */
int mbedtls_camellia_setkey_enc( mbedtls_camellia_context *ctx, const unsigned char *key, int mbedtls_camellia_setkey_enc( mbedtls_camellia_context *ctx, const unsigned char *key,
unsigned int keysize ) unsigned int keybits )
{ {
int idx; int idx;
size_t i; size_t i;
@ -356,7 +356,7 @@ int mbedtls_camellia_setkey_enc( mbedtls_camellia_context *ctx, const unsigned c
memset( t, 0, 64 ); memset( t, 0, 64 );
memset( RK, 0, sizeof(ctx->rk) ); memset( RK, 0, sizeof(ctx->rk) );
switch( keysize ) switch( keybits )
{ {
case 128: ctx->nr = 3; idx = 0; break; case 128: ctx->nr = 3; idx = 0; break;
case 192: case 192:
@ -364,10 +364,10 @@ int mbedtls_camellia_setkey_enc( mbedtls_camellia_context *ctx, const unsigned c
default : return( MBEDTLS_ERR_CAMELLIA_INVALID_KEY_LENGTH ); default : return( MBEDTLS_ERR_CAMELLIA_INVALID_KEY_LENGTH );
} }
for( i = 0; i < keysize / 8; ++i ) for( i = 0; i < keybits / 8; ++i )
t[i] = key[i]; t[i] = key[i];
if( keysize == 192 ) { if( keybits == 192 ) {
for( i = 0; i < 8; i++ ) for( i = 0; i < 8; i++ )
t[24 + i] = ~t[16 + i]; t[24 + i] = ~t[16 + i];
} }
@ -403,7 +403,7 @@ int mbedtls_camellia_setkey_enc( mbedtls_camellia_context *ctx, const unsigned c
camellia_feistel( KC + 8, SIGMA[2], KC + 10 ); camellia_feistel( KC + 8, SIGMA[2], KC + 10 );
camellia_feistel( KC + 10, SIGMA[3], KC + 8 ); camellia_feistel( KC + 10, SIGMA[3], KC + 8 );
if( keysize > 128 ) { if( keybits > 128 ) {
/* Generate KB */ /* Generate KB */
for( i = 0; i < 4; ++i ) for( i = 0; i < 4; ++i )
KC[12 + i] = KC[4 + i] ^ KC[8 + i]; KC[12 + i] = KC[4 + i] ^ KC[8 + i];
@ -420,7 +420,7 @@ int mbedtls_camellia_setkey_enc( mbedtls_camellia_context *ctx, const unsigned c
SHIFT_AND_PLACE( idx, 0 ); SHIFT_AND_PLACE( idx, 0 );
/* Manipulating KR */ /* Manipulating KR */
if( keysize > 128 ) { if( keybits > 128 ) {
SHIFT_AND_PLACE( idx, 1 ); SHIFT_AND_PLACE( idx, 1 );
} }
@ -428,7 +428,7 @@ int mbedtls_camellia_setkey_enc( mbedtls_camellia_context *ctx, const unsigned c
SHIFT_AND_PLACE( idx, 2 ); SHIFT_AND_PLACE( idx, 2 );
/* Manipulating KB */ /* Manipulating KB */
if( keysize > 128 ) { if( keybits > 128 ) {
SHIFT_AND_PLACE( idx, 3 ); SHIFT_AND_PLACE( idx, 3 );
} }
@ -446,7 +446,7 @@ int mbedtls_camellia_setkey_enc( mbedtls_camellia_context *ctx, const unsigned c
* Camellia key schedule (decryption) * Camellia key schedule (decryption)
*/ */
int mbedtls_camellia_setkey_dec( mbedtls_camellia_context *ctx, const unsigned char *key, int mbedtls_camellia_setkey_dec( mbedtls_camellia_context *ctx, const unsigned char *key,
unsigned int keysize ) unsigned int keybits )
{ {
int idx, ret; int idx, ret;
size_t i; size_t i;
@ -456,8 +456,8 @@ int mbedtls_camellia_setkey_dec( mbedtls_camellia_context *ctx, const unsigned c
mbedtls_camellia_init( &cty ); mbedtls_camellia_init( &cty );
/* Also checks keysize */ /* Also checks keybits */
if( ( ret = mbedtls_camellia_setkey_enc( &cty, key, keysize ) ) != 0 ) if( ( ret = mbedtls_camellia_setkey_enc( &cty, key, keybits ) ) != 0 )
goto exit; goto exit;
ctx->nr = cty.nr; ctx->nr = cty.nr;

6
library/ccm.c
View file

@ -69,12 +69,12 @@ void mbedtls_ccm_init( mbedtls_ccm_context *ctx )
int mbedtls_ccm_setkey( mbedtls_ccm_context *ctx, int mbedtls_ccm_setkey( mbedtls_ccm_context *ctx,
mbedtls_cipher_id_t cipher, mbedtls_cipher_id_t cipher,
const unsigned char *key, const unsigned char *key,
unsigned int keysize ) unsigned int keybits )
{ {
int ret; int ret;
const mbedtls_cipher_info_t *cipher_info; const mbedtls_cipher_info_t *cipher_info;
cipher_info = mbedtls_cipher_info_from_values( cipher, keysize, MBEDTLS_MODE_ECB ); cipher_info = mbedtls_cipher_info_from_values( cipher, keybits, MBEDTLS_MODE_ECB );
if( cipher_info == NULL ) if( cipher_info == NULL )
return( MBEDTLS_ERR_CCM_BAD_INPUT ); return( MBEDTLS_ERR_CCM_BAD_INPUT );
@ -86,7 +86,7 @@ int mbedtls_ccm_setkey( mbedtls_ccm_context *ctx,
if( ( ret = mbedtls_cipher_setup( &ctx->cipher_ctx, cipher_info ) ) != 0 ) if( ( ret = mbedtls_cipher_setup( &ctx->cipher_ctx, cipher_info ) ) != 0 )
return( ret ); return( ret );
if( ( ret = mbedtls_cipher_setkey( &ctx->cipher_ctx, key, keysize, if( ( ret = mbedtls_cipher_setkey( &ctx->cipher_ctx, key, keybits,
MBEDTLS_ENCRYPT ) ) != 0 ) MBEDTLS_ENCRYPT ) ) != 0 )
{ {
return( ret ); return( ret );

10
library/cipher.c
View file

@ -104,14 +104,14 @@ const mbedtls_cipher_info_t *mbedtls_cipher_info_from_string( const char *cipher
} }
const mbedtls_cipher_info_t *mbedtls_cipher_info_from_values( const mbedtls_cipher_id_t cipher_id, const mbedtls_cipher_info_t *mbedtls_cipher_info_from_values( const mbedtls_cipher_id_t cipher_id,
int key_length, int key_bitlen,
const mbedtls_cipher_mode_t mode ) const mbedtls_cipher_mode_t mode )
{ {
const mbedtls_cipher_definition_t *def; const mbedtls_cipher_definition_t *def;
for( def = mbedtls_cipher_definitions; def->info != NULL; def++ ) for( def = mbedtls_cipher_definitions; def->info != NULL; def++ )
if( def->info->base->cipher == cipher_id && if( def->info->base->cipher == cipher_id &&
def->info->key_length == (unsigned) key_length && def->info->key_length == (unsigned) key_bitlen &&
def->info->mode == mode ) def->info->mode == mode )
return( def->info ); return( def->info );
@ -161,18 +161,18 @@ int mbedtls_cipher_setup( mbedtls_cipher_context_t *ctx, const mbedtls_cipher_in
} }
int mbedtls_cipher_setkey( mbedtls_cipher_context_t *ctx, const unsigned char *key, int mbedtls_cipher_setkey( mbedtls_cipher_context_t *ctx, const unsigned char *key,
int key_length, const mbedtls_operation_t operation ) int key_bitlen, const mbedtls_operation_t operation )
{ {
if( NULL == ctx || NULL == ctx->cipher_info ) if( NULL == ctx || NULL == ctx->cipher_info )
return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA ); return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
if( ( ctx->cipher_info->flags & MBEDTLS_CIPHER_VARIABLE_KEY_LEN ) == 0 && if( ( ctx->cipher_info->flags & MBEDTLS_CIPHER_VARIABLE_KEY_LEN ) == 0 &&
(int) ctx->cipher_info->key_length != key_length ) (int) ctx->cipher_info->key_length != key_bitlen )
{ {
return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA ); return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
} }
ctx->key_length = key_length; ctx->key_length = key_bitlen;
ctx->operation = operation; ctx->operation = operation;
/* /*

6
library/gcm.c
View file

@ -162,12 +162,12 @@ static int gcm_gen_table( mbedtls_gcm_context *ctx )
int mbedtls_gcm_setkey( mbedtls_gcm_context *ctx, int mbedtls_gcm_setkey( mbedtls_gcm_context *ctx,
mbedtls_cipher_id_t cipher, mbedtls_cipher_id_t cipher,
const unsigned char *key, const unsigned char *key,
unsigned int keysize ) unsigned int keybits )
{ {
int ret; int ret;
const mbedtls_cipher_info_t *cipher_info; const mbedtls_cipher_info_t *cipher_info;
cipher_info = mbedtls_cipher_info_from_values( cipher, keysize, MBEDTLS_MODE_ECB ); cipher_info = mbedtls_cipher_info_from_values( cipher, keybits, MBEDTLS_MODE_ECB );
if( cipher_info == NULL ) if( cipher_info == NULL )
return( MBEDTLS_ERR_GCM_BAD_INPUT ); return( MBEDTLS_ERR_GCM_BAD_INPUT );
@ -179,7 +179,7 @@ int mbedtls_gcm_setkey( mbedtls_gcm_context *ctx,
if( ( ret = mbedtls_cipher_setup( &ctx->cipher_ctx, cipher_info ) ) != 0 ) if( ( ret = mbedtls_cipher_setup( &ctx->cipher_ctx, cipher_info ) ) != 0 )
return( ret ); return( ret );
if( ( ret = mbedtls_cipher_setkey( &ctx->cipher_ctx, key, keysize, if( ( ret = mbedtls_cipher_setkey( &ctx->cipher_ctx, key, keybits,
MBEDTLS_ENCRYPT ) ) != 0 ) MBEDTLS_ENCRYPT ) ) != 0 )
{ {
return( ret ); return( ret );