From 51db509f7c70590ca711967d61c4b9c5ed6cf17f Mon Sep 17 00:00:00 2001
From: Oleg Hahm <oleg@hobbykeller.org>
Date: Fri, 29 Jan 2016 18:49:42 +0100
Subject: [PATCH] sha256: move from crypto to hashes

---
 sys/crypto/doc.txt                                 |  3 ---
 sys/{crypto => hashes}/sha256.c                    |  4 ++--
 sys/include/{crypto => hashes}/sha256.h            |  2 +-
 tests/unittests/tests-crypto/tests-crypto.c        |  1 -
 tests/unittests/tests-crypto/tests-crypto.h        |  7 -------
 .../tests-hashes-sha256.c}                         | 14 +++++++-------
 tests/unittests/tests-hashes/tests-hashes.c        |  1 +
 tests/unittests/tests-hashes/tests-hashes.h        |  8 ++++++++
 8 files changed, 19 insertions(+), 21 deletions(-)
 rename sys/{crypto => hashes}/sha256.c (99%)
 rename sys/include/{crypto => hashes}/sha256.h (99%)
 rename tests/unittests/{tests-crypto/tests-crypto-sha256.c => tests-hashes/tests-hashes-sha256.c} (92%)

diff --git a/sys/crypto/doc.txt b/sys/crypto/doc.txt
index e2195001d..5e77da4c6 100644
--- a/sys/crypto/doc.txt
+++ b/sys/crypto/doc.txt
@@ -44,7 +44,4 @@
  *
  * Additional examples can be found in the test suite.
  *
- * @section hashes Hashes
- *
- * RIOT currently supports sha256 as a cryptographic hash implementation.
  */
diff --git a/sys/crypto/sha256.c b/sys/hashes/sha256.c
similarity index 99%
rename from sys/crypto/sha256.c
rename to sys/hashes/sha256.c
index 10d7a0620..f2fc33295 100644
--- a/sys/crypto/sha256.c
+++ b/sys/hashes/sha256.c
@@ -28,7 +28,7 @@
  */
 
 /**
- * @ingroup     sys_crypto
+ * @ingroup     sys_hashes
  * @{
  *
  * @file
@@ -43,7 +43,7 @@
 
 #include <string.h>
 
-#include "crypto/sha256.h"
+#include "hashes/sha256.h"
 #include "board.h"
 
 #ifdef __BIG_ENDIAN__
diff --git a/sys/include/crypto/sha256.h b/sys/include/hashes/sha256.h
similarity index 99%
rename from sys/include/crypto/sha256.h
rename to sys/include/hashes/sha256.h
index 194dbf3a8..133910eaa 100644
--- a/sys/include/crypto/sha256.h
+++ b/sys/include/hashes/sha256.h
@@ -29,7 +29,7 @@
 
 
 /**
- * @ingroup     sys_crypto
+ * @ingroup     sys_hashes
  * @{
  *
  * @file
diff --git a/tests/unittests/tests-crypto/tests-crypto.c b/tests/unittests/tests-crypto/tests-crypto.c
index 1d2646bb7..6914cd583 100644
--- a/tests/unittests/tests-crypto/tests-crypto.c
+++ b/tests/unittests/tests-crypto/tests-crypto.c
@@ -11,7 +11,6 @@
 
 void tests_crypto(void)
 {
-    TESTS_RUN(tests_crypto_sha256_tests());
     TESTS_RUN(tests_crypto_chacha_tests());
     TESTS_RUN(tests_crypto_aes_tests());
     TESTS_RUN(tests_crypto_3des_tests());
diff --git a/tests/unittests/tests-crypto/tests-crypto.h b/tests/unittests/tests-crypto/tests-crypto.h
index d7f05e382..e03a18bca 100644
--- a/tests/unittests/tests-crypto/tests-crypto.h
+++ b/tests/unittests/tests-crypto/tests-crypto.h
@@ -31,13 +31,6 @@ extern "C" {
  */
 void tests_crypto(void);
 
-/**
- * @brief   Generates tests for crypto/sha256.h
- *
- * @return  embUnit tests if successful, NULL if not.
- */
-Test *tests_crypto_sha256_tests(void);
-
 /**
  * @brief   Generates tests for crypto/chacha.h
  *
diff --git a/tests/unittests/tests-crypto/tests-crypto-sha256.c b/tests/unittests/tests-hashes/tests-hashes-sha256.c
similarity index 92%
rename from tests/unittests/tests-crypto/tests-crypto-sha256.c
rename to tests/unittests/tests-hashes/tests-hashes-sha256.c
index 4306b8cd9..802904374 100644
--- a/tests/unittests/tests-crypto/tests-crypto-sha256.c
+++ b/tests/unittests/tests-hashes/tests-hashes-sha256.c
@@ -14,9 +14,9 @@
 
 #include "embUnit/embUnit.h"
 
-#include "crypto/sha256.h"
+#include "hashes/sha256.h"
 
-#include "tests-crypto.h"
+#include "tests-hashes.h"
 
 static int compare_str_vs_digest(const char *str,
                                  const unsigned char hash[SHA256_DIGEST_LENGTH])
@@ -47,7 +47,7 @@ static int calc_and_compare_hash(const char *str, const char *expected)
     return compare_str_vs_digest(expected, hash);
 }
 
-static void test_crypto_sha256_hash_sequence(void)
+static void test_hashes_sha256_hash_sequence(void)
 {
     TEST_ASSERT(calc_and_compare_hash("1234567890_1",
                                       "3eda9ffe5537a588f54d0b2a453e5fa932986d0bc0f9556924f5c2379b2c91b0"));
@@ -81,14 +81,14 @@ static void test_crypto_sha256_hash_sequence(void)
                                       "c19d3bf8588897076873f1a0a106ba840ca46bd1179d592953acecc4df59593c"));
 }
 
-Test *tests_crypto_sha256_tests(void)
+Test *tests_hashes_sha256_tests(void)
 {
     EMB_UNIT_TESTFIXTURES(fixtures) {
-        new_TestFixture(test_crypto_sha256_hash_sequence),
+        new_TestFixture(test_hashes_sha256_hash_sequence),
     };
 
-    EMB_UNIT_TESTCALLER(crypto_sha256_tests, NULL, NULL,
+    EMB_UNIT_TESTCALLER(hashes_sha256_tests, NULL, NULL,
                         fixtures);
 
-    return (Test *)&crypto_sha256_tests;
+    return (Test *)&hashes_sha256_tests;
 }
diff --git a/tests/unittests/tests-hashes/tests-hashes.c b/tests/unittests/tests-hashes/tests-hashes.c
index 8d9dc957c..696999622 100644
--- a/tests/unittests/tests-hashes/tests-hashes.c
+++ b/tests/unittests/tests-hashes/tests-hashes.c
@@ -23,4 +23,5 @@
 void tests_hashes(void)
 {
     TESTS_RUN(tests_hashes_md5_tests());
+    TESTS_RUN(tests_hashes_sha256_tests());
 }
diff --git a/tests/unittests/tests-hashes/tests-hashes.h b/tests/unittests/tests-hashes/tests-hashes.h
index 28fc91e1c..993f641d4 100644
--- a/tests/unittests/tests-hashes/tests-hashes.h
+++ b/tests/unittests/tests-hashes/tests-hashes.h
@@ -37,6 +37,14 @@ void tests_hashes(void);
  */
 Test *tests_hashes_md5_tests(void);
 
+/**
+ * @brief   Generates tests for hashes/sha256.h
+ *
+ * @return  embUnit tests if successful, NULL if not.
+ */
+Test *tests_hashes_sha256_tests(void);
+
+
 #ifdef __cplusplus
 }
 #endif