Merge pull request #1124 from Kijewski/consolidate-crypto

sys:crypto: put ciphers into one module

Makefile.dep

@@ -76,3 +76,7 @@ endif
 ifneq (,$(filter shell_commands,$(USEMODULE)))
 	USEMODULE += net_help
 endif
+
+ifneq (,$(filter ccn_lite,$(USEMODULE)))
+	USEMODULE += crypto
+endif

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
 

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

sys/Makefile

@@ -71,23 +71,8 @@ endif
 ifneq (,$(filter bloom,$(USEMODULE)))
     DIRS += bloom
 endif
-ifneq (,$(filter crypto_3des,$(USEMODULE)))
+ifneq (,$(filter crypto,$(USEMODULE)))
-    DIRS += crypto/3des
+    DIRS += crypto
-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
 endif
 ifneq (,$(filter random,$(USEMODULE)))
     DIRS += random

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

sys/crypto/3des/Makefile

@@ -1,3 +0,0 @@
-MODULE = crypto_3des
-
-include $(RIOTBASE)/Makefile.base

sys/crypto/Makefile

@@ -1,3 +1,3 @@
-MODULE = crypto_aes
+MODULE = crypto
 
 include $(RIOTBASE)/Makefile.base

sys/crypto/rc5/Makefile

@@ -1,3 +0,0 @@
-MODULE = crypto_rc5
-
-include $(RIOTBASE)/Makefile.base

sys/crypto/sha256/Makefile

@@ -1,3 +0,0 @@
-MODULE = crypto_sha256
-
-include $(RIOTBASE)/Makefile.base

sys/crypto/skipjack/Makefile

@@ -1,3 +0,0 @@
-MODULE = crypto_skipjack
-
-include $(RIOTBASE)/Makefile.base

sys/crypto/twofish/Makefile

@@ -1,3 +0,0 @@
-MODULE = crypto_twofish
-
-include $(RIOTBASE)/Makefile.base

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