Rename relevant global symbols from size to bitlen

Just applying rename.pl with this file:

mbedtls_cipher_get_key_size mbedtls_cipher_get_key_bitlen
mbedtls_pk_get_size mbedtls_pk_get_bitlen
MBEDTLS_BLOWFISH_MIN_KEY MBEDTLS_BLOWFISH_MIN_KEY_BITS
MBEDTLS_BLOWFISH_MAX_KEY MBEDTLS_BLOWFISH_MAX_KEY_BITS
This commit is contained in:
Manuel Pégourié-Gonnard 2015-06-18 16:43:38 +02:00
parent fb317c5221
commit 097c7bb05b
11 changed files with 21 additions and 21 deletions

View file

@ -35,8 +35,8 @@
#define MBEDTLS_BLOWFISH_ENCRYPT 1
#define MBEDTLS_BLOWFISH_DECRYPT 0
#define MBEDTLS_BLOWFISH_MAX_KEY 448
#define MBEDTLS_BLOWFISH_MIN_KEY 32
#define MBEDTLS_BLOWFISH_MAX_KEY_BITS 448
#define MBEDTLS_BLOWFISH_MIN_KEY_BITS 32
#define MBEDTLS_BLOWFISH_ROUNDS 16 /**< Rounds to use. When increasing this value, make sure to extend the initialisation vectors */
#define MBEDTLS_BLOWFISH_BLOCKSIZE 8 /* Blowfish uses 64 bit blocks */

View file

@ -415,7 +415,7 @@ static inline const char *mbedtls_cipher_get_name( const mbedtls_cipher_context_
* MBEDTLS_KEY_LENGTH_NONE if ctx has not been
* initialised.
*/
static inline int mbedtls_cipher_get_key_size( const mbedtls_cipher_context_t *ctx )
static inline int mbedtls_cipher_get_key_bitlen( const mbedtls_cipher_context_t *ctx )
{
if( NULL == ctx || NULL == ctx->cipher_info )
return MBEDTLS_KEY_LENGTH_NONE;

View file

@ -709,8 +709,8 @@
#define BLOWFISH_BLOCKSIZE MBEDTLS_BLOWFISH_BLOCKSIZE
#define BLOWFISH_DECRYPT MBEDTLS_BLOWFISH_DECRYPT
#define BLOWFISH_ENCRYPT MBEDTLS_BLOWFISH_ENCRYPT
#define BLOWFISH_MAX_KEY MBEDTLS_BLOWFISH_MAX_KEY
#define BLOWFISH_MIN_KEY MBEDTLS_BLOWFISH_MIN_KEY
#define BLOWFISH_MAX_KEY MBEDTLS_BLOWFISH_MAX_KEY_BITS
#define BLOWFISH_MIN_KEY MBEDTLS_BLOWFISH_MIN_KEY_BITS
#define BLOWFISH_ROUNDS MBEDTLS_BLOWFISH_ROUNDS
#define CAMELLIA_DECRYPT MBEDTLS_CAMELLIA_DECRYPT
#define CAMELLIA_ENCRYPT MBEDTLS_CAMELLIA_ENCRYPT
@ -1855,7 +1855,7 @@
#define cipher_get_block_size mbedtls_cipher_get_block_size
#define cipher_get_cipher_mode mbedtls_cipher_get_cipher_mode
#define cipher_get_iv_size mbedtls_cipher_get_iv_size
#define cipher_get_key_size mbedtls_cipher_get_key_size
#define cipher_get_key_size mbedtls_cipher_get_key_bitlen
#define cipher_get_name mbedtls_cipher_get_name
#define cipher_get_operation mbedtls_cipher_get_operation
#define cipher_get_type mbedtls_cipher_get_type
@ -2219,7 +2219,7 @@
#define pk_free mbedtls_pk_free
#define pk_get_len mbedtls_pk_get_len
#define pk_get_name mbedtls_pk_get_name
#define pk_get_size mbedtls_pk_get_size
#define pk_get_size mbedtls_pk_get_bitlen
#define pk_get_type mbedtls_pk_get_type
#define pk_info_from_type mbedtls_pk_info_from_type
#define pk_info_t mbedtls_pk_info_t

View file

@ -229,7 +229,7 @@ int mbedtls_pk_setup_rsa_alt( mbedtls_pk_context *ctx, void * key,
*
* \return Key size in bits, or 0 on error
*/
size_t mbedtls_pk_get_size( const mbedtls_pk_context *ctx );
size_t mbedtls_pk_get_bitlen( const mbedtls_pk_context *ctx );
/**
* \brief Get the length in bytes of the underlying key
@ -239,7 +239,7 @@ size_t mbedtls_pk_get_size( const mbedtls_pk_context *ctx );
*/
static inline size_t mbedtls_pk_get_len( const mbedtls_pk_context *ctx )
{
return( ( mbedtls_pk_get_size( ctx ) + 7 ) / 8 );
return( ( mbedtls_pk_get_bitlen( ctx ) + 7 ) / 8 );
}
/**