From 5ea6bb06a7532d88fcb09e1e54d6321eec137914 Mon Sep 17 00:00:00 2001 From: Dave Rodgman Date: Wed, 20 Sep 2023 20:14:15 +0100 Subject: [PATCH] Add cast for MSVC Signed-off-by: Dave Rodgman --- library/cipher.c | 6 +++--- library/nist_kw.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/library/cipher.c b/library/cipher.c index 06199919a5..09ca686d82 100644 --- a/library/cipher.c +++ b/library/cipher.c @@ -759,7 +759,7 @@ static int get_pkcs_padding(unsigned char *input, size_t input_len, size_t mask = mbedtls_ct_size_mask_ge(i, pad_idx); bad |= (input[i] ^ padding_len) & mask; } - return -mbedtls_ct_uint_if(bad, -MBEDTLS_ERR_CIPHER_INVALID_PADDING, 0); + return -(int) mbedtls_ct_uint_if(bad, -MBEDTLS_ERR_CIPHER_INVALID_PADDING, 0); } #endif /* MBEDTLS_CIPHER_PADDING_PKCS7 */ @@ -804,7 +804,7 @@ static int get_one_and_zeros_padding(unsigned char *input, size_t input_len, in_padding = in_padding & ~is_nonzero; } - return -mbedtls_ct_uint_if(bad, -MBEDTLS_ERR_CIPHER_INVALID_PADDING, 0); + return -(int) mbedtls_ct_uint_if(bad, -MBEDTLS_ERR_CIPHER_INVALID_PADDING, 0); } #endif /* MBEDTLS_CIPHER_PADDING_ONE_AND_ZEROS */ @@ -848,7 +848,7 @@ static int get_zeros_and_len_padding(unsigned char *input, size_t input_len, bad |= input[i] & mask; } - return -mbedtls_ct_uint_if(bad, -MBEDTLS_ERR_CIPHER_INVALID_PADDING, 0); + return -(int) mbedtls_ct_uint_if(bad, -MBEDTLS_ERR_CIPHER_INVALID_PADDING, 0); } #endif /* MBEDTLS_CIPHER_PADDING_ZEROS_AND_LEN */ diff --git a/library/nist_kw.c b/library/nist_kw.c index f2fd82e6b5..4ff5e41b46 100644 --- a/library/nist_kw.c +++ b/library/nist_kw.c @@ -421,7 +421,7 @@ int mbedtls_nist_kw_unwrap(mbedtls_nist_kw_context *ctx, * larger than 8, because of the type wrap around. */ padlen = in_len - KW_SEMIBLOCK_LENGTH - Plen; - ret = -mbedtls_ct_uint_if(padlen & ~7, -MBEDTLS_ERR_CIPHER_AUTH_FAILED, -ret); + ret = -(int) mbedtls_ct_uint_if(padlen & ~7, -MBEDTLS_ERR_CIPHER_AUTH_FAILED, -ret); padlen &= 7; /* Check padding in "constant-time" */