Browse Source

sys:crypto: put ciphers into one module

dev/timer
René Kijewski 9 years ago
parent
commit
96fba8a19b
  1. 4
      Makefile.dep
  2. 1
      examples/ccn-lite-client/Makefile
  3. 1
      examples/ccn-lite-relay/Makefile
  4. 19
      sys/Makefile
  5. 17
      sys/Makefile.include
  6. 0
      sys/crypto/3des.c
  7. 3
      sys/crypto/3des/Makefile
  8. 2
      sys/crypto/Makefile
  9. 0
      sys/crypto/aes.c
  10. 3
      sys/crypto/aes/Makefile
  11. 0
      sys/crypto/rc5.c
  12. 0
      sys/crypto/sha256.c
  13. 3
      sys/crypto/sha256/Makefile
  14. 0
      sys/crypto/skipjack.c
  15. 3
      sys/crypto/skipjack/Makefile
  16. 0
      sys/crypto/twofish.c
  17. 3
      sys/crypto/twofish/Makefile
  18. 2
      tests/test_sha256/Makefile

4
Makefile.dep

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

1
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

1
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

19
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

17
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

0
sys/crypto/3des/3des.c → sys/crypto/3des.c

3
sys/crypto/3des/Makefile

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

2
sys/crypto/rc5/Makefile → sys/crypto/Makefile

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

0
sys/crypto/aes/aes.c → sys/crypto/aes.c

3
sys/crypto/aes/Makefile

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

0
sys/crypto/rc5/rc5.c → sys/crypto/rc5.c

0
sys/crypto/sha256/sha256.c → sys/crypto/sha256.c

3
sys/crypto/sha256/Makefile

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

0
sys/crypto/skipjack/skipjack.c → sys/crypto/skipjack.c

3
sys/crypto/skipjack/Makefile

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

0
sys/crypto/twofish/twofish.c → sys/crypto/twofish.c

3
sys/crypto/twofish/Makefile

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

2
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

Loading…
Cancel
Save