mirrors/wolfssl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3800 from dgarske/zd11759

Browse Source 
Fixes for warnings in Windows and failing `wc_BufferKeyEncrypt` test
This commit is contained in:
Sean Parkinson 2021-02-23 17:07:14 +10:00 committed by GitHub
commit 22349e0539
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/internal.c
View File

@ -11371,8 +11371,8 @@ int ProcessPeerCerts(WOLFSSL* ssl, byte* input, word32* inOutIdx,
if (ssl->options.side == WOLFSSL_CLIENT_END) { if (ssl->options.side == WOLFSSL_CLIENT_END) {
#ifdef HAVE_CERTIFICATE_STATUS_REQUEST #ifdef HAVE_CERTIFICATE_STATUS_REQUEST
if (ssl->status_request) { if (ssl->status_request) {
args->fatal = TLSX_CSR_InitRequest(ssl->extensions, args->fatal = (TLSX_CSR_InitRequest(ssl->extensions,
args->dCert, ssl->heap); args->dCert, ssl->heap) != 0);
doLookup = 0; doLookup = 0;
#if defined(WOLFSSL_TLS13) #if defined(WOLFSSL_TLS13)
if (ssl->options.tls1_3) { if (ssl->options.tls1_3) {
@ -11399,8 +11399,8 @@ int ProcessPeerCerts(WOLFSSL* ssl, byte* input, word32* inOutIdx,
#endif /* HAVE_CERTIFICATE_STATUS_REQUEST */ #endif /* HAVE_CERTIFICATE_STATUS_REQUEST */
#ifdef HAVE_CERTIFICATE_STATUS_REQUEST_V2 #ifdef HAVE_CERTIFICATE_STATUS_REQUEST_V2
if (ssl->status_request_v2) { if (ssl->status_request_v2) {
args->fatal = TLSX_CSR2_InitRequests(ssl->extensions, args->fatal = (TLSX_CSR2_InitRequests(ssl->extensions,
args->dCert, 1, ssl->heap); args->dCert, 1, ssl->heap) != 0);
doLookup = 0; doLookup = 0;
} }
#endif /* HAVE_CERTIFICATE_STATUS_REQUEST_V2 */ #endif /* HAVE_CERTIFICATE_STATUS_REQUEST_V2 */
@ -19955,6 +19955,7 @@ static byte MinHashAlgo(WOLFSSL* ssl)
return sha256_mac; return sha256_mac;
} }
#endif /* WOLFSSL_NO_TLS12 */ #endif /* WOLFSSL_NO_TLS12 */
(void)ssl;
return sha_mac; return sha_mac;
} }

6
src/ssl.c
View File

@ -27701,8 +27701,7 @@ long wolfSSL_set_tlsext_status_type(WOLFSSL *s, int type)
} }
if (type == TLSEXT_STATUSTYPE_ocsp){ if (type == TLSEXT_STATUSTYPE_ocsp){
int r = 0; int r = TLSX_UseCertificateStatusRequest(&s->extensions, (byte)type, 0, s,
r = TLSX_UseCertificateStatusRequest(&s->extensions, type, 0, s,
s->heap, s->devId); s->heap, s->devId);
return (long)r; return (long)r;
} else { } else {
@ -47829,7 +47828,8 @@ int wolfSSL_get_ocsp_producedDate_tm(WOLFSSL *ssl, struct tm *produced_tm) {
if (produced_tm == NULL) if (produced_tm == NULL)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
if (ExtractDate(ssl->ocspProducedDate, ssl->ocspProducedDateFormat, produced_tm, &idx)) if (ExtractDate(ssl->ocspProducedDate,
(unsigned char)ssl->ocspProducedDateFormat, produced_tm, &idx))
return 0; return 0;
else else
return ASN_PARSE_E; return ASN_PARSE_E;

4
wolfcrypt/test/test.c
View File

@ -6243,12 +6243,14 @@ WOLFSSL_TEST_SUBROUTINE int des_test(void)
if (ret != BAD_FUNC_ARG) if (ret != BAD_FUNC_ARG)
return -5008; return -5008;
/* Test invalid hash type */ #ifndef NO_PWDBASED
/* Test invalid hash type - only applies to wc_PBKDF1 call */
ret = wc_BufferKeyEncrypt(&info, cipher, sizeof(cipher), key, ret = wc_BufferKeyEncrypt(&info, cipher, sizeof(cipher), key,
sizeof(key), WC_HASH_TYPE_NONE); sizeof(key), WC_HASH_TYPE_NONE);
if (ret == 0) if (ret == 0)
return -5009; return -5009;
} }
#endif /* !NO_PWDBASED */
#endif #endif
return 0; return 0;