Skip to content

Commit 3ad5ec4

Browse files
committed
make --enable-linuxkm-lkcapi-register require --enable-experimental, except for the known-good --enable-linuxkm-lkcapi-register="xts(aes)".
1 parent 70d7b6e commit 3ad5ec4

2 files changed

Lines changed: 14 additions & 1 deletion

File tree

configure.ac

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8363,13 +8363,17 @@ then
83638363
for lkcapi_alg in $(echo "$ENABLED_LINUXKM_LKCAPI_REGISTER" | tr ',' ' ')
83648364
do
83658365
case "$lkcapi_alg" in
8366-
all) AM_CFLAGS="$AM_CFLAGS -DLINUXKM_LKCAPI_REGISTER_ALL" ;;
8366+
all) test "$ENABLED_EXPERIMENTAL" = "yes" || AC_MSG_ERROR([linuxkm-lkcapi-register ${lkcapi_alg}: requires --enable-experimental.])
8367+
AM_CFLAGS="$AM_CFLAGS -DLINUXKM_LKCAPI_REGISTER_ALL" ;;
83678368
'cbc(aes)') test "$ENABLED_AESCBC" != "no" || AC_MSG_ERROR([linuxkm-lkcapi-register ${lkcapi_alg}: AES-CBC implementation not enabled.])
8369+
test "$ENABLED_EXPERIMENTAL" = "yes" || AC_MSG_ERROR([linuxkm-lkcapi-register ${lkcapi_alg}: requires --enable-experimental.])
83688370
AM_CFLAGS="$AM_CFLAGS -DLINUXKM_LKCAPI_REGISTER_AESCBC" ;;
83698371
'cfb(aes)') test "$ENABLED_AESCFB" != "no" || AC_MSG_ERROR([linuxkm-lkcapi-register ${lkcapi_alg}: AES-CFB implementation not enabled.])
8372+
test "$ENABLED_EXPERIMENTAL" = "yes" || AC_MSG_ERROR([linuxkm-lkcapi-register ${lkcapi_alg}: requires --enable-experimental.])
83708373
AM_CFLAGS="$AM_CFLAGS -DLINUXKM_LKCAPI_REGISTER_AESCFB" ;;
83718374
'gcm(aes)') test "$ENABLED_AESGCM" != "no" || AC_MSG_ERROR([linuxkm-lkcapi-register ${lkcapi_alg}: AES-GCM implementation not enabled.])
83728375
test "$ENABLED_AESGCM_STREAM" != "no" || AC_MSG_ERROR([linuxkm-lkcapi-register ${lkcapi_alg}: --enable-aesgcm-stream is required for LKCAPI.])
8376+
test "$ENABLED_EXPERIMENTAL" = "yes" || AC_MSG_ERROR([linuxkm-lkcapi-register ${lkcapi_alg}: requires --enable-experimental.])
83738377
AM_CFLAGS="$AM_CFLAGS -DLINUXKM_LKCAPI_REGISTER_AESGCM" ;;
83748378
'xts(aes)') test "$ENABLED_AESXTS" != "no" || AC_MSG_ERROR([linuxkm-lkcapi-register ${lkcapi_alg}: AES-XTS implementation not enabled.])
83758379
test "$ENABLED_AESXTS_STREAM" != "no" || AC_MSG_ERROR([linuxkm-lkcapi-register ${lkcapi_alg}: --enable-aesxts-stream is required for LKCAPI.])

linuxkm/lkcapi_glue.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,16 +75,25 @@
7575
#if defined(HAVE_AES_CBC) && \
7676
(defined(LINUXKM_LKCAPI_REGISTER_ALL) || \
7777
defined(LINUXKM_LKCAPI_REGISTER_AESCBC))
78+
#ifndef WOLFSSL_EXPERIMENTAL_SETTINGS
79+
#error Experimental settings without WOLFSSL_EXPERIMENTAL_SETTINGS
80+
#endif
7881
static int linuxkm_test_aescbc(void);
7982
#endif
8083
#if defined(WOLFSSL_AES_CFB) && \
8184
(defined(LINUXKM_LKCAPI_REGISTER_ALL) || \
8285
defined(LINUXKM_LKCAPI_REGISTER_AESCFB))
86+
#ifndef WOLFSSL_EXPERIMENTAL_SETTINGS
87+
#error Experimental settings without WOLFSSL_EXPERIMENTAL_SETTINGS
88+
#endif
8389
static int linuxkm_test_aescfb(void);
8490
#endif
8591
#if defined(HAVE_AESGCM) && \
8692
(defined(LINUXKM_LKCAPI_REGISTER_ALL) || \
8793
defined(LINUXKM_LKCAPI_REGISTER_AESGCM))
94+
#ifndef WOLFSSL_EXPERIMENTAL_SETTINGS
95+
#error Experimental settings without WOLFSSL_EXPERIMENTAL_SETTINGS
96+
#endif
8897
static int linuxkm_test_aesgcm(void);
8998
#endif
9099
#if defined(WOLFSSL_AES_XTS) && \

0 commit comments

Comments
 (0)