sys:crypto: put ciphers into one module

9 years ago · 96fba8a19b
18 changed files with 9 additions and 52 deletions
--- a/Makefile.dep
+++ b/Makefile.dep
@ -76,3 +76,7 @@ endif
 ifneq (,$(filter shell_commands,$(USEMODULE)))
 	USEMODULE += net_help
 endif
+
+ifneq (,$(filter ccn_lite,$(USEMODULE)))
+	USEMODULE += crypto
+endif
--- a/examples/ccn-lite-client/Makefile
+++ b/examples/ccn-lite-client/Makefile
@ -48,7 +48,6 @@ USEMODULE += ps
 USEMODULE += random
 USEMODULE += defaulttransceiver
 USEMODULE += rtc
-USEMODULE += crypto_sha256
 USEMODULE += ccn_lite
 USEMODULE += ccn_lite_client

--- a/examples/ccn-lite-relay/Makefile
+++ b/examples/ccn-lite-relay/Makefile
@ -45,7 +45,6 @@ USEMODULE += posix

 USEMODULE += defaulttransceiver
 USEMODULE += rtc
-USEMODULE += crypto_sha256
 USEMODULE += ccn_lite

 include $(RIOTBASE)/Makefile.include
--- a/sys/Makefile
+++ b/sys/Makefile
@ -71,23 +71,8 @@ endif
 ifneq (,$(filter bloom,$(USEMODULE)))
    DIRS += bloom
 endif
-ifneq (,$(filter crypto_3des,$(USEMODULE)))
-    DIRS += crypto/3des
-endif
-ifneq (,$(filter crypto_aes,$(USEMODULE)))
-    DIRS += crypto/aes
-endif
-ifneq (,$(filter crypto_rc5,$(USEMODULE)))
-    DIRS += crypto/rc5
-endif
-ifneq (,$(filter crypto_sha256,$(USEMODULE)))
-    DIRS += crypto/sha256
-endif
-ifneq (,$(filter crypto_skipjack,$(USEMODULE)))
-    DIRS += crypto/skipjack
-endif
-ifneq (,$(filter crypto_twofish,$(USEMODULE)))
-    DIRS += crypto/twofish
+ifneq (,$(filter crypto,$(USEMODULE)))
+    DIRS += crypto
 endif
 ifneq (,$(filter random,$(USEMODULE)))
    DIRS += random
--- a/sys/Makefile.include
+++ b/sys/Makefile.include
@ -30,24 +30,9 @@ ifneq (,$(filter ccn_lite_client,$(USEMODULE)))
    USEMODULE_INCLUDES += $(RIOTBASE)/sys/net/include
 endif

-ifneq (,$(filter crypto_3des,$(USEMODULE)))
+ifneq (,$(filter crypto,$(USEMODULE)))
    USEMODULE_INCLUDES += $(RIOTBASE)/include/crypto
 endif
-ifneq (,$(filter crypto_aes,$(USEMODULE)))
-    USEMODULE_INCLUDES += $(RIOTBASE)/sys/include/crypto
-endif
-ifneq (,$(filter crypto_rc5,$(USEMODULE)))
-    USEMODULE_INCLUDES += $(RIOTBASE)/sys/include/crypto
-endif
-ifneq (,$(filter crypto_sha256,$(USEMODULE)))
-    USEMODULE_INCLUDES += $(RIOTBASE)/sys/include/crypto
-endif
-ifneq (,$(filter crypto_skipjack,$(USEMODULE)))
-    USEMODULE_INCLUDES += $(RIOTBASE)/sys/include/crypto
-endif
-ifneq (,$(filter crypto_twofish,$(USEMODULE)))
-    USEMODULE_INCLUDES += $(RIOTBASE)/sys/include/crypto
-endif

 ifneq (,$(filter posix,$(USEMODULE)))
    USEMODULE_INCLUDES += $(RIOTBASE)/sys/posix/include
--- a/sys/crypto/3des/3des.c
+++ b/sys/crypto/3des/3des.c
--- a/sys/crypto/3des/Makefile
+++ b/sys/crypto/3des/Makefile
@ -1,3 +0,0 @@
-MODULE = crypto_3des
-
-include $(RIOTBASE)/Makefile.base
--- a/sys/crypto/rc5/Makefile
+++ b/sys/crypto/rc5/Makefile
@ -1,3 +1,3 @@
-MODULE = crypto_rc5
+MODULE = crypto

 include $(RIOTBASE)/Makefile.base
--- a/sys/crypto/aes/aes.c
+++ b/sys/crypto/aes/aes.c
--- a/sys/crypto/aes/Makefile
+++ b/sys/crypto/aes/Makefile
@ -1,3 +0,0 @@
-MODULE = crypto_aes
-
-include $(RIOTBASE)/Makefile.base
--- a/sys/crypto/rc5/rc5.c
+++ b/sys/crypto/rc5/rc5.c
--- a/sys/crypto/sha256/sha256.c
+++ b/sys/crypto/sha256/sha256.c
--- a/sys/crypto/sha256/Makefile
+++ b/sys/crypto/sha256/Makefile
@ -1,3 +0,0 @@
-MODULE = crypto_sha256
-
-include $(RIOTBASE)/Makefile.base
--- a/sys/crypto/skipjack/skipjack.c
+++ b/sys/crypto/skipjack/skipjack.c
--- a/sys/crypto/skipjack/Makefile
+++ b/sys/crypto/skipjack/Makefile
@ -1,3 +0,0 @@
-MODULE = crypto_skipjack
-
-include $(RIOTBASE)/Makefile.base
--- a/sys/crypto/twofish/twofish.c
+++ b/sys/crypto/twofish/twofish.c
--- a/sys/crypto/twofish/Makefile
+++ b/sys/crypto/twofish/Makefile
@ -1,3 +0,0 @@
-MODULE = crypto_twofish
-
-include $(RIOTBASE)/Makefile.base
--- a/tests/test_sha256/Makefile
+++ b/tests/test_sha256/Makefile
@ -1,7 +1,7 @@
 export PROJECT = test_sha256
 include ../Makefile.tests_common

-USEMODULE += crypto_sha256
+USEMODULE += crypto

 DISABLE_MODULE += auto_init