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

Merge pull request #3752 from JacobBarthelmeh/Jenkins

Browse Source 
changes from nightly Jenkins test review
This commit is contained in:
Sean Parkinson
2021-02-15 16:32:40 +10:00
committed by GitHub
parent c5190d1294 bde1a2209a
commit ba1c67843a
5 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/ssl.c
View File

@@ -11958,10 +11958,7 @@ int wolfSSL_export_keying_material(WOLFSSL *ssl,
int use_context) int use_context)
{ {
byte* seed = NULL; byte* seed = NULL;
/* clientRandom + serverRandom word32 seedLen;
* OR
* clientRandom + serverRandom + ctx len encoding + ctx */
word32 seedLen = !use_context ? SEED_LEN : SEED_LEN + 2 + (word32)contextLen;
const struct ForbiddenLabels* fl; const struct ForbiddenLabels* fl;
WOLFSSL_ENTER("wolfSSL_export_keying_material"); WOLFSSL_ENTER("wolfSSL_export_keying_material");
@@ -11972,6 +11969,12 @@ int wolfSSL_export_keying_material(WOLFSSL *ssl,
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
/* clientRandom + serverRandom
* OR
* clientRandom + serverRandom + ctx len encoding + ctx */
seedLen = !use_context ? (word32)SEED_LEN :
(word32)SEED_LEN + 2 + (word32)contextLen;
if (ssl->options.saveArrays == 0 || ssl->arrays == NULL) { if (ssl->options.saveArrays == 0 || ssl->arrays == NULL) {
WOLFSSL_MSG("To export keying material wolfSSL needs to keep handshake " WOLFSSL_MSG("To export keying material wolfSSL needs to keep handshake "
"data. Call wolfSSL_KeepArrays before attempting to " "data. Call wolfSSL_KeepArrays before attempting to "

6
src/tls13.c
View File

@@ -777,7 +777,7 @@ int Tls13_Exporter(WOLFSSL* ssl, unsigned char *out, size_t outLen,
switch (ssl->specs.mac_algorithm) { switch (ssl->specs.mac_algorithm) {
#ifndef NO_SHA256 #ifndef NO_SHA256
case sha256_mac: case sha256_mac:
hashType = WC_SHA256; hashType = WC_HASH_TYPE_SHA256;
hashLen = WC_SHA256_DIGEST_SIZE; hashLen = WC_SHA256_DIGEST_SIZE;
emptyHash = emptySHA256Hash; emptyHash = emptySHA256Hash;
break; break;
@@ -785,7 +785,7 @@ int Tls13_Exporter(WOLFSSL* ssl, unsigned char *out, size_t outLen,
#ifdef WOLFSSL_SHA384 #ifdef WOLFSSL_SHA384
case sha384_mac: case sha384_mac:
hashType = WC_SHA384; hashType = WC_HASH_TYPE_SHA384;
hashLen = WC_SHA384_DIGEST_SIZE; hashLen = WC_SHA384_DIGEST_SIZE;
emptyHash = emptySHA384Hash; emptyHash = emptySHA384Hash;
break; break;
@@ -793,7 +793,7 @@ int Tls13_Exporter(WOLFSSL* ssl, unsigned char *out, size_t outLen,
#ifdef WOLFSSL_TLS13_SHA512 #ifdef WOLFSSL_TLS13_SHA512
case sha512_mac: case sha512_mac:
hashType = WC_SHA512; hashType = WC_HASH_TYPE_SHA512;
hashLen = WC_SHA512_DIGEST_SIZE; hashLen = WC_SHA512_DIGEST_SIZE;
emptyHash = emptySHA512Hash; emptyHash = emptySHA512Hash;
break; break;

4
tests/api.c
View File

@@ -24759,7 +24759,7 @@ static void test_wc_PKCS7_DecodeCompressedData(void)
&& !defined(NO_AES) && defined(HAVE_LIBZ) && !defined(NO_AES) && defined(HAVE_LIBZ)
PKCS7* pkcs7; PKCS7* pkcs7;
void* heap = NULL; void* heap = NULL;
byte out[3072]; byte out[4096];
byte *decompressed; byte *decompressed;
int outSz, decompressedSz; int outSz, decompressedSz;
@@ -40234,7 +40234,7 @@ static void test_export_keying_material(void)
start_thread(test_server_nofail, &server_args, &serverThread); start_thread(test_server_nofail, &server_args, &serverThread);
wait_tcp_ready(&server_args); wait_tcp_ready(&server_args);
test_client_nofail(&client_args, test_export_keying_material_cb); test_client_nofail(&client_args, (void*)test_export_keying_material_cb);
join_thread(serverThread); join_thread(serverThread);
AssertTrue(client_args.return_code); AssertTrue(client_args.return_code);

1
testsuite/testsuite.c
View File

@@ -37,6 +37,7 @@
#include <wolfssl/openssl/ssl.h> #include <wolfssl/openssl/ssl.h>
#endif #endif
#include <wolfssl/wolfcrypt/sha256.h> #include <wolfssl/wolfcrypt/sha256.h>
#include <wolfssl/wolfcrypt/ecc.h>
#include <examples/echoclient/echoclient.h> #include <examples/echoclient/echoclient.h>
#include <examples/echoserver/echoserver.h> #include <examples/echoserver/echoserver.h>

5
wolfssl/wolfcrypt/tfm.h
View File

@@ -70,11 +70,6 @@
#define TFM_X86_64 #define TFM_X86_64
#endif #endif
#endif #endif
#if defined(__aarch64__)
#if !defined(TFM_AARCH_64) && !defined(TFM_NO_ASM)
#define TFM_AARCH_64
#endif
#endif
#if defined(TFM_X86_64) || defined(TFM_AARCH_64) #if defined(TFM_X86_64) || defined(TFM_AARCH_64)
#if !defined(FP_64BIT) #if !defined(FP_64BIT)
#define FP_64BIT #define FP_64BIT