Browse Source

Merge pull request #6223 from lealem47/misc_fixes

Async build typos and miscellaneous fixes
JacobBarthelmeh 1 year ago
parent
commit
e0e590f126
3 changed files with 10 additions and 3 deletions
  1. 2 2
      src/internal.c
  2. 6 0
      wolfcrypt/src/siphash.c
  3. 2 1
      wolfcrypt/test/test.c

+ 2 - 2
src/internal.c

@@ -16041,8 +16041,8 @@ void SendFatalAlertOnly(WOLFSSL *ssl, int error)
     case WANT_WRITE:
     case WANT_READ:
     case ZERO_RETURN:
-#ifdef WOLFSSL_ASYNC
-    case WC_PENGIND_E:
+#ifdef WOLFSSL_ASYNC_CRYPT
+    case WC_PENDING_E:
 #endif
         return;
 

+ 6 - 0
wolfcrypt/src/siphash.c

@@ -744,6 +744,12 @@ int wc_SipHash(const unsigned char* key, const unsigned char* in, word32 inSz,
         "cmp    %w[outSz], #8\n\t"
         "b.eq   L_siphash_8_end\n\t"
 
+    : [in] "+r" (in), [inSz] "+r" (inSz)
+    : [key] "r" (key), [out] "r" (out) , [outSz] "r" (outSz)
+    : "memory", "x8", "x9", "x10", "x11", "x12", "x13");
+
+    __asm__ __volatile__ (
+
         "mov    w13, #0xee\n\t"
         "eor    x10, x10, x13\n\t"
 #if WOLFSSL_SIPHASH_DROUNDS == 2

+ 2 - 1
wolfcrypt/test/test.c

@@ -651,7 +651,8 @@ static void render_error_message(const char* msg, int es)
  * infelicitous...
  */
 #if !defined(STRING_USER) && !defined(NO_ERROR_STRINGS) &&      \
-    (defined(_GNU_SOURCE) || defined(__USE_GNU) ||              \
+    (defined(__STDC_VERSION__) && (__STDC_VERSION__ > 199901L)) &&      \
+    ((defined(__GLIBC__) && (__GLIBC__ >= 2)) ||                \
      (defined(__USE_XOPEN2K) &&                                 \
       defined(_POSIX_C_SOURCE) &&                               \
       (_POSIX_C_SOURCE >= 200112L)))