Fix remaining warnings from -Wshorten-64-to-32
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
This commit is contained in:
parent
aa74165948
commit
b4cb8bef42
2 changed files with 3 additions and 2 deletions
|
@ -334,7 +334,7 @@ static void aesce_setkey_enc(unsigned char *rk,
|
||||||
* - Section 5, Nr = Nk + 6
|
* - Section 5, Nr = Nk + 6
|
||||||
* - Section 5.2, the length of round keys is Nb*(Nr+1)
|
* - Section 5.2, the length of round keys is Nb*(Nr+1)
|
||||||
*/
|
*/
|
||||||
const uint32_t key_len_in_words = key_bit_length / 32; /* Nk */
|
const size_t key_len_in_words = key_bit_length / 32; /* Nk */
|
||||||
const size_t round_key_len_in_words = 4; /* Nb */
|
const size_t round_key_len_in_words = 4; /* Nb */
|
||||||
const size_t rounds_needed = key_len_in_words + 6; /* Nr */
|
const size_t rounds_needed = key_len_in_words + 6; /* Nr */
|
||||||
const size_t round_keys_len_in_words =
|
const size_t round_keys_len_in_words =
|
||||||
|
|
|
@ -65,7 +65,8 @@ static int local_err_translation(psa_status_t status)
|
||||||
#define H_TREE_HEIGHT_MAX 10
|
#define H_TREE_HEIGHT_MAX 10
|
||||||
#define MERKLE_TREE_NODE_AM(type) ((size_t) 1 << (MBEDTLS_LMS_H_TREE_HEIGHT(type) + 1u))
|
#define MERKLE_TREE_NODE_AM(type) ((size_t) 1 << (MBEDTLS_LMS_H_TREE_HEIGHT(type) + 1u))
|
||||||
#define MERKLE_TREE_LEAF_NODE_AM(type) ((size_t) 1 << MBEDTLS_LMS_H_TREE_HEIGHT(type))
|
#define MERKLE_TREE_LEAF_NODE_AM(type) ((size_t) 1 << MBEDTLS_LMS_H_TREE_HEIGHT(type))
|
||||||
#define MERKLE_TREE_INTERNAL_NODE_AM(type) ((size_t) 1 << MBEDTLS_LMS_H_TREE_HEIGHT(type))
|
#define MERKLE_TREE_INTERNAL_NODE_AM(type) ((unsigned int) \
|
||||||
|
(1u << MBEDTLS_LMS_H_TREE_HEIGHT(type)))
|
||||||
|
|
||||||
#define D_CONST_LEN (2)
|
#define D_CONST_LEN (2)
|
||||||
static const unsigned char D_LEAF_CONSTANT_BYTES[D_CONST_LEN] = { 0x82, 0x82 };
|
static const unsigned char D_LEAF_CONSTANT_BYTES[D_CONST_LEN] = { 0x82, 0x82 };
|
||||||
|
|
Loading…
Reference in a new issue