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

Merge pull request #5124 from kaleb-himes/WIN_MULTICONFIG

Browse Source 
Address issues ID'd by new windows multi-config test
This commit is contained in:
Sean Parkinson
2022-05-13 09:39:15 +10:00
committed by GitHub
parent 6aaee73585 eb6f9152db
commit eea537e5ea
9 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/internal.c
View File

@@ -30767,7 +30767,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

@@ -13519,7 +13519,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
@@ -19849,7 +19849,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;
}
@@ -19873,7 +19873,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 {
@@ -19891,7 +19891,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;
}
}
@@ -42309,7 +42309,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

@@ -6706,7 +6706,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];