Revert "Fixes for support async with crypto or pk callbacks"

Author: dgarske

wolfcrypt/src/async.c

@@ -435,8 +435,7 @@ int wolfAsync_DevCopy(WC_ASYNC_DEV* src, WC_ASYNC_DEV* dst)
     return ret;
 }
 
-/* called from `wolfSSL_AsyncPop` to check if event is done and deliver
- * async return code */
+/* called from `wolfSSL_AsyncPop` to check if event is done and deliver async return code */
 int wolfAsync_EventPop(WOLF_EVENT* event, enum WOLF_EVENT_TYPE event_type)
 {
     int ret;
@@ -676,9 +675,6 @@ int wolfAsync_EventQueuePoll(WOLF_EVENT_QUEUE* queue, void* context_filter,
                         break;
                     }
 
-                #elif defined(WOLF_CRYPTO_CB) || defined(HAVE_PK_CALLBACKS)
-                    /* Use crypto or PK callbacks */
-
                 #elif defined(WOLFSSL_ASYNC_CRYPT_SW)
                     #ifdef WOLF_ASYNC_SW_SKIP_MOD
                         /* Simulate random hardware not done */

wolfssl/wolfcrypt/async.h

@@ -360,7 +360,7 @@ typedef struct WC_ASYNC_DEV {
     CaviumNitroxDev     nitrox;
 #elif defined(HAVE_INTEL_QA)
     IntelQaDev          qat;
-#elif defined(WOLFSSL_ASYNC_CRYPT_SW)
+#else
     WC_ASYNC_SW         sw;
 #endif
 } WC_ASYNC_DEV;