Skip to content

Commit d6d124b

Browse files
authored
Merge pull request #8774 from SparkiDev/armv8_ghs
Armv8 (Aarch64) ASM fixes for Green Hills compiler
2 parents 29f534f + fc1d281 commit d6d124b

13 files changed

Lines changed: 494 additions & 706 deletions

src/internal.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26511,7 +26511,7 @@ const char* wolfSSL_ERR_reason_error_string(unsigned long e)
2651126511
return "peer ip address mismatch";
2651226512

2651326513
case WANT_READ :
26514-
case -WOLFSSL_ERROR_WANT_READ :
26514+
case WOLFSSL_ERROR_WANT_READ_E :
2651526515
return "non-blocking socket wants data to be read";
2651626516

2651726517
case NOT_READY_ERROR :
@@ -26521,17 +26521,17 @@ const char* wolfSSL_ERR_reason_error_string(unsigned long e)
2652126521
return "record layer version error";
2652226522

2652326523
case WANT_WRITE :
26524-
case -WOLFSSL_ERROR_WANT_WRITE :
26524+
case WOLFSSL_ERROR_WANT_WRITE_E :
2652526525
return "non-blocking socket write buffer full";
2652626526

26527-
case -WOLFSSL_ERROR_WANT_CONNECT:
26528-
case -WOLFSSL_ERROR_WANT_ACCEPT:
26527+
case WOLFSSL_ERROR_WANT_CONNECT_E :
26528+
case WOLFSSL_ERROR_WANT_ACCEPT_E :
2652926529
return "The underlying BIO was not yet connected";
2653026530

26531-
case -WOLFSSL_ERROR_SYSCALL:
26531+
case WOLFSSL_ERROR_SYSCALL_E :
2653226532
return "fatal I/O error in TLS layer";
2653326533

26534-
case -WOLFSSL_ERROR_WANT_X509_LOOKUP:
26534+
case WOLFSSL_ERROR_WANT_X509_LOOKUP_E :
2653526535
return "application client cert callback asked to be called again";
2653626536

2653726537
case BUFFER_ERROR :
@@ -26571,7 +26571,7 @@ const char* wolfSSL_ERR_reason_error_string(unsigned long e)
2657126571
return "can't decode peer key";
2657226572

2657326573
case ZERO_RETURN:
26574-
case -WOLFSSL_ERROR_ZERO_RETURN:
26574+
case WOLFSSL_ERROR_ZERO_RETURN_E :
2657526575
return "peer sent close notify alert";
2657626576

2657726577
case ECC_CURVETYPE_ERROR:

src/ssl.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,8 +234,10 @@ static struct SystemCryptoPolicy crypto_policy;
234234
static WC_RNG globalRNG;
235235
static volatile int initGlobalRNG = 0;
236236

237+
#if defined(OPENSSL_EXTRA) || !defined(WOLFSSL_MUTEX_INITIALIZER)
237238
static WC_MAYBE_UNUSED wolfSSL_Mutex globalRNGMutex
238239
WOLFSSL_MUTEX_INITIALIZER_CLAUSE(globalRNGMutex);
240+
#endif
239241
#ifndef WOLFSSL_MUTEX_INITIALIZER
240242
static int globalRNGMutex_valid = 0;
241243
#endif

src/x509.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5507,7 +5507,7 @@ int wolfSSL_X509_NAME_get_text_by_NID(WOLFSSL_X509_NAME* name,
55075507
WOLFSSL_EVP_PKEY* wolfSSL_X509_get_pubkey(WOLFSSL_X509* x509)
55085508
{
55095509
WOLFSSL_EVP_PKEY* key = NULL;
5510-
int ret;
5510+
int ret = 0;
55115511

55125512
(void)ret;
55135513

0 commit comments

Comments
 (0)