wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2026-02-01 16:19:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Address issues ID'd by new windows multi-config test

Browse Source
This commit is contained in:
kaleb-himes
2022-05-09 16:50:56 -06:00
parent 063e757f6b
commit d5f7beefd4
10 changed files with 46 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/internal.c
View File

@@ -30764,7 +30764,7 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
#ifndef NO_ASN_TIME
c32toa(LowResTimer(), (byte*)&it.timestamp);
#endif
it.haveEMS = ssl->options.haveEMS;
it.haveEMS = (byte) ssl->options.haveEMS;
}
else {
#ifdef WOLFSSL_TLS13

10
src/ssl.c
View File

@@ -13504,7 +13504,7 @@ int AddSessionToCache(WOLFSSL_SESSION* addSession, const byte* id, byte idSz,
cacheTicBuff = cacheSession->ticket;
ticBuffUsed = 1;
cacheSession->ticket = ticBuff;
cacheSession->ticketLenAlloc = ticLen;
cacheSession->ticketLenAlloc = (word16) ticLen;
}
#endif
#ifdef SESSION_CERTS
@@ -19834,7 +19834,7 @@ int wolfSSL_DupSession(const WOLFSSL_SESSION* input, WOLFSSL_SESSION* output,
WOLFSSL_MSG("Failed to allocate memory for ticket when avoiding"
" syscalls");
output->ticket = ticBuff;
output->ticketLenAlloc = ticLenAlloc;
output->ticketLenAlloc = (word16) ticLenAlloc;
output->ticketLen = 0;
ret = WOLFSSL_FAILURE;
}
@@ -19858,7 +19858,7 @@ int wolfSSL_DupSession(const WOLFSSL_SESSION* input, WOLFSSL_SESSION* output,
if (ticBuff != NULL && ret == WOLFSSL_SUCCESS) {
XMEMCPY(ticBuff, input->ticket, input->ticketLen);
output->ticket = ticBuff;
output->ticketLenAlloc = ticLenAlloc;
output->ticketLenAlloc = (word16) ticLenAlloc;
}
}
else {
@@ -19876,7 +19876,7 @@ int wolfSSL_DupSession(const WOLFSSL_SESSION* input, WOLFSSL_SESSION* output,
"avoiding system calls");
ret = WOLFSSL_FAILURE;
output->ticket = ticBuff;
output->ticketLenAlloc = ticLenAlloc;
output->ticketLenAlloc = (word16) ticLenAlloc;
output->ticketLen = 0;
}
}
@@ -42293,7 +42293,7 @@ int wolfSSL_set_alpn_protos(WOLFSSL* ssl,
TLSX_Remove(&ssl->extensions, TLSX_APPLICATION_LAYER_PROTOCOL, ssl->heap);
if ((sz = wolfSSL_BIO_get_mem_data(bio, &pt)) > 0) {
wolfSSL_UseALPN(ssl, pt, sz, alpn_opt);
wolfSSL_UseALPN(ssl, pt, sz, (byte) alpn_opt);
}
wolfSSL_BIO_free(bio);
#if defined(WOLFSSL_ERROR_CODE_OPENSSL)

2
src/tls.c
View File

@@ -6699,7 +6699,7 @@ static int TLSX_KeyShare_GenEccKey(WOLFSSL *ssl, KeyShareEntry* kse)
int ret = 0;
#if defined(HAVE_ECC) && defined(HAVE_ECC_KEY_EXPORT)
word32 keySize = 0;
word16 curveId = ECC_CURVE_INVALID;
word16 curveId = (word16) ECC_CURVE_INVALID;
ecc_key* eccKey = (ecc_key*)kse->key;
/* TODO: [TLS13] The key sizes should come from wolfcrypt. */

2
src/x509.c
View File

@@ -8182,7 +8182,7 @@ WOLF_STACK_OF(WOLFSSL_X509)* wolfSSL_X509_chain_up_ref(
return BUFFER_E;
}
out[0] = t->type;
out[0] = (byte) t->type;
sz = SetLength(t->length, out + 1) + 1; /* gen tag */
for (i = 0; i < t->length; i++) {
out[sz + i] = t->data[i];

2
wolfcrypt/src/aes.c
View File

@@ -4582,7 +4582,7 @@ static WC_INLINE void RIGHTSHIFTX(byte* x)
for (i = 0; i < AES_BLOCK_SIZE; i++) {
int carryOut = (x[i] & 0x01) << 7;
x[i] = (x[i] >> 1) | carryIn;
x[i] = (byte) ((x[i] >> 1) | carryIn);
carryIn = carryOut;
}
x[0] ^= borrow;

2
wolfcrypt/src/asn.c
View File

@@ -22572,7 +22572,7 @@ int FlattenAltNames(byte* output, word32 outputSz, const DNS_entry* names)
idx = i - curName->len - len - 1;
i = idx;
#endif
output[idx] = ASN_CONTEXT_SPECIFIC | curName->type;
output[idx] = (byte) (ASN_CONTEXT_SPECIFIC | curName->type);
if (curName->type == ASN_DIR_TYPE) {
output[idx] |= ASN_CONSTRUCTED;
}

2
wolfcrypt/src/evp.c
View File

@@ -6381,7 +6381,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD* type)
ctx->authTagSz = CHACHA20_POLY1305_AEAD_AUTHTAG_SIZE;
ctx->ivSz = CHACHA20_POLY1305_AEAD_IV_SIZE;
if (enc == 0 || enc == 1) {
ctx->enc = enc;
ctx->enc = (byte) enc;
}
if (key != NULL && iv != NULL && wc_ChaCha20Poly1305_Init(

4
wolfcrypt/src/sha3.c
View File

@@ -621,7 +621,7 @@ static int Sha3Update(wc_Sha3* sha3, const byte* data, word32 len, byte p)
t[i] = data[i];
data += i;
len -= i;
sha3->i += i;
sha3->i += (byte) i;
if (sha3->i == p * 8) {
for (i = 0; i < p; i++)
@@ -639,7 +639,7 @@ static int Sha3Update(wc_Sha3* sha3, const byte* data, word32 len, byte p)
}
for (i = 0; i < len; i++)
sha3->t[i] = data[i];
sha3->i += i;
sha3->i += (byte) i;
return 0;
}

50
wolfcrypt/src/sp_c32.c
View File

@@ -1926,8 +1926,8 @@ static WC_INLINE sp_digit sp_2048_div_word_36(sp_digit d1, sp_digit d0,
#elif !defined(__aarch64__) && !defined(SP_DIV_WORD_USE_DIV)
sp_int64 d = ((sp_int64)d1 << 29) + d0;
sp_digit dv = (div >> 1) + 1;
sp_digit t1 = d >> 29;
sp_digit t0 = (sp_digit)d & 0x1fffffff;
sp_digit t1 = (sp_digit) (d >> 29);
sp_digit t0 = (sp_digit) (d & 0x1fffffff);
sp_digit t2;
sp_digit sign;
sp_digit r;
@@ -2993,8 +2993,8 @@ static WC_INLINE sp_digit sp_2048_div_word_72(sp_digit d1, sp_digit d0,
#elif !defined(__aarch64__) && !defined(SP_DIV_WORD_USE_DIV)
sp_int64 d = ((sp_int64)d1 << 29) + d0;
sp_digit dv = (div >> 1) + 1;
sp_digit t1 = d >> 29;
sp_digit t0 = (sp_digit)d & 0x1fffffff;
sp_digit t1 = (sp_digit) (d >> 29);
sp_digit t0 = (sp_digit) (d & 0x1fffffff);
sp_digit t2;
sp_digit sign;
sp_digit r;
@@ -3525,7 +3525,7 @@ int sp_RsaPublic_2048(const byte* in, word32 inLen, const mp_int* em,
sp_digit* r = NULL;
sp_digit* norm = NULL;
sp_digit e[1] = {0};
sp_digit mp;
sp_digit mp = 0;
int i;
int err = MP_OKAY;
@@ -5618,8 +5618,8 @@ static WC_INLINE sp_digit sp_3072_div_word_53(sp_digit d1, sp_digit d0,
#elif !defined(__aarch64__) && !defined(SP_DIV_WORD_USE_DIV)
sp_int64 d = ((sp_int64)d1 << 29) + d0;
sp_digit dv = (div >> 1) + 1;
sp_digit t1 = d >> 29;
sp_digit t0 = (sp_digit)d & 0x1fffffff;
sp_digit t1 = (sp_digit) (d >> 29);
sp_digit t0 = (sp_digit) (d & 0x1fffffff);
sp_digit t2;
sp_digit sign;
sp_digit r;
@@ -6462,8 +6462,8 @@ static WC_INLINE sp_digit sp_3072_div_word_106(sp_digit d1, sp_digit d0,
#elif !defined(__aarch64__) && !defined(SP_DIV_WORD_USE_DIV)
sp_int64 d = ((sp_int64)d1 << 29) + d0;
sp_digit dv = (div >> 1) + 1;
sp_digit t1 = d >> 29;
sp_digit t0 = (sp_digit)d & 0x1fffffff;
sp_digit t1 = (sp_digit) (d >> 29);
sp_digit t0 = (sp_digit) (d & 0x1fffffff);
sp_digit t2;
sp_digit sign;
sp_digit r;
@@ -6990,7 +6990,7 @@ int sp_RsaPublic_3072(const byte* in, word32 inLen, const mp_int* em,
sp_digit* r = NULL;
sp_digit* norm = NULL;
sp_digit e[1] = {0};
sp_digit mp;
sp_digit mp = 0;
int i;
int err = MP_OKAY;
@@ -9651,8 +9651,8 @@ static WC_INLINE sp_digit sp_3072_div_word_56(sp_digit d1, sp_digit d0,
#elif !defined(__aarch64__) && !defined(SP_DIV_WORD_USE_DIV)
sp_int64 d = ((sp_int64)d1 << 28) + d0;
sp_digit dv = (div >> 1) + 1;
sp_digit t1 = d >> 28;
sp_digit t0 = (sp_digit)d & 0xfffffff;
sp_digit t1 = (sp_digit) (d >> 28);
sp_digit t0 = (sp_digit) (d & 0xfffffff);
sp_digit t2;
sp_digit sign;
sp_digit r;
@@ -10574,8 +10574,8 @@ static WC_INLINE sp_digit sp_3072_div_word_112(sp_digit d1, sp_digit d0,
#elif !defined(__aarch64__) && !defined(SP_DIV_WORD_USE_DIV)
sp_int64 d = ((sp_int64)d1 << 28) + d0;
sp_digit dv = (div >> 1) + 1;
sp_digit t1 = d >> 28;
sp_digit t0 = (sp_digit)d & 0xfffffff;
sp_digit t1 = (sp_digit) (d >> 28);
sp_digit t0 = (sp_digit) (d & 0xfffffff);
sp_digit t2;
sp_digit sign;
sp_digit r;
@@ -13281,8 +13281,8 @@ static WC_INLINE sp_digit sp_4096_div_word_71(sp_digit d1, sp_digit d0,
#elif !defined(__aarch64__) && !defined(SP_DIV_WORD_USE_DIV)
sp_int64 d = ((sp_int64)d1 << 29) + d0;
sp_digit dv = (div >> 1) + 1;
sp_digit t1 = d >> 29;
sp_digit t0 = (sp_digit)d & 0x1fffffff;
sp_digit t1 = (sp_digit) (d >> 29);
sp_digit t0 = (sp_digit) (d & 0x1fffffff);
sp_digit t2;
sp_digit sign;
sp_digit r;
@@ -14126,8 +14126,8 @@ static WC_INLINE sp_digit sp_4096_div_word_142(sp_digit d1, sp_digit d0,
#elif !defined(__aarch64__) && !defined(SP_DIV_WORD_USE_DIV)
sp_int64 d = ((sp_int64)d1 << 29) + d0;
sp_digit dv = (div >> 1) + 1;
sp_digit t1 = d >> 29;
sp_digit t0 = (sp_digit)d & 0x1fffffff;
sp_digit t1 = (sp_digit) (d >> 29);
sp_digit t0 = (sp_digit) (d & 0x1fffffff);
sp_digit t2;
sp_digit sign;
sp_digit r;
@@ -14654,7 +14654,7 @@ int sp_RsaPublic_4096(const byte* in, word32 inLen, const mp_int* em,
sp_digit* r = NULL;
sp_digit* norm = NULL;
sp_digit e[1] = {0};
sp_digit mp;
sp_digit mp = 0;
int i;
int err = MP_OKAY;
@@ -17194,8 +17194,8 @@ static WC_INLINE sp_digit sp_4096_div_word_81(sp_digit d1, sp_digit d0,
#elif !defined(__aarch64__) && !defined(SP_DIV_WORD_USE_DIV)
sp_int64 d = ((sp_int64)d1 << 26) + d0;
sp_digit dv = (div >> 1) + 1;
sp_digit t1 = d >> 26;
sp_digit t0 = (sp_digit)d & 0x3ffffff;
sp_digit t1 = (sp_digit) (d >> 26);
sp_digit t0 = (sp_digit) (d & 0x3ffffff);
sp_digit t2;
sp_digit sign;
sp_digit r;
@@ -18103,8 +18103,8 @@ static WC_INLINE sp_digit sp_4096_div_word_162(sp_digit d1, sp_digit d0,
#elif !defined(__aarch64__) && !defined(SP_DIV_WORD_USE_DIV)
sp_int64 d = ((sp_int64)d1 << 26) + d0;
sp_digit dv = (div >> 1) + 1;
sp_digit t1 = d >> 26;
sp_digit t0 = (sp_digit)d & 0x3ffffff;
sp_digit t1 = (sp_digit) (d >> 26);
sp_digit t0 = (sp_digit) (d & 0x3ffffff);
sp_digit t2;
sp_digit sign;
sp_digit r;
@@ -41067,8 +41067,8 @@ static WC_INLINE sp_digit sp_521_div_word_21(sp_digit d1, sp_digit d0,
#elif !defined(__aarch64__) && !defined(SP_DIV_WORD_USE_DIV)
sp_int64 d = ((sp_int64)d1 << 25) + d0;
sp_digit dv = (div >> 1) + 1;
sp_digit t1 = d >> 25;
sp_digit t0 = (sp_digit)d & 0x1ffffff;
sp_digit t1 = (sp_digit) (d >> 25);
sp_digit t0 = (sp_digit) (d & 0x1ffffff);
sp_digit t2;
sp_digit sign;
sp_digit r;

15
wolfcrypt/src/sp_int.c
View File

@@ -14527,8 +14527,9 @@ int sp_mont_setup(sp_int* m, sp_int_digit* rho)
#endif /* SP_WORD_SIZE >= 32 */
#endif /* SP_WORD_SIZE >= 16 */
/* rho = -1/m mod b */
*rho = -x;
/* rho = -1/m mod b, subtract x (unsigned) from 0 (MP_ZPOS) and
* assign negative result */
*rho = (sp_int_digit) (MP_ZPOS - x);
}
return err;
@@ -14757,7 +14758,7 @@ int sp_to_unsigned_bin_len(sp_int* a, byte* out, int outSz)
for (i = 0; (j >= 0) && (i < a->used); i++) {
int b;
for (b = 0; b < SP_WORD_SIZE; b += 8) {
out[j--] = a->dp[i] >> b;
out[j--] = (byte) (a->dp[i] >> b);
if (j < 0) {
break;
}
@@ -15039,11 +15040,11 @@ int sp_tohex(sp_int* a, char* str)
#endif /* WC_DISABLE_RADIX_ZERO_PAD */
/* Most-significant word. */
for (; j >= 0; j -= 4) {
*(str++) = ByteToHex(a->dp[i] >> j);
*(str++) = ByteToHex((byte) (a->dp[i] >> j));
}
for (--i; i >= 0; i--) {
for (j = SP_WORD_SIZE - 4; j >= 0; j -= 4) {
*(str++) = ByteToHex(a->dp[i] >> j);
*(str++) = (byte) ByteToHex((byte) (a->dp[i] >> j));
}
}
*str = '\0';
@@ -15103,14 +15104,14 @@ int sp_todecimal(sp_int* a, char* str)
i = 0;
while (!sp_iszero(t)) {
sp_div_d(t, 10, t, &d);
str[i++] = '0' + d;
str[i++] = (char) ('0' + d);
}
str[i] = '\0';
for (j = 0; j <= (i - 1) / 2; j++) {
int c = (unsigned char)str[j];
str[j] = str[i - 1 - j];
str[i - 1 - j] = c;
str[i - 1 - j] = (char) c;
}
}