wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-02 20:24:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8555 from bigbrett/default-devid-disable

Browse Source 
Add option to disallow automatic use of "default" devId
This commit is contained in:
David Garske
2025-03-20 10:56:17 -07:00
committed by GitHub
parent 3e5ee7c142 c7db28ef5a
commit 4c0d4a931e
2 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
configure.ac
View File

@@ -8802,10 +8802,20 @@ AC_ARG_ENABLE([cryptodev],
# Support for crypto callbacks # Support for crypto callbacks
AC_ARG_ENABLE([cryptocb], AC_ARG_ENABLE([cryptocb],
[AS_HELP_STRING([--enable-cryptocb],[Enable crypto callbacks (default: disabled)])], [AS_HELP_STRING([--enable-cryptocb],
[ ENABLED_CRYPTOCB=$enableval ], [Enable crypto callbacks (default: disabled). Use 'no-default-devid' to enable without a platform-specific default device ID])],
[ ENABLED_CRYPTOCB=no ] [
) case "$enableval" in
no-default-devid)
ENABLED_CRYPTOCB=yes
AM_CPPFLAGS="$AM_CPPFLAGS -DWC_NO_DEFAULT_DEVID"
;;
*)
ENABLED_CRYPTOCB="$enableval"
;;
esac
],
[ ENABLED_CRYPTOCB=no ])
# Enable testing of cryptoCb using software crypto. On platforms where wolfCrypt tests # Enable testing of cryptoCb using software crypto. On platforms where wolfCrypt tests
# are used to test a custom cryptoCb, it may be desired to disable this so wolfCrypt tests # are used to test a custom cryptoCb, it may be desired to disable this so wolfCrypt tests

7
wolfcrypt/src/cryptocb.c
View File

@@ -1882,6 +1882,12 @@ int wc_CryptoCb_DefaultDevID(void)
{ {
int ret; int ret;
/* Explicitly disable the "default devId" behavior. Ensures that any devId
* will only be used if explicitly passed as an argument to crypto functions,
* and never automatically selected. */
#ifdef WC_NO_DEFAULT_DEVID
ret = INVALID_DEVID;
#else
/* conditional macro selection based on build */ /* conditional macro selection based on build */
#ifdef WOLFSSL_CAAM_DEVID #ifdef WOLFSSL_CAAM_DEVID
ret = WOLFSSL_CAAM_DEVID; ret = WOLFSSL_CAAM_DEVID;
@@ -1893,6 +1899,7 @@ int wc_CryptoCb_DefaultDevID(void)
/* try first available */ /* try first available */
ret = wc_CryptoCb_GetDevIdAtIndex(0); ret = wc_CryptoCb_GetDevIdAtIndex(0);
#endif #endif
#endif /* WC_NO_DEFAULT_DEVID */
return ret; return ret;
} }