From 9de3fab74c1282cf8c1d0bd526ef7c5a6fd91e45 Mon Sep 17 00:00:00 2001
From: Hideki Miyazaki <hide@wolfssl.com>
Date: Fri, 16 Apr 2021 19:51:08 +0900
Subject: [PATCH] fixed jenkins failures part1

---
 src/tls13.c        | 5 +++--
 wolfssl/internal.h | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/tls13.c b/src/tls13.c
index 9b2ff4538..767c287d9 100644
--- a/src/tls13.c
+++ b/src/tls13.c
@@ -2607,7 +2607,8 @@ static byte helloRetryRequestRandom[] = {
 
 #ifndef NO_WOLFSSL_CLIENT
 #if defined(HAVE_SESSION_TICKET) || !defined(NO_PSK)
-#ifdef OPENSSL_EXTRA
+#if defined(OPENSSL_EXTRA) && !defined(WOLFSSL_PSK_ONE_ID) && \
+    !defined(NO_PSK)
 /**
 * convert mac algorithm to WOLFSSL_EVP_MD
 * @param mac_alg mac algorithm
@@ -2737,7 +2738,7 @@ static int SetupPskKey(WOLFSSL* ssl, PreSharedKey* psk)
                     return PSK_KEY_ERROR;
                 }
                 
-                ssl->arrays->psk_keySz = idlen;
+                ssl->arrays->psk_keySz = (word32)idlen;
                 XMEMCPY(ssl->arrays->psk_key, id, idlen);
                 cipherSuite0 = psksession->cipherSuite0;
                 cipherSuite  = psksession->cipherSuite;
diff --git a/wolfssl/internal.h b/wolfssl/internal.h
index bfc950d6a..7a8a87765 100644
--- a/wolfssl/internal.h
+++ b/wolfssl/internal.h
@@ -3506,7 +3506,9 @@ typedef struct Options {
 #ifndef NO_PSK
     wc_psk_client_callback client_psk_cb;
     wc_psk_server_callback server_psk_cb;
+#ifdef OPENSSL_EXTRA
     wc_psk_use_session_cb_func session_psk_cb;
+#endif
 #ifdef WOLFSSL_TLS13
     wc_psk_client_tls13_callback client_psk_tls13_cb;  /* client callback */
     wc_psk_server_tls13_callback server_psk_tls13_cb;  /* server callback */