eden-emu/mbedtls
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix some compiler type warnings

Browse source 
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
This commit is contained in:
Dave Rodgman 2023-06-24 16:53:13 +01:00
parent a2e2fce60d
commit e59b9d44b1
3 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
include/mbedtls/cipher.h
View file

@ -276,38 +276,38 @@ typedef struct mbedtls_cipher_info_t {
const char *MBEDTLS_PRIVATE(name); const char *MBEDTLS_PRIVATE(name);
/** Index to LUT for base cipher information and functions. */ /** Index to LUT for base cipher information and functions. */
uint8_t MBEDTLS_PRIVATE(base_idx) : 5; unsigned int MBEDTLS_PRIVATE(base_idx) : 5;
/** Full cipher identifier (as per mbedtls_cipher_type_t). /** Full cipher identifier (as per mbedtls_cipher_type_t).
* For example, MBEDTLS_CIPHER_AES_256_CBC. * For example, MBEDTLS_CIPHER_AES_256_CBC.
*/ */
uint8_t MBEDTLS_PRIVATE(type) : 7; unsigned int MBEDTLS_PRIVATE(type) : 7;
/** The cipher mode (as per mbedtls_cipher_mode_t). /** The cipher mode (as per mbedtls_cipher_mode_t).
* For example, MBEDTLS_MODE_CBC. * For example, MBEDTLS_MODE_CBC.
*/ */
uint8_t MBEDTLS_PRIVATE(mode) : 4; unsigned int MBEDTLS_PRIVATE(mode) : 4;
/** The cipher key length, in bits. This is the /** The cipher key length, in bits. This is the
* default length for variable sized ciphers. * default length for variable sized ciphers.
* Includes parity bits for ciphers like DES. * Includes parity bits for ciphers like DES.
*/ */
uint8_t MBEDTLS_PRIVATE(key_bitlen) : 4; unsigned int MBEDTLS_PRIVATE(key_bitlen) : 4;
/** IV or nonce size, in Bytes. /** IV or nonce size, in Bytes.
* For ciphers that accept variable IV sizes, * For ciphers that accept variable IV sizes,
* this is the recommended size. * this is the recommended size.
*/ */
uint8_t MBEDTLS_PRIVATE(iv_size) : 3; unsigned int MBEDTLS_PRIVATE(iv_size) : 3;
/** Bitflag comprised of MBEDTLS_CIPHER_VARIABLE_IV_LEN and /** Bitflag comprised of MBEDTLS_CIPHER_VARIABLE_IV_LEN and
* MBEDTLS_CIPHER_VARIABLE_KEY_LEN indicating whether the * MBEDTLS_CIPHER_VARIABLE_KEY_LEN indicating whether the
* cipher supports variable IV or variable key sizes, respectively. * cipher supports variable IV or variable key sizes, respectively.
*/ */
uint8_t MBEDTLS_PRIVATE(flags) : 2; unsigned int MBEDTLS_PRIVATE(flags) : 2;
/** The block size, in bytes. */ /** The block size, in bytes. */
uint8_t MBEDTLS_PRIVATE(block_size) : 2; unsigned int MBEDTLS_PRIVATE(block_size) : 2;
} mbedtls_cipher_info_t; } mbedtls_cipher_info_t;
@ -446,7 +446,7 @@ static inline mbedtls_cipher_type_t mbedtls_cipher_info_get_type(
if (info == NULL) { if (info == NULL) {
return MBEDTLS_CIPHER_NONE; return MBEDTLS_CIPHER_NONE;
} else { } else {
return info->MBEDTLS_PRIVATE(type); return (mbedtls_cipher_type_t) info->MBEDTLS_PRIVATE(type);
} }
} }
@ -465,7 +465,7 @@ static inline mbedtls_cipher_mode_t mbedtls_cipher_info_get_mode(
if (info == NULL) { if (info == NULL) {
return MBEDTLS_MODE_NONE; return MBEDTLS_MODE_NONE;
} else { } else {
return info->MBEDTLS_PRIVATE(mode); return (mbedtls_cipher_mode_t) info->MBEDTLS_PRIVATE(mode);
} }
} }
@ -711,7 +711,7 @@ static inline mbedtls_cipher_mode_t mbedtls_cipher_get_cipher_mode(
return MBEDTLS_MODE_NONE; return MBEDTLS_MODE_NONE;
} }
return ctx->MBEDTLS_PRIVATE(cipher_info)->MBEDTLS_PRIVATE(mode); return (mbedtls_cipher_mode_t) ctx->MBEDTLS_PRIVATE(cipher_info)->MBEDTLS_PRIVATE(mode);
} }
/** /**
@ -757,7 +757,7 @@ static inline mbedtls_cipher_type_t mbedtls_cipher_get_type(
return MBEDTLS_CIPHER_NONE; return MBEDTLS_CIPHER_NONE;
} }
return ctx->MBEDTLS_PRIVATE(cipher_info)->MBEDTLS_PRIVATE(type); return (mbedtls_cipher_type_t) ctx->MBEDTLS_PRIVATE(cipher_info)->MBEDTLS_PRIVATE(type);
} }
/** /**

2
library/pkcs12.c
View file

@ -151,7 +151,7 @@ int mbedtls_pkcs12_pbe(mbedtls_asn1_buf *pbe_params, int mode,
return MBEDTLS_ERR_PKCS12_FEATURE_UNAVAILABLE; return MBEDTLS_ERR_PKCS12_FEATURE_UNAVAILABLE;
} }
keylen = mbedtls_cipher_info_get_key_bitlen(cipher_info) / 8; keylen = (int) mbedtls_cipher_info_get_key_bitlen(cipher_info) / 8;
if ((ret = pkcs12_pbe_derive_key_iv(pbe_params, md_type, pwd, pwdlen, if ((ret = pkcs12_pbe_derive_key_iv(pbe_params, md_type, pwd, pwdlen,
key, keylen, key, keylen,

2
library/pkcs5.c
View file

@ -176,7 +176,7 @@ int mbedtls_pkcs5_pbes2(const mbedtls_asn1_buf *pbe_params, int mode,
* The value of keylen from pkcs5_parse_pbkdf2_params() is ignored * The value of keylen from pkcs5_parse_pbkdf2_params() is ignored
* since it is optional and we don't know if it was set or not * since it is optional and we don't know if it was set or not
*/ */
keylen = mbedtls_cipher_info_get_key_bitlen(cipher_info) / 8; keylen = (int) mbedtls_cipher_info_get_key_bitlen(cipher_info) / 8;
if (enc_scheme_params.tag != MBEDTLS_ASN1_OCTET_STRING || if (enc_scheme_params.tag != MBEDTLS_ASN1_OCTET_STRING ||
enc_scheme_params.len != mbedtls_cipher_info_get_iv_size(cipher_info)) { enc_scheme_params.len != mbedtls_cipher_info_get_iv_size(cipher_info)) {