cuberite/polarssl
1
0
Fork 0
mirror of https://github.com/cuberite/polarssl.git synced 2025-09-13 09:05:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6929 from paul-elliott-arm/fix_iar_warnings

Browse Source 
Backport 2.28: Fix IAR warnings
This commit is contained in:
Gilles Peskine 2023-02-14 20:01:03 +01:00 committed by GitHub
commit 908e810098
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog.d/fix-iar-warnings.txt
View File

@ -1,2 +1,2 @@
Bugfix Bugfix
* Fix IAR compiler warnings. Contributed by Glenn Strauss in #3835. * Fix IAR compiler warnings. Fixes #6924.

2
library/bignum.c
View File

@ -2063,6 +2063,7 @@ int mbedtls_mpi_exp_mod(mbedtls_mpi *X, const mbedtls_mpi *A,
size_t window_bitsize; size_t window_bitsize;
size_t i, j, nblimbs; size_t i, j, nblimbs;
size_t bufsize, nbits; size_t bufsize, nbits;
size_t exponent_bits_in_window = 0;
mbedtls_mpi_uint ei, mm, state; mbedtls_mpi_uint ei, mm, state;
mbedtls_mpi RR, T, W[(size_t) 1 << MBEDTLS_MPI_WINDOW_SIZE], WW, Apos; mbedtls_mpi RR, T, W[(size_t) 1 << MBEDTLS_MPI_WINDOW_SIZE], WW, Apos;
int neg; int neg;
@ -2236,7 +2237,6 @@ int mbedtls_mpi_exp_mod(mbedtls_mpi *X, const mbedtls_mpi *A,
nblimbs = E->n; nblimbs = E->n;
bufsize = 0; bufsize = 0;
nbits = 0; nbits = 0;
size_t exponent_bits_in_window = 0;
state = 0; state = 0;
while (1) { while (1) {

8
library/ecp.c
View File

@ -163,7 +163,8 @@ static int ecp_drbg_seed(ecp_drbg_context *ctx,
int ret; int ret;
unsigned char secret_bytes[MBEDTLS_ECP_MAX_BYTES]; unsigned char secret_bytes[MBEDTLS_ECP_MAX_BYTES];
/* The list starts with strong hashes */ /* The list starts with strong hashes */
const mbedtls_md_type_t md_type = mbedtls_md_list()[0]; const mbedtls_md_type_t md_type =
(const mbedtls_md_type_t) (mbedtls_md_list()[0]);
const mbedtls_md_info_t *md_info = mbedtls_md_info_from_type(md_type); const mbedtls_md_info_t *md_info = mbedtls_md_info_from_type(md_type);
if (secret_len > MBEDTLS_ECP_MAX_BYTES) { if (secret_len > MBEDTLS_ECP_MAX_BYTES) {
@ -2062,12 +2063,13 @@ static int ecp_mul_comb_core(const mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
} else } else
#endif #endif
{ {
int have_rng = 1;
/* Start with a non-zero point and randomize its coordinates */ /* Start with a non-zero point and randomize its coordinates */
i = d; i = d;
MBEDTLS_MPI_CHK(ecp_select_comb(grp, R, T, T_size, x[i])); MBEDTLS_MPI_CHK(ecp_select_comb(grp, R, T, T_size, x[i]));
MBEDTLS_MPI_CHK(mbedtls_mpi_lset(&R->Z, 1)); MBEDTLS_MPI_CHK(mbedtls_mpi_lset(&R->Z, 1));
int have_rng = 1;
#if defined(MBEDTLS_ECP_NO_INTERNAL_RNG) #if defined(MBEDTLS_ECP_NO_INTERNAL_RNG)
if (f_rng == NULL) { if (f_rng == NULL) {
have_rng = 0; have_rng = 0;
@ -2172,6 +2174,7 @@ static int ecp_mul_comb_after_precomp(const mbedtls_ecp_group *grp,
unsigned char parity_trick; unsigned char parity_trick;
unsigned char k[COMB_MAX_D + 1]; unsigned char k[COMB_MAX_D + 1];
mbedtls_ecp_point *RR = R; mbedtls_ecp_point *RR = R;
int have_rng = 1;
#if defined(MBEDTLS_ECP_RESTARTABLE) #if defined(MBEDTLS_ECP_RESTARTABLE)
if (rs_ctx != NULL && rs_ctx->rsm != NULL) { if (rs_ctx != NULL && rs_ctx->rsm != NULL) {
@ -2208,7 +2211,6 @@ final_norm:
* *
* Avoid the leak by randomizing coordinates before we normalize them. * Avoid the leak by randomizing coordinates before we normalize them.
*/ */
int have_rng = 1;
#if defined(MBEDTLS_ECP_NO_INTERNAL_RNG) #if defined(MBEDTLS_ECP_NO_INTERNAL_RNG)
if (f_rng == NULL) { if (f_rng == NULL) {
have_rng = 0; have_rng = 0;