wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2026-07-09 13:30:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Error out when trying to register a a cryptocb with an existing devId

Browse Source
This commit is contained in:
Alex Lanzano
2026-06-05 14:35:21 -04:00
parent ef777ce646
commit 451eaf9cba
3 changed files with 53 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/api.c
+45 -3
View File
@@ -29227,13 +29227,14 @@ static int test_wc_CryptoCb(void)
(!defined(NO_RSA) || defined(HAVE_ECC) || defined(HAVE_ED25519))
int tlsVer;
#endif
/* TODO: Add crypto callback API tests */
/* Test wc_CryptoCb_GetDevice() lookup behavior. */
/* Exercise the exposed CryptoCb device-management API:
* wc_CryptoCb_RegisterDevice / UnRegisterDevice / GetDevice /
* DefaultDevID (and InfoString when DEBUG_CRYPTOCB is enabled). */
{
int getDevId = 1234;
int getDevCtx = 0;
CryptoCb* dev = NULL;
int i, n, rc;
/* Unregistered devId is not found. */
ExpectNull(wc_CryptoCb_GetDevice(getDevId));
@@ -29250,9 +29251,50 @@ static int test_wc_CryptoCb(void)
/* A different, unregistered devId is still not found. */
ExpectNull(wc_CryptoCb_GetDevice(getDevId + 1));
/* Re-registering an already-registered devId is rejected. */
ExpectIntEQ(wc_CryptoCb_RegisterDevice(getDevId, NULL, &getDevCtx),
WC_NO_ERR_TRACE(ALREADY_E));
/* wc_CryptoCb_DefaultDevID behavior depends on the build config. */
#ifdef WC_NO_DEFAULT_DEVID
ExpectIntEQ(wc_CryptoCb_DefaultDevID(), INVALID_DEVID);
#elif !defined(WOLFSSL_CAAM_DEVID) && !defined(HAVE_ARIA) && \
!defined(WC_USE_DEVID)
/* "first available" mode: a device is registered, so one is returned. */
ExpectIntNE(wc_CryptoCb_DefaultDevID(), INVALID_DEVID);
#endif
/* After unregistering, the device is no longer found. */
wc_CryptoCb_UnRegisterDevice(getDevId);
ExpectNull(wc_CryptoCb_GetDevice(getDevId));
/* Unregistering is a harmless no-op for unknown or invalid devIds. */
wc_CryptoCb_UnRegisterDevice(getDevId); /* already removed */
wc_CryptoCb_UnRegisterDevice(INVALID_DEVID); /* never a real devId */
ExpectNull(wc_CryptoCb_GetDevice(getDevId));
/* The device table is finite: once full, registration returns
* BUFFER_E. Register unique devIds until that happens, then clean up.
* The cap (256) just guards against an unexpectedly large table. */
rc = 0;
for (i = 0; rc == 0 && i < 256; i++) {
rc = wc_CryptoCb_RegisterDevice(0x5000 + i, NULL, NULL);
}
ExpectIntEQ(rc, WC_NO_ERR_TRACE(BUFFER_E));
/* Every id except the final failed attempt registered; unregister them. */
for (n = 0; n + 1 < i; n++) {
wc_CryptoCb_UnRegisterDevice(0x5000 + n);
}
#ifdef DEBUG_CRYPTOCB
/* wc_CryptoCb_InfoString smoke test: must not dereference bad memory. */
{
wc_CryptoInfo info;
XMEMSET(&info, 0, sizeof(info));
info.algo_type = WC_ALGO_TYPE_NONE;
wc_CryptoCb_InfoString(&info);
}
#endif
}
#ifdef HAVE_IO_TESTS_DEPENDENCIES
wolfcrypt/src/cryptocb.c
+6 -4
View File
@@ -446,12 +446,14 @@ void wc_CryptoCb_SetDeviceFindCb(CryptoDevCallbackFind cb)
int wc_CryptoCb_RegisterDevice(int devId, CryptoDevCallbackFunc cb, void* ctx)
{
int rc = 0;
CryptoCb* dev;
/* find existing or new */
CryptoCb* dev = wc_CryptoCb_GetDevice(devId);
if (dev == NULL)
dev = wc_CryptoCb_GetDevice(INVALID_DEVID);
/* Reject re-registration of an already-registered device ID. */
if (wc_CryptoCb_GetDevice(devId) != NULL)
return ALREADY_E;
/* find a free slot */
dev = wc_CryptoCb_GetDevice(INVALID_DEVID);
if (dev == NULL)
return BUFFER_E; /* out of devices */
wolfssl/version.h
+2 -2
View File
@@ -28,8 +28,8 @@
extern "C" {
#endif
#define LIBWOLFSSL_VERSION_STRING "5.8.4"
#define LIBWOLFSSL_VERSION_HEX 0x05008004
#define LIBWOLFSSL_VERSION_STRING "5.9.1"
#define LIBWOLFSSL_VERSION_HEX 0x05009001
#ifdef __cplusplus
}