diff --git a/makefiles/pseudomodules.inc.mk b/makefiles/pseudomodules.inc.mk index 6fb6e46843..9e17653459 100644 --- a/makefiles/pseudomodules.inc.mk +++ b/makefiles/pseudomodules.inc.mk @@ -20,7 +20,6 @@ PSEUDOMODULES += core_% PSEUDOMODULES += cortexm_fpu PSEUDOMODULES += cortexm_svc PSEUDOMODULES += cpu_check_address -PSEUDOMODULES += crypto_% # crypto_aes or crypto_3des PSEUDOMODULES += dbgpin PSEUDOMODULES += devfs_% PSEUDOMODULES += dhcpv6_% diff --git a/pkg/openwsn/Makefile.dep b/pkg/openwsn/Makefile.dep index 12f55e540e..4af60d9d4c 100644 --- a/pkg/openwsn/Makefile.dep +++ b/pkg/openwsn/Makefile.dep @@ -44,7 +44,6 @@ ifneq (,$(filter openwsn_coap,$(USEMODULE))) endif ifneq (,$(filter openwsn_crypto,$(USEMODULE))) - USEMODULE += crypto_3des USEMODULE += cipher_modes endif diff --git a/sys/crypto/Kconfig b/sys/crypto/Kconfig index 24cf354ed0..ce99ad759a 100644 --- a/sys/crypto/Kconfig +++ b/sys/crypto/Kconfig @@ -23,10 +23,6 @@ config CRYPTO_AES bool "AES" select MODULE_CRYPTO -config MODULE_CRYPTO_3DES - bool "3DES (deprecated)" - select MODULE_CRYPTO - endchoice menu "Crypto AES options" diff --git a/sys/include/crypto/ciphers.h b/sys/include/crypto/ciphers.h index b34e529672..152dc2b662 100644 --- a/sys/include/crypto/ciphers.h +++ b/sys/include/crypto/ciphers.h @@ -50,13 +50,10 @@ extern "C" { * Context sizes needed for the different ciphers. * Always order by number of bytes descending!!!

* - * threedes needs 24 bytes
* aes needs CIPHERS_MAX_KEY_SIZE bytes
*/ -#if defined(MODULE_CRYPTO_3DES) - #define CIPHER_MAX_CONTEXT_SIZE 24 -#elif IS_USED(MODULE_CRYPTO_AES_256) || IS_USED(MODULE_CRYPTO_AES_192) || \ - IS_USED(MODULE_CRYPTO_AES_128) +#if IS_USED(MODULE_CRYPTO_AES_256) || IS_USED(MODULE_CRYPTO_AES_192) || \ + IS_USED(MODULE_CRYPTO_AES_128) #define CIPHER_MAX_CONTEXT_SIZE CIPHERS_MAX_KEY_SIZE #else /* 0 is not a possibility because 0-sized arrays are not allowed in ISO C */ diff --git a/tests/sys_crypto/Makefile b/tests/sys_crypto/Makefile index fc2892f7f9..f9438f3de8 100644 --- a/tests/sys_crypto/Makefile +++ b/tests/sys_crypto/Makefile @@ -2,7 +2,6 @@ include ../Makefile.tests_common USEMODULE += embunit -USEMODULE += crypto_3des USEMODULE += cipher_modes USEMODULE += crypto_aes_128 USEMODULE += crypto_aes_192