wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-03 20:54:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

addressed jenkins failure part3

Browse Source
This commit is contained in:
Hideki Miyazaki
2021-02-18 16:33:58 +09:00
parent 9bae05525c
commit 302c6dfe11
5 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/tls13.test
View File

@@ -280,11 +280,11 @@ if [ "$early_data" = "yes" -a "$psk" = "yes" ]; then
RESULT=$? RESULT=$?
remove_ready_file remove_ready_file
early_data_cnt=`grep 'Early Data' $server_out_file | wc -l` early_data_cnt=`grep 'Early Data' $server_out_file | wc -l`
if [ $early_data_cnt -ne 2 -a $early_data_cnt -ne 4 ]; then if [ $early_data_cnt -ne 3 -a $early_data_cnt -ne 4 ]; then
RESULT=1 RESULT=1
fi fi
if [ $RESULT -ne 0 ]; then if [ $RESULT -ne 0 ]; then
echo -e "\n\nIssue with TLS v1.3 Early Data - session ticket" echo -e "\n\nIssue with TLS v1.3 Early Data - PSK"
do_cleanup do_cleanup
exit 1 exit 1
fi fi

2
src/internal.c
View File

@@ -1804,7 +1804,7 @@ int InitSSL_Ctx(WOLFSSL_CTX* ctx, WOLFSSL_METHOD* method, void* heap)
/* WOLFSSL_X509_VERIFY_PARAM */ /* WOLFSSL_X509_VERIFY_PARAM */
if ((ctx->param = (WOLFSSL_X509_VERIFY_PARAM*)XMALLOC( if ((ctx->param = (WOLFSSL_X509_VERIFY_PARAM*)XMALLOC(
sizeof(WOLFSSL_X509_VERIFY_PARAM), sizeof(WOLFSSL_X509_VERIFY_PARAM),
ctx->heap, DYNAMIC_TYPE_OPENSSL)) == NULL) { heap, DYNAMIC_TYPE_OPENSSL)) == NULL) {
WOLFSSL_MSG("ctx->param memory error"); WOLFSSL_MSG("ctx->param memory error");
return MEMORY_E; return MEMORY_E;
} }

7
src/ssl.c
View File

@@ -17188,12 +17188,7 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
int ret = WOLFSSL_SUCCESS; int ret = WOLFSSL_SUCCESS;
WOLFSSL_ENTER("SHA512_Transform"); WOLFSSL_ENTER("SHA512_Transform");
#if defined(LITTLE_ENDIAN_ORDER)
{
ByteReverseWords64((word64*)data, (word64*)data,
WC_SHA512_BLOCK_SIZE);
}
#endif
ret = wc_Sha512Transform((wc_Sha512*)sha512, data); ret = wc_Sha512Transform((wc_Sha512*)sha512, data);
/* return 1 on success, 0 otherwise */ /* return 1 on success, 0 otherwise */

2
tests/api.c
View File

@@ -33228,7 +33228,7 @@ static void test_wolfSSL_SHA256(void)
static void test_wolfSSL_SHA512_Transform(void) static void test_wolfSSL_SHA512_Transform(void)
{ {
#if defined(OPENSSL_EXTRA) && !defined(NO_SHA512) #if defined(OPENSSL_EXTRA) && defined(WOLFSSL_SHA512)
byte input1[] = ""; byte input1[] = "";
byte input2[] = "abc"; byte input2[] = "abc";
byte local[WC_SHA512_BLOCK_SIZE]; byte local[WC_SHA512_BLOCK_SIZE];

17
wolfcrypt/src/sha512.c
View File

@@ -923,13 +923,28 @@ int wc_Sha512Transform(wc_Sha512* sha, const unsigned char* data)
/* back up buffer */ /* back up buffer */
#if defined(WOLFSSL_SMALL_STACK) #if defined(WOLFSSL_SMALL_STACK)
word64* buffer; word64* buffer;
buffer = (word64*) XMALLOC(sizeof(word64) * 16, NULL, DYNAMIC_TYPE_TMP_BUFFER); buffer = (word64*) XMALLOC(sizeof(word64) * 16, NULL,
DYNAMIC_TYPE_TMP_BUFFER);
if (buffer == NULL) if (buffer == NULL)
return MEMORY_E; return MEMORY_E;
#else #else
word64 buffer[WC_SHA512_BLOCK_SIZE / sizeof(word64)]; word64 buffer[WC_SHA512_BLOCK_SIZE / sizeof(word64)];
#endif #endif
#if defined(HAVE_INTEL_AVX1) || defined(HAVE_INTEL_AVX2)
Sha512_SetTransform();
#endif
#if defined(LITTLE_ENDIAN_ORDER)
#if defined(HAVE_INTEL_AVX1) || defined(HAVE_INTEL_AVX2)
if (!IS_INTEL_AVX1(intel_flags) && !IS_INTEL_AVX2(intel_flags))
#endif
{
ByteReverseWords64((word64*)data, (word64*)data,
WC_SHA512_BLOCK_SIZE);
}
#endif
XMEMCPY(buffer, sha->buffer, WC_SHA512_BLOCK_SIZE); XMEMCPY(buffer, sha->buffer, WC_SHA512_BLOCK_SIZE);
XMEMCPY(sha->buffer, data, WC_SHA512_BLOCK_SIZE); XMEMCPY(sha->buffer, data, WC_SHA512_BLOCK_SIZE);