feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

fixed jenkins failures part1

Browse Source
This commit is contained in:
Hideki Miyazaki
2021-04-16 19:51:08 +09:00
parent 0e40293798
commit 9de3fab74c
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/tls13.c
View File

@@ -2607,7 +2607,8 @@ static byte helloRetryRequestRandom[] = {
#ifndef NO_WOLFSSL_CLIENT #ifndef NO_WOLFSSL_CLIENT
#if defined(HAVE_SESSION_TICKET) || !defined(NO_PSK) #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 * convert mac algorithm to WOLFSSL_EVP_MD
* @param mac_alg mac algorithm * @param mac_alg mac algorithm
@@ -2737,7 +2738,7 @@ static int SetupPskKey(WOLFSSL* ssl, PreSharedKey* psk)
return PSK_KEY_ERROR; return PSK_KEY_ERROR;
} }
ssl->arrays->psk_keySz = idlen; ssl->arrays->psk_keySz = (word32)idlen;
XMEMCPY(ssl->arrays->psk_key, id, idlen); XMEMCPY(ssl->arrays->psk_key, id, idlen);
cipherSuite0 = psksession->cipherSuite0; cipherSuite0 = psksession->cipherSuite0;
cipherSuite = psksession->cipherSuite; cipherSuite = psksession->cipherSuite;

2
wolfssl/internal.h
View File

@@ -3506,7 +3506,9 @@ typedef struct Options {
#ifndef NO_PSK #ifndef NO_PSK
wc_psk_client_callback client_psk_cb; wc_psk_client_callback client_psk_cb;
wc_psk_server_callback server_psk_cb; wc_psk_server_callback server_psk_cb;
#ifdef OPENSSL_EXTRA
wc_psk_use_session_cb_func session_psk_cb; wc_psk_use_session_cb_func session_psk_cb;
#endif
#ifdef WOLFSSL_TLS13 #ifdef WOLFSSL_TLS13
wc_psk_client_tls13_callback client_psk_tls13_cb; /* client callback */ wc_psk_client_tls13_callback client_psk_tls13_cb; /* client callback */
wc_psk_server_tls13_callback server_psk_tls13_cb; /* server callback */ wc_psk_server_tls13_callback server_psk_tls13_cb; /* server callback */