riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sys/crypto: Remove leftover code related to deprecated 3DES block cipher

Browse Source
This commit is contained in:
Ollrogge 2021-04-14 22:26:20 +02:00
parent 427d2bd06e
commit b1a2d4787d
5 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
makefiles/pseudomodules.inc.mk
View File

@ -20,7 +20,6 @@ PSEUDOMODULES += core_%
PSEUDOMODULES += cortexm_fpu PSEUDOMODULES += cortexm_fpu
PSEUDOMODULES += cortexm_svc PSEUDOMODULES += cortexm_svc
PSEUDOMODULES += cpu_check_address PSEUDOMODULES += cpu_check_address
PSEUDOMODULES += crypto_% # crypto_aes or crypto_3des
PSEUDOMODULES += dbgpin PSEUDOMODULES += dbgpin
PSEUDOMODULES += devfs_% PSEUDOMODULES += devfs_%
PSEUDOMODULES += dhcpv6_% PSEUDOMODULES += dhcpv6_%

1
pkg/openwsn/Makefile.dep
View File

@ -44,7 +44,6 @@ ifneq (,$(filter openwsn_coap,$(USEMODULE)))
endif endif
ifneq (,$(filter openwsn_crypto,$(USEMODULE))) ifneq (,$(filter openwsn_crypto,$(USEMODULE)))
USEMODULE += crypto_3des
USEMODULE += cipher_modes USEMODULE += cipher_modes
endif endif

4
sys/crypto/Kconfig
View File

@ -23,10 +23,6 @@ config CRYPTO_AES
bool "AES" bool "AES"
select MODULE_CRYPTO select MODULE_CRYPTO
config MODULE_CRYPTO_3DES
bool "3DES (deprecated)"
select MODULE_CRYPTO
endchoice endchoice
menu "Crypto AES options" menu "Crypto AES options"

7
sys/include/crypto/ciphers.h
View File

@ -50,13 +50,10 @@ extern "C" {
* Context sizes needed for the different ciphers. * Context sizes needed for the different ciphers.
* Always order by number of bytes descending!!! <br><br> * Always order by number of bytes descending!!! <br><br>
* *
* threedes needs 24 bytes <br>
* aes needs CIPHERS_MAX_KEY_SIZE bytes <br> * aes needs CIPHERS_MAX_KEY_SIZE bytes <br>
*/ */
#if defined(MODULE_CRYPTO_3DES) #if IS_USED(MODULE_CRYPTO_AES_256) || IS_USED(MODULE_CRYPTO_AES_192) || \
#define CIPHER_MAX_CONTEXT_SIZE 24 IS_USED(MODULE_CRYPTO_AES_128)
#elif 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 #define CIPHER_MAX_CONTEXT_SIZE CIPHERS_MAX_KEY_SIZE
#else #else
/* 0 is not a possibility because 0-sized arrays are not allowed in ISO C */ /* 0 is not a possibility because 0-sized arrays are not allowed in ISO C */

1
tests/sys_crypto/Makefile
View File

@ -2,7 +2,6 @@ include ../Makefile.tests_common
USEMODULE += embunit USEMODULE += embunit
USEMODULE += crypto_3des
USEMODULE += cipher_modes USEMODULE += cipher_modes
USEMODULE += crypto_aes_128 USEMODULE += crypto_aes_128
USEMODULE += crypto_aes_192 USEMODULE += crypto_aes_192