Expose wc_CryptoCb_GetDevice and add CryptoCb API test coverage

Author: AlexLanzano

tests/api.c

@@ -28972,13 +28972,39 @@ static int test_wc_CryptoCb(void)
 #if defined(WOLF_CRYPTO_CB) && \
     (!defined(WOLF_CRYPTO_CB_ONLY_SHA256) && !defined(WOLF_CRYPTO_CB_ONLY_AES) && \
      !defined(WOLF_CRYPTO_CB_ONLY_ECC) && !defined(WOLF_CRYPTO_CB_ONLY_RSA))
+#if defined(HAVE_IO_TESTS_DEPENDENCIES) && \
+    (!defined(NO_RSA) || defined(HAVE_ECC) || defined(HAVE_ED25519))
+    int tlsVer;
+#endif
     /* TODO: Add crypto callback API tests */
 
-#ifdef HAVE_IO_TESTS_DEPENDENCIES
-    #if !defined(NO_RSA) || defined(HAVE_ECC) || defined(HAVE_ED25519)
-    int tlsVer;
-    #endif
+    /* Test wc_CryptoCb_GetDevice() lookup behavior. */
+    {
+        int    getDevId  = 1234;
+        int    getDevCtx = 0;
+        CryptoCb* dev     = NULL;
+
+        /* Unregistered devId is not found. */
+        ExpectNull(wc_CryptoCb_GetDevice(getDevId));
+
+        /* After registering, the device is found with matching fields. */
+        ExpectIntEQ(wc_CryptoCb_RegisterDevice(getDevId, NULL, &getDevCtx), 0);
+        ExpectNotNull(dev = wc_CryptoCb_GetDevice(getDevId));
+        if (dev != NULL) {
+            ExpectIntEQ(dev->devId, getDevId);
+            ExpectNull(dev->cb);
+            ExpectPtrEq(dev->ctx, &getDevCtx);
+        }
+
+        /* A different, unregistered devId is still not found. */
+        ExpectNull(wc_CryptoCb_GetDevice(getDevId + 1));
 
+        /* After unregistering, the device is no longer found. */
+        wc_CryptoCb_UnRegisterDevice(getDevId);
+        ExpectNull(wc_CryptoCb_GetDevice(getDevId));
+    }
+
+#ifdef HAVE_IO_TESTS_DEPENDENCIES
     #ifndef NO_RSA
     for (tlsVer = WOLFSSL_SSLV3; tlsVer <= WOLFSSL_DTLSV1; tlsVer++) {
         ExpectIntEQ(test_wc_CryptoCb_TLS(tlsVer,

wolfcrypt/src/cryptocb.c

@@ -74,11 +74,6 @@ Crypto Callback Build Options:
 #define MAX_CRYPTO_DEVID_CALLBACKS 8
 #endif
 
-typedef struct CryptoCb {
-    int devId;
-    CryptoDevCallbackFunc cb;
-    void* ctx;
-} CryptoCb;
 static WC_THREADSHARED CryptoCb gCryptoDev[MAX_CRYPTO_DEVID_CALLBACKS];
 
 #ifdef WOLF_CRYPTO_CB_FIND
@@ -345,7 +340,7 @@ void wc_CryptoCb_InfoString(wc_CryptoInfo* info)
 
 /* Search through listed devices and return the first matching device ID
  * found. */
-static CryptoCb* wc_CryptoCb_GetDevice(int devId)
+CryptoCb* wc_CryptoCb_GetDevice(int devId)
 {
     int i;
     for (i = 0; i < MAX_CRYPTO_DEVID_CALLBACKS; i++) {

wolfssl/version.h

@@ -28,8 +28,8 @@
 extern "C" {
 #endif
 
-#define LIBWOLFSSL_VERSION_STRING "5.9.1"
-#define LIBWOLFSSL_VERSION_HEX 0x05009001
+#define LIBWOLFSSL_VERSION_STRING "5.8.4"
+#define LIBWOLFSSL_VERSION_HEX 0x05008004
 
 #ifdef __cplusplus
 }

wolfssl/wolfcrypt/cryptocb.h

@@ -672,12 +672,19 @@ typedef struct wc_CryptoInfo {
 
 typedef int (*CryptoDevCallbackFunc)(int devId, struct wc_CryptoInfo* info, void* ctx);
 
+typedef struct CryptoCb {
+    int devId;
+    CryptoDevCallbackFunc cb;
+    void* ctx;
+} CryptoCb;
+
 WOLFSSL_LOCAL void wc_CryptoCb_Init(void);
 WOLFSSL_LOCAL void wc_CryptoCb_Cleanup(void);
 WOLFSSL_LOCAL int wc_CryptoCb_GetDevIdAtIndex(int startIdx);
 WOLFSSL_API int  wc_CryptoCb_RegisterDevice(int devId, CryptoDevCallbackFunc cb, void* ctx);
 WOLFSSL_API void wc_CryptoCb_UnRegisterDevice(int devId);
 WOLFSSL_API int wc_CryptoCb_DefaultDevID(void);
+WOLFSSL_API CryptoCb* wc_CryptoCb_GetDevice(int devId);
 
 #ifdef WOLF_CRYPTO_CB_FIND
 typedef int (*CryptoDevCallbackFind)(int devId, int algoType);