Add tests for async with crypto callbacks and non-blocking ECC/Curve25519

Author: dgarske

examples/async/README.md

@@ -14,6 +14,23 @@ Tested with:
 * `./configure --enable-asynccrypt --enable-pkcallbacks --enable-rsa --disable-ecc`
 * `./configure --enable-asynccrypt --enable-pkcallbacks --disable-rsa --enable-ecc`
 
+## Crypto Callback Testing
+
+The async examples include a crypto callback implementation (`AsyncTlsCryptoCb`) that
+simulates hardware crypto delays by returning `WC_PENDING_E` for a configurable number
+of iterations before completing the operation in software.
+
+When built with `WOLF_CRYPTO_CB` enabled (default in `user_settings.h`), the callback
+is automatically registered and will be invoked for all cryptographic operations.
+This tests the `WOLFSSL_ASYNC_CRYPT + WOLF_CRYPTO_CB + WC_ECC_NONBLOCK` combination.
+
+To adjust the simulated pending count (default is 2), define `TEST_PEND_COUNT`:
+```
+make -C examples/async CFLAGS="-DTEST_PEND_COUNT=5"
+```
+
+To enable crypto callback debug output, uncomment `DEBUG_CRYPTOCB` in `user_settings.h`.
+
 ```
 make -C examples/async
 ./examples/async/async_server --ecc

examples/async/async_client.c

@@ -52,6 +52,9 @@
 #include <wolfssl/ssl.h>
 #include <wolfssl/wolfio.h>
 #include <wolfssl/wolfcrypt/error-crypt.h>
+#ifdef WOLF_CRYPTO_CB
+#include <wolfssl/wolfcrypt/cryptocb.h>
+#endif
 #include <wolfssl/certs_test.h>
 #include "examples/async/async_tls.h"
 
@@ -233,6 +236,9 @@ int client_async_test(int argc, char** argv)
     int wouldblock_count = 0;
     int pending_count = 0;
 #endif
+#ifdef WOLF_CRYPTO_CB
+    AsyncTlsCryptoCbCtx cryptoCbCtx;
+#endif
 #ifdef WOLFSSL_STATIC_MEMORY
     static byte memory[300000];
     static byte memoryIO[34500];
@@ -279,6 +285,13 @@ int client_async_test(int argc, char** argv)
         goto out;
     }
 #endif
+#ifdef WOLF_CRYPTO_CB
+    XMEMSET(&cryptoCbCtx, 0, sizeof(cryptoCbCtx));
+    if (wc_CryptoCb_RegisterDevice(devId, AsyncTlsCryptoCb, &cryptoCbCtx) != 0) {
+        fprintf(stderr, "ERROR: wc_CryptoCb_RegisterDevice failed\n");
+        goto out;
+    }
+#endif
 
 #ifdef WOLFSSL_STATIC_MEMORY
     {
@@ -548,6 +561,9 @@ int client_async_test(int argc, char** argv)
     if (ctx != NULL) {
         wolfSSL_CTX_free(ctx);
     }
+#ifdef WOLF_CRYPTO_CB
+    wc_CryptoCb_UnRegisterDevice(devId);
+#endif
 #ifdef WOLFSSL_ASYNC_CRYPT
     if (devId != INVALID_DEVID) {
         wolfAsync_DevClose(&devId);

examples/async/async_server.c

@@ -57,6 +57,9 @@
 #include <wolfssl/ssl.h>
 #include <wolfssl/wolfio.h>
 #include <wolfssl/wolfcrypt/error-crypt.h>
+#ifdef WOLF_CRYPTO_CB
+#include <wolfssl/wolfcrypt/cryptocb.h>
+#endif
 #include <wolfssl/certs_test.h>
 #include "examples/async/async_tls.h"
 
@@ -191,6 +194,9 @@ int server_async_test(int argc, char** argv)
     int wouldblock_count = 0;
     int pending_count = 0;
 #endif
+#ifdef WOLF_CRYPTO_CB
+    AsyncTlsCryptoCbCtx cryptoCbCtx;
+#endif
 #ifdef WOLFSSL_STATIC_MEMORY
     static byte memory[300000];
     static byte memoryIO[34500];
@@ -284,6 +290,13 @@ int server_async_test(int argc, char** argv)
         goto exit;
     }
 #endif
+#ifdef WOLF_CRYPTO_CB
+    XMEMSET(&cryptoCbCtx, 0, sizeof(cryptoCbCtx));
+    if (wc_CryptoCb_RegisterDevice(devId, AsyncTlsCryptoCb, &cryptoCbCtx) != 0) {
+        fprintf(stderr, "ERROR: wc_CryptoCb_RegisterDevice failed\n");
+        goto exit;
+    }
+#endif
 
     /* Create and initialize WOLFSSL_CTX */
 #ifdef WOLFSSL_STATIC_MEMORY
@@ -613,6 +626,9 @@ int server_async_test(int argc, char** argv)
     }
     if (ctx)
         wolfSSL_CTX_free(ctx);
+#ifdef WOLF_CRYPTO_CB
+    wc_CryptoCb_UnRegisterDevice(devId);
+#endif
 #ifdef WOLFSSL_ASYNC_CRYPT
     if (devId != INVALID_DEVID) {
         wolfAsync_DevClose(&devId);

examples/async/async_tls.c

@@ -23,8 +23,10 @@
     #include <config.h>
 #endif
 
-#ifndef WOLFSSL_USER_SETTINGS
-#include <wolfssl/options.h>
+#ifdef WOLFSSL_USER_SETTINGS
+    #include "user_settings.h"
+#else
+    #include <wolfssl/options.h>
 #endif
 #include "examples/async/async_tls.h"
 #include <wolfssl/ssl.h>

examples/async/user_settings.h

@@ -45,13 +45,23 @@
 #define WC_X25519_NONBLOCK
 
 #define WOLFSSL_ASYNC_CRYPT
-#define WOLFSSL_ASYNC_CRYPT_SW
 #define WC_NO_ASYNC_THREADING
 #define HAVE_WOLF_BIGINT
 
+#define WOLF_CRYPTO_CB
+/* #define DEBUG_CRYPTOCB */
+/* Note: WOLFSSL_ASYNC_CRYPT_SW is mutually exclusive with WOLF_CRYPTO_CB
+ * because the async polling code uses #elif between them. When using
+ * crypto callbacks for async operations, do not define WOLFSSL_ASYNC_CRYPT_SW.
+ */
+#ifndef WOLF_CRYPTO_CB
+    #define WOLFSSL_ASYNC_CRYPT_SW
+#endif
+
 #define HAVE_AESGCM
 
 #define WOLFSSL_SHA512
+#define WOLFSSL_HASH_FLAGS
 
 #define WOLFSSL_TLS13
 #define HAVE_HKDF