Revert "tinycrypt: moving includes"

This commit breaks the sanitychecks

This reverts commit 93fa1053b21efe3d030ea060a31b80d6008d5bfd.

Change-Id: Ia52092e845c33234817a1cb27cd1f17064c65e7e

Signed-off-by: Anas Nashif <nashif@linux.intel.com>

lib/crypto/tinycrypt/include/cbc_mode.h

@@ -74,7 +74,7 @@
 #ifndef __TC_CBC_MODE_H__
 #define __TC_CBC_MODE_H__
 
-#include <tinycrypt/aes.h>
+#include <aes.h>
 
 /**
  *  @brief CBC encryption procedure

lib/crypto/tinycrypt/include/ctr_mode.h

@@ -67,7 +67,7 @@
 #ifndef __TC_CTR_MODE_H__
 #define __TC_CTR_MODE_H__
 
-#include <tinycrypt/aes.h>
+#include <aes.h>
 
 /**
  *  @brief CTR mode encryption/decryption procedure.

lib/crypto/tinycrypt/include/hmac.h

@@ -63,7 +63,7 @@
 #ifndef __TC_HMAC_H__
 #define __TC_HMAC_H__
 
-#include <tinycrypt/sha256.h>
+#include <sha256.h>
 
 struct tc_hmac_state_struct {
 	/* the internal state required by h */

lib/crypto/tinycrypt/include/hmac_prng.h

@@ -68,8 +68,8 @@
 #ifndef __TC_HMAC_PRNG_H__
 #define __TC_HMAC_PRNG_H__
 
-#include <tinycrypt/sha256.h>
+#include <sha256.h>
-#include <tinycrypt/hmac.h>
+#include <hmac.h>
 
 struct tc_hmac_prng_struct {
 	/* the HMAC instance for this PRNG */

lib/crypto/tinycrypt/source/aes_decrypt.c

@@ -30,8 +30,8 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <tinycrypt/aes.h>
+#include <aes.h>
-#include <tinycrypt/utils.h>
+#include <utils.h>
 
 #define ZERO_BYTE 0x00
 

lib/crypto/tinycrypt/source/aes_encrypt.c

@@ -30,8 +30,8 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <tinycrypt/aes.h>
+#include <aes.h>
-#include <tinycrypt/utils.h>
+#include <utils.h>
 
 static const uint8_t sbox[256] = {
         0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5, 0x30, 0x01, 0x67, 0x2b,

lib/crypto/tinycrypt/source/cbc_mode.c

@@ -30,8 +30,8 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <tinycrypt/cbc_mode.h>
+#include <cbc_mode.h>
-#include <tinycrypt/utils.h>
+#include <utils.h>
 
 int32_t tc_cbc_mode_encrypt(uint8_t *out, uint32_t outlen, const uint8_t *in,
                             uint32_t inlen, const uint8_t *iv,

lib/crypto/tinycrypt/source/ctr_mode.c

@@ -30,8 +30,8 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <tinycrypt/ctr_mode.h>
+#include <ctr_mode.h>
-#include <tinycrypt/utils.h>
+#include <utils.h>
 
 int32_t tc_ctr_mode(uint8_t *out, uint32_t outlen, const uint8_t *in,
 		    uint32_t inlen, uint8_t *ctr, const TCAesKeySched_t sched)

lib/crypto/tinycrypt/source/hmac.c

@@ -30,8 +30,8 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <tinycrypt/hmac.h>
+#include <hmac.h>
-#include <tinycrypt/utils.h>
+#include <utils.h>
 
 static void rekey(uint8_t *key, const uint8_t *new_key, uint32_t key_size)
 {

lib/crypto/tinycrypt/source/hmac_prng.c

@@ -30,9 +30,9 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <tinycrypt/hmac_prng.h>
+#include <hmac_prng.h>
-#include <tinycrypt/hmac.h>
+#include <hmac.h>
-#include <tinycrypt/utils.h>
+#include <utils.h>
 
 /* min bytes in the seed string.
  * MIN_SLEN*8 must be at least the expected security level. */

lib/crypto/tinycrypt/source/sha256.c

@@ -30,8 +30,8 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <tinycrypt/sha256.h>
+#include <sha256.h>
-#include <tinycrypt/utils.h>
+#include <utils.h>
 
 static void compress(uint32_t *iv, const uint8_t *data);
 

lib/crypto/tinycrypt/source/utils.c

@@ -30,7 +30,7 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <tinycrypt/utils.h>
+#include <utils.h>
 
 #include <string.h>
 

samples/crypto/test_aes/test_aes.c

@@ -42,7 +42,7 @@
 */
 
 #include <test_utils.h>
-#include <tinycrypt/aes.h>
+#include <aes.h>
 
 #include <stdint.h>
 #include <stddef.h>

samples/crypto/test_cbc/test_cbc_mode.c

@@ -37,7 +37,7 @@
   - AES128 CBC mode encryption SP 800-38a tests
 */
 
-#include <tinycrypt/cbc_mode.h>
+#include <cbc_mode.h>
 #include "test_utils.h"
 
 #include <stdlib.h>

samples/crypto/test_ctr/test_ctr_mode.c

@@ -38,7 +38,7 @@
   - AES128 CTR mode encryption SP 800-38a tests
 */
 
-#include <tinycrypt/ctr_mode.h>
+#include <ctr_mode.h>
 #include <test_utils.h>
 
 #include <stdio.h>

samples/crypto/test_hmac/test_hmac.c

@@ -39,7 +39,7 @@
 */
 
 #include <test_utils.h>
-#include <tinycrypt/hmac.h>
+#include <hmac.h>
 
 uint32_t do_hmac_test(TCHmacState_t h, uint32_t testnum, const uint8_t *data,
 		      size_t datalen, const uint8_t *expected,

samples/crypto/test_prng/test_hmac_prng.c

@@ -44,7 +44,7 @@
 #include <drivers/system_timer.h>
 #include <stdio.h>
 
-#include <tinycrypt/hmac_prng.h>
+#include <hmac_prng.h>
 
 /*
  * Main task to test AES

samples/crypto/test_sha256/test_sha256.c

@@ -38,7 +38,7 @@
   - NIST SHA256 test vectors
 */
 
-#include <tinycrypt/sha256.h>
+#include <sha256.h>
 #include <test_utils.h>
 
 #include <stdio.h>