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

Merge pull request #2040 from ejohnstown/fix-checks

Browse Source 
Fix Checks
This commit is contained in:
David Garske
2019-01-17 12:54:25 -08:00
committed by GitHub
parent 91573735b1 8edd7d0b17
commit 8fb7892013
3 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
examples/benchmark/tls_bench.c
View File

@@ -643,7 +643,11 @@ static int bench_tls_client(info_t* info)
} }
#ifndef NO_DH #ifndef NO_DH
wolfSSL_CTX_SetMinDhKey_Sz(cli_ctx, MIN_DHKEY_BITS); ret = wolfSSL_CTX_SetMinDhKey_Sz(cli_ctx, MIN_DHKEY_BITS);
if (ret != WOLFSSL_SUCCESS) {
printf("Error setting minimum DH key size\n");
goto exit;
}
#endif #endif
/* Allocate and initialize a packet sized buffer */ /* Allocate and initialize a packet sized buffer */
@@ -960,7 +964,11 @@ static int bench_tls_server(info_t* info)
} }
#ifndef NO_DH #ifndef NO_DH
wolfSSL_CTX_SetMinDhKey_Sz(srv_ctx, MIN_DHKEY_BITS); ret = wolfSSL_CTX_SetMinDhKey_Sz(srv_ctx, MIN_DHKEY_BITS);
if (ret != WOLFSSL_SUCCESS) {
printf("Error setting minimum DH key size\n");
goto exit;
}
#endif #endif
/* Allocate read buffer */ /* Allocate read buffer */

5
examples/client/client.c
View File

@@ -2122,7 +2122,10 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
wolfSSL_CTX_set_group_messages(ctx); wolfSSL_CTX_set_group_messages(ctx);
#ifndef NO_DH #ifndef NO_DH
wolfSSL_CTX_SetMinDhKey_Sz(ctx, (word16)minDhKeyBits); if (wolfSSL_CTX_SetMinDhKey_Sz(ctx, (word16)minDhKeyBits)
!= WOLFSSL_SUCCESS) {
err_sys("Error setting minimum DH key size");
}
#endif #endif
if (usePsk) { if (usePsk) {

3
src/internal.c
View File

@@ -6479,6 +6479,9 @@ int HashOutput(WOLFSSL* ssl, const byte* output, int sz, int ivSz)
int ret = 0; int ret = 0;
const byte* adj; const byte* adj;
if (ssl->hsHashes == NULL)
return BAD_FUNC_ARG;
adj = output + RECORD_HEADER_SZ + ivSz; adj = output + RECORD_HEADER_SZ + ivSz;
sz -= RECORD_HEADER_SZ; sz -= RECORD_HEADER_SZ;