wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 18:57:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

addressed jenkins failures

Browse Source
This commit is contained in:
Hideki Miyazaki
2021-11-20 10:15:57 +09:00
parent d00c7641ae
commit 82eb23b300
4 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/internal.c
View File

@ -16711,7 +16711,7 @@ static WC_INLINE int VerifyMac(WOLFSSL* ssl, const byte* input, word32 msgSz,
padByte = 1; padByte = 1;
if (ssl->options.tls) { if (ssl->options.tls) {
#if defined(HAVE_PK_CALLBACKS) #if !defined(NO_CERTS) && defined(HAVE_PK_CALLBACKS)
ret = PROTOCOLCB_UNAVAILABLE; ret = PROTOCOLCB_UNAVAILABLE;
if(ssl->ctx->VerifymacCb) { if(ssl->ctx->VerifymacCb) {
void* ctx = wolfSSL_GetVerifymacCtx(ssl); void* ctx = wolfSSL_GetVerifymacCtx(ssl);

3
src/keys.c
View File

@ -3119,7 +3119,8 @@ int SetKeysSide(WOLFSSL* ssl, enum encrypt_side side)
else else
#endif #endif
#if defined(HAVE_PK_CALLBACKS) #if !defined(NO_CERTS) && defined(HAVE_PK_CALLBACKS)
ret = PROTOCOLCB_UNAVAILABLE;
if (ssl->ctx->SetKeysCb) { if (ssl->ctx->SetKeysCb) {
void* ctx = wolfSSL_GetSetKeysCtx(ssl); void* ctx = wolfSSL_GetSetKeysCtx(ssl);
ret = ssl->ctx->SetKeysCb(ssl, ctx); ret = ssl->ctx->SetKeysCb(ssl, ctx);

6
src/tls.c
View File

@ -210,7 +210,7 @@ int BuildTlsFinished(WOLFSSL* ssl, Hashes* hashes, const byte* sender)
side = tls_server; side = tls_server;
#ifdef WOLFSSL_HAVE_PRF #ifdef WOLFSSL_HAVE_PRF
#if defined(HAVE_PK_CALLBACKS) #if !defined(NO_CERTS) && defined(HAVE_PK_CALLBACKS)
if (ssl->ctx->TlsFinishedCb) { if (ssl->ctx->TlsFinishedCb) {
void* ctx = wolfSSL_GetTlsFinishedCtx(ssl); void* ctx = wolfSSL_GetTlsFinishedCtx(ssl);
ret = ssl->ctx->TlsFinishedCb(ssl, side, handshake_hash, ret = ssl->ctx->TlsFinishedCb(ssl, side, handshake_hash,
@ -401,7 +401,7 @@ int DeriveTlsKeys(WOLFSSL* ssl)
ret = tsip_generateSeesionKey(ssl); ret = tsip_generateSeesionKey(ssl);
else { else {
#endif #endif
#if defined(HAVE_PK_CALLBACKS) #if !defined(NO_CERTS) && defined(HAVE_PK_CALLBACKS)
ret = PROTOCOLCB_UNAVAILABLE; ret = PROTOCOLCB_UNAVAILABLE;
if (ssl->ctx->GenSessionKeyCb) { if (ssl->ctx->GenSessionKeyCb) {
void* ctx = wolfSSL_GetGenSesssionKeyCtx(ssl); void* ctx = wolfSSL_GetGenSesssionKeyCtx(ssl);
@ -593,7 +593,7 @@ int MakeTlsMasterSecret(WOLFSSL* ssl)
#endif #endif
} else } else
#endif #endif
#if defined(HAVE_PK_CALLBACKS) #if !defined(NO_CERTS) && defined(HAVE_PK_CALLBACKS)
ret = PROTOCOLCB_UNAVAILABLE; ret = PROTOCOLCB_UNAVAILABLE;
if (ssl->ctx->GenMasterCb) { if (ssl->ctx->GenMasterCb) {
void* ctx = wolfSSL_GetGenMasterSecretCtx(ssl); void* ctx = wolfSSL_GetGenMasterSecretCtx(ssl);

4
wolfssl/test.h
View File

@ -4768,6 +4768,7 @@ static WC_INLINE void SetupPkCallbacks(WOLFSSL_CTX* ctx)
wolfSSL_CTX_SetRsaDecCb(ctx, myRsaDec); wolfSSL_CTX_SetRsaDecCb(ctx, myRsaDec);
#endif /* NO_RSA */ #endif /* NO_RSA */
#ifndef NO_CERTS
wolfSSL_CTX_SetGenMasterSecretCb(ctx, myGenMaster); wolfSSL_CTX_SetGenMasterSecretCb(ctx, myGenMaster);
wolfSSL_CTX_SetGenPreMasterCb(ctx, myGenPreMaster); wolfSSL_CTX_SetGenPreMasterCb(ctx, myGenPreMaster);
wolfSSL_CTX_SetGenSesssionKeyCb(ctx, myGenSessionKey); wolfSSL_CTX_SetGenSesssionKeyCb(ctx, myGenSessionKey);
@ -4778,6 +4779,7 @@ static WC_INLINE void SetupPkCallbacks(WOLFSSL_CTX* ctx)
#endif #endif
wolfSSL_CTX_SetTlsFinishedCb(ctx, myTlsFinished); wolfSSL_CTX_SetTlsFinishedCb(ctx, myTlsFinished);
#endif /* NO_CERTS */
} }
static WC_INLINE void SetupPkCallbackContexts(WOLFSSL* ssl, void* myCtx) static WC_INLINE void SetupPkCallbackContexts(WOLFSSL* ssl, void* myCtx)
@ -4818,6 +4820,7 @@ static WC_INLINE void SetupPkCallbackContexts(WOLFSSL* ssl, void* myCtx)
wolfSSL_SetRsaDecCtx(ssl, myCtx); wolfSSL_SetRsaDecCtx(ssl, myCtx);
#endif /* NO_RSA */ #endif /* NO_RSA */
#ifndef NO_CERTS
wolfSSL_SetGenMasterSecretCtx(ssl, myCtx); wolfSSL_SetGenMasterSecretCtx(ssl, myCtx);
wolfSSL_SetGenPreMasterCtx(ssl, myCtx); wolfSSL_SetGenPreMasterCtx(ssl, myCtx);
wolfSSL_SetGenSesssionKeyCtx(ssl, myCtx); wolfSSL_SetGenSesssionKeyCtx(ssl, myCtx);
@ -4828,6 +4831,7 @@ static WC_INLINE void SetupPkCallbackContexts(WOLFSSL* ssl, void* myCtx)
#endif #endif
wolfSSL_SetTlsFinishedCtx(ssl, myCtx); wolfSSL_SetTlsFinishedCtx(ssl, myCtx);
#endif
} }
#endif /* HAVE_PK_CALLBACKS */ #endif /* HAVE_PK_CALLBACKS */