Skip to content

Commit 0df5f35

Browse files
committed
Fix CI failures
1 parent aea80c9 commit 0df5f35

4 files changed

Lines changed: 14 additions & 5 deletions

File tree

src/internal.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38959,11 +38959,11 @@ static int AddPSKtoPreMasterSecret(WOLFSSL* ssl)
3895938959
#endif
3896038960

3896138961
if (certDer != NULL && certDerSz > 0 &&
38962-
certDerSz <= MAX_TICKET_PEER_CERT_SZ &&
38962+
certDerSz <= MAX_TICKET_PEER_CERT_SZ
3896338963
#ifdef HAVE_MAX_FRAGMENT
3896438964
/* We don't support fragmentation in
3896538965
* SendTls13NewSessionTicket yet. */
38966-
(!IsAtLeastTLSv1_3(ssl->version) ||
38966+
&& (!IsAtLeastTLSv1_3(ssl->version) ||
3896738967
ssl->max_fragment == MAX_RECORD_SIZE)
3896838968
#endif
3896938969
) {

src/ssl_sk.c

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -405,6 +405,7 @@ static int wolfssl_sk_dup_data(WOLFSSL_STACK* dst, WOLFSSL_STACK* src)
405405
}
406406
break;
407407
case STACK_TYPE_X509_CRL:
408+
#ifdef HAVE_CRL
408409
if (src->data.crl == NULL) {
409410
break;
410411
}
@@ -414,9 +415,13 @@ static int wolfssl_sk_dup_data(WOLFSSL_STACK* dst, WOLFSSL_STACK* src)
414415
err = 1;
415416
break;
416417
}
418+
#else
419+
WOLFSSL_MSG("CRL support not enabled");
420+
err = 1;
421+
#endif
417422
break;
418423
case STACK_TYPE_X509_OBJ:
419-
#if defined(OPENSSL_ALL)
424+
#if defined(OPENSSL_ALL)
420425
if (src->data.x509_obj == NULL) {
421426
break;
422427
}
@@ -427,8 +432,11 @@ static int wolfssl_sk_dup_data(WOLFSSL_STACK* dst, WOLFSSL_STACK* src)
427432
err = 1;
428433
break;
429434
}
435+
#else
436+
WOLFSSL_MSG("OPENSSL_ALL support not enabled");
437+
err = 1;
438+
#endif
430439
break;
431-
#endif
432440
case STACK_TYPE_BIO:
433441
case STACK_TYPE_STRING:
434442
case STACK_TYPE_ACCESS_DESCRIPTION:

src/x509.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12705,6 +12705,7 @@ static WOLFSSL_X509 *loadX509orX509REQFromPemBio(WOLFSSL_BIO *bp,
1270512705
}
1270612706

1270712707

12708+
WC_MAYBE_UNUSED
1270812709
static unsigned char* ReadPemFromBioToBuffer(WOLFSSL_BIO *bp, int *pemSz)
1270912710
{
1271012711
unsigned char* pem = NULL;

wolfssl/wolfcrypt/wc_port.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
#else
105105
#define WC_DEPRECATED(msg) /* null expansion */
106106
#endif
107-
#endif /* !WC_MAYBE_UNUSED */
107+
#endif /* !WC_DEPRECATED */
108108

109109
/* use inlining if compiler allows */
110110
#ifndef WC_INLINE

0 commit comments

Comments
 (0)