From 1dde2cd3bcae3607f886a6bd0348ac490fffe5e0 Mon Sep 17 00:00:00 2001 From: Ollrogge Date: Tue, 25 Jan 2022 09:57:36 +0100 Subject: [PATCH] sys/fido2: remove unnecessary module import from Makefile.dep --- pkg/Kconfig | 1 + pkg/fido2_tests/Kconfig | 4 ++++ sys/Makefile.dep | 1 - tests/sys_fido2_ctap/app.config.test | 7 +++++++ 4 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 pkg/fido2_tests/Kconfig diff --git a/pkg/Kconfig b/pkg/Kconfig index ece75a5525..66ed1644b5 100644 --- a/pkg/Kconfig +++ b/pkg/Kconfig @@ -19,6 +19,7 @@ rsource "elk/Kconfig" rsource "emlearn/Kconfig" rsource "esp8266_sdk/Kconfig" rsource "fff/Kconfig" +rsource "fido2_tests/Kconfig" rsource "gecko_sdk/Kconfig" rsource "gemmlowp/Kconfig" rsource "hacl/Kconfig" diff --git a/pkg/fido2_tests/Kconfig b/pkg/fido2_tests/Kconfig new file mode 100644 index 0000000000..9648b31c7d --- /dev/null +++ b/pkg/fido2_tests/Kconfig @@ -0,0 +1,4 @@ +config PACKAGE_FIDO2_TESTS + bool "FIDO2 tests" + help + Test suite for FIDO2, U2F, and other security key functions. diff --git a/sys/Makefile.dep b/sys/Makefile.dep index 8fe3156298..6fd0908ccf 100644 --- a/sys/Makefile.dep +++ b/sys/Makefile.dep @@ -840,7 +840,6 @@ ifneq (,$(filter fido2_ctap,$(USEMODULE))) USEMODULE += ztimer_msec USEMODULE += event USEMODULE += event_timeout - USEMODULE += prng_sha256prng USEMODULE += cipher_modes USEMODULE += crypto_aes_256 USEMODULE += hashes diff --git a/tests/sys_fido2_ctap/app.config.test b/tests/sys_fido2_ctap/app.config.test index 04d26692af..5d3f10b646 100644 --- a/tests/sys_fido2_ctap/app.config.test +++ b/tests/sys_fido2_ctap/app.config.test @@ -4,3 +4,10 @@ CONFIG_MODULE_FIDO2=y CONFIG_MODULE_FIDO2_CTAP=y CONFIG_MODULE_FIDO2_CTAP_TRANSPORT=y CONFIG_MODULE_FIDO2_CTAP_TRANSPORT_HID=y + +CONFIG_PACKAGE_FIDO2_TESTS=y + +# Should be autoselecting the MODULE_PRNG_HWRNG if possible +# Since the makefile cannot we have to override until end of migration +# Remove when TEST_KCONFIG is complete +CONFIG_MODULE_PRNG_MUSL_LCG=y