Fixes for CI issues

Author: dgarske

.wolfssl_known_macro_extras

@@ -350,6 +350,7 @@ MUTEX_DURING_INIT
 NEED_THREADX_TYPES
 NETX_DUO
 NET_SECURE_MODULE_EN
+NET_GETDEVRANDOM
 NOTE_TRIGGER
 NO_AES_DECRYPT
 NO_ARDUINO_DEFAULT
@@ -597,7 +598,6 @@ WC_AES_GCM_DEC_AUTH_EARLY
 WC_ASN_HASH_SHA256
 WC_ASN_RUNTIME_DATE_CHECK_CONTROL
 WC_ASYNC_ENABLE_ECC_KEYGEN
-WC_ASYNC_ENABLE_X25519
 WC_ASYNC_NO_3DES
 WC_ASYNC_NO_AES
 WC_ASYNC_NO_ARC4

wolfcrypt/src/curve25519.c

@@ -550,7 +550,8 @@ int wc_curve25519_make_key(WC_RNG* rng, int keysize, curve25519_key* key)
     }
 #endif
 
-#if defined(WOLFSSL_ASYNC_CRYPT) && defined(WC_ASYNC_ENABLE_X25519)
+#if defined(WOLFSSL_ASYNC_CRYPT) && defined(WC_ASYNC_ENABLE_X25519) && \
+    defined(WOLFSSL_ASYNC_CRYPT_SW)
     if (key->asyncDev.marker == WOLFSSL_ASYNC_MARKER_X25519) {
         if (wc_AsyncSwInit(&key->asyncDev, ASYNC_SW_X25519_MAKE)) {
             WC_ASYNC_SW* sw = &key->asyncDev.sw;
@@ -560,7 +561,8 @@ int wc_curve25519_make_key(WC_RNG* rng, int keysize, curve25519_key* key)
             return WC_PENDING_E;
         }
     }
-#endif /* WOLFSSL_ASYNC_CRYPT && WC_ASYNC_ENABLE_X25519 */
+#endif /* WOLFSSL_ASYNC_CRYPT && WC_ASYNC_ENABLE_X25519 &&
+        * WOLFSSL_ASYNC_CRYPT_SW */
 
 #ifdef WOLFSSL_SE050
     ret = se050_curve25519_create_key(key, keysize);
@@ -691,7 +693,8 @@ int wc_curve25519_shared_secret_ex(curve25519_key* private_key,
 
 #ifdef WC_X25519_NONBLOCK
 
-#if defined(WOLFSSL_ASYNC_CRYPT) && defined(WC_ASYNC_ENABLE_X25519)
+#if defined(WOLFSSL_ASYNC_CRYPT) && defined(WC_ASYNC_ENABLE_X25519) && \
+    defined(WOLFSSL_ASYNC_CRYPT_SW)
     if (private_key->asyncDev.marker == WOLFSSL_ASYNC_MARKER_X25519) {
         if (wc_AsyncSwInit(&private_key->asyncDev,
                 ASYNC_SW_X25519_SHARED_SEC)) {
@@ -704,7 +707,8 @@ int wc_curve25519_shared_secret_ex(curve25519_key* private_key,
             return WC_PENDING_E;
         }
     }
-#endif /* WOLFSSL_ASYNC_CRYPT && WC_ASYNC_ENABLE_X25519 */
+#endif /* WOLFSSL_ASYNC_CRYPT && WC_ASYNC_ENABLE_X25519 &&
+        * WOLFSSL_ASYNC_CRYPT_SW */
 
     if (private_key->nbCtx != NULL) {
         ret = wc_curve25519_shared_secret_nb(private_key, public_key, out,