From 96fba8a19b8f6b04b0cb7c6303b1a89d90324e7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Kijewski?= <rene.kijewski@fu-berlin.de>
Date: Thu, 8 May 2014 19:06:07 +0200
Subject: [PATCH] sys:crypto: put ciphers into one module
---
Makefile.dep | 4 ++++
examples/ccn-lite-client/Makefile | 1 -
examples/ccn-lite-relay/Makefile | 1 -
sys/Makefile | 19 ++-----------------
sys/Makefile.include | 17 +----------------
sys/crypto/{3des => }/3des.c | 0
sys/crypto/3des/Makefile | 3 ---
sys/crypto/{aes => }/Makefile | 2 +-
sys/crypto/{aes => }/aes.c | 0
sys/crypto/{rc5 => }/rc5.c | 0
sys/crypto/rc5/Makefile | 3 ---
sys/crypto/{sha256 => }/sha256.c | 0
sys/crypto/sha256/Makefile | 3 ---
sys/crypto/{skipjack => }/skipjack.c | 0
sys/crypto/skipjack/Makefile | 3 ---
sys/crypto/{twofish => }/twofish.c | 0
sys/crypto/twofish/Makefile | 3 ---
tests/test_sha256/Makefile | 2 +-
18 files changed, 9 insertions(+), 52 deletions(-)
rename sys/crypto/{3des => }/3des.c (100%)
delete mode 100644 sys/crypto/3des/Makefile
rename sys/crypto/{aes => }/Makefile (63%)
rename sys/crypto/{aes => }/aes.c (100%)
rename sys/crypto/{rc5 => }/rc5.c (100%)
delete mode 100644 sys/crypto/rc5/Makefile
rename sys/crypto/{sha256 => }/sha256.c (100%)
delete mode 100644 sys/crypto/sha256/Makefile
rename sys/crypto/{skipjack => }/skipjack.c (100%)
delete mode 100644 sys/crypto/skipjack/Makefile
rename sys/crypto/{twofish => }/twofish.c (100%)
delete mode 100644 sys/crypto/twofish/Makefile
diff --git a/Makefile.dep b/Makefile.dep
index 107e3abaa9..340278cc70 100644
--- 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
diff --git a/examples/ccn-lite-client/Makefile b/examples/ccn-lite-client/Makefile
index dffa1ea94f..fc4384a908 100644
--- 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
diff --git a/examples/ccn-lite-relay/Makefile b/examples/ccn-lite-relay/Makefile
index b3d1f8c749..967fff1915 100644
--- 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
diff --git a/sys/Makefile b/sys/Makefile
index 8729f6ddcd..e9e61c1ccf 100644
--- 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
diff --git a/sys/Makefile.include b/sys/Makefile.include
index 4a35e9508c..ddf496ce1b 100644
--- 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
diff --git a/sys/crypto/3des/3des.c b/sys/crypto/3des.c
similarity index 100%
rename from sys/crypto/3des/3des.c
rename to sys/crypto/3des.c
diff --git a/sys/crypto/3des/Makefile b/sys/crypto/3des/Makefile
deleted file mode 100644
index 1f5e5d84ef..0000000000
--- a/sys/crypto/3des/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-MODULE = crypto_3des
-
-include $(RIOTBASE)/Makefile.base
diff --git a/sys/crypto/aes/Makefile b/sys/crypto/Makefile
similarity index 63%
rename from sys/crypto/aes/Makefile
rename to sys/crypto/Makefile
index f00a84dbc6..de999331f7 100644
--- a/sys/crypto/aes/Makefile
+++ b/sys/crypto/Makefile
@@ -1,3 +1,3 @@
-MODULE = crypto_aes
+MODULE = crypto
include $(RIOTBASE)/Makefile.base
diff --git a/sys/crypto/aes/aes.c b/sys/crypto/aes.c
similarity index 100%
rename from sys/crypto/aes/aes.c
rename to sys/crypto/aes.c
diff --git a/sys/crypto/rc5/rc5.c b/sys/crypto/rc5.c
similarity index 100%
rename from sys/crypto/rc5/rc5.c
rename to sys/crypto/rc5.c
diff --git a/sys/crypto/rc5/Makefile b/sys/crypto/rc5/Makefile
deleted file mode 100644
index a78c1bd74f..0000000000
--- a/sys/crypto/rc5/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-MODULE = crypto_rc5
-
-include $(RIOTBASE)/Makefile.base
diff --git a/sys/crypto/sha256/sha256.c b/sys/crypto/sha256.c
similarity index 100%
rename from sys/crypto/sha256/sha256.c
rename to sys/crypto/sha256.c
diff --git a/sys/crypto/sha256/Makefile b/sys/crypto/sha256/Makefile
deleted file mode 100644
index f14689585d..0000000000
--- a/sys/crypto/sha256/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-MODULE = crypto_sha256
-
-include $(RIOTBASE)/Makefile.base
diff --git a/sys/crypto/skipjack/skipjack.c b/sys/crypto/skipjack.c
similarity index 100%
rename from sys/crypto/skipjack/skipjack.c
rename to sys/crypto/skipjack.c
diff --git a/sys/crypto/skipjack/Makefile b/sys/crypto/skipjack/Makefile
deleted file mode 100644
index 69ce210ded..0000000000
--- a/sys/crypto/skipjack/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-MODULE = crypto_skipjack
-
-include $(RIOTBASE)/Makefile.base
diff --git a/sys/crypto/twofish/twofish.c b/sys/crypto/twofish.c
similarity index 100%
rename from sys/crypto/twofish/twofish.c
rename to sys/crypto/twofish.c
diff --git a/sys/crypto/twofish/Makefile b/sys/crypto/twofish/Makefile
deleted file mode 100644
index 18c4e9d0fb..0000000000
--- a/sys/crypto/twofish/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-MODULE = crypto_twofish
-
-include $(RIOTBASE)/Makefile.base
diff --git a/tests/test_sha256/Makefile b/tests/test_sha256/Makefile
index 2a8d1101fe..79cd3ed124 100644
--- 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
--
GitLab