Updating TinyCrypt v2 primitives to add ECC, CCM, and CMAC.

Signed-off-by: Constanza Heath <[email protected]>

7 files changed, 21 insertions, 21 deletions

diff --git a/tests/Makefile b/tests/Makefile
index 954f0ef..a10eb0c 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -6,7 +6,7 @@
 #
 ################################################################################
 
-include ../Makefile.conf
+include ../config.mk
 
 # Edit the all content to add/remove tests needed from TinyCrypt library:
 all:	test_aes \
@@ -27,29 +27,29 @@ clean:
 	$(RM) ../lib/*.o *~
 
 # Dependencies
-test_aes:		test_aes.o ../lib/aes_encrypt.o \
-						../lib/aes_decrypt.o ../lib/utils.o 
+test_aes:	test_aes.o ../lib/aes_encrypt.o \
+		../lib/aes_decrypt.o ../lib/utils.o 
 
 test_cbc_mode:	test_cbc_mode.o ../lib/cbc_mode.o \
-						../lib/aes_encrypt.o ../lib/aes_decrypt.o \
-						../lib/utils.o 
+		../lib/aes_encrypt.o ../lib/aes_decrypt.o \
+		../lib/utils.o 
 
 test_ctr_mode:	test_ctr_mode.o ../lib/ctr_mode.o \
-						../lib/aes_encrypt.o ../lib/utils.o 
+		../lib/aes_encrypt.o ../lib/utils.o 
 
-test_hmac:		test_hmac.o ../lib/hmac.o ../lib/sha256.o \
-						../lib/utils.o 
+test_hmac:	test_hmac.o ../lib/hmac.o ../lib/sha256.o \
+		../lib/utils.o 
 
 test_hmac_prng:	test_hmac_prng.o ../lib/hmac_prng.o ../lib/hmac.o \
-						../lib/sha256.o ../lib/utils.o 
+		../lib/sha256.o ../lib/utils.o 
 
 test_sha256:	test_sha256.o ../lib/sha256.o ../lib/utils.o 
 
 # Sub-dependencies
-test_aes.o:				test_aes.c ../lib/aes.h
-test_cbc_mode.o:	test_cbc_mode.c ../lib/cbc_mode.h ../lib/aes.h
-test_ctr_mode.o:	test_ctr_mode.c ../lib/aes.h ../lib/ctr_mode.h
-test_hmac.o:			test_hmac.c ../lib/hmac.h ../lib/sha256.h
-test_hmac_prng.o:	test_hmac_prng.c ../lib/hmac_prng.h ../lib/utils.h
-test_sha256.o:		test_sha256.c ../lib/sha256.h
+test_aes.o:		test_aes.c ../lib/include/tinycrypt/aes.h ../tests/include/test_utils.h
+test_cbc_mode.o:	test_cbc_mode.c ../lib/include/tinycrypt/cbc_mode.h ../lib/include/tinycrypt/aes.h
+test_ctr_mode.o:	test_ctr_mode.c ../lib/include/tinycrypt/aes.h ../lib/include/tinycrypt/ctr_mode.h
+test_hmac.o:		test_hmac.c ../lib/include/tinycrypt/hmac.h ../lib/include/tinycrypt/sha256.h
+test_hmac_prng.o:	test_hmac_prng.c ../lib/include/tinycrypt/hmac_prng.h ../lib/include/tinycrypt/utils.h
+test_sha256.o:		test_sha256.c ../lib/include/tinycrypt/sha256.h
 
diff --git a/tests/test_aes.c b/tests/test_aes.c
index a23c81b..9e527f3 100644
--- a/tests/test_aes.c
+++ b/tests/test_aes.c
@@ -41,7 +41,7 @@
 */
 
 #include <test_utils.h>
-#include <aes.h>
+#include <tinycrypt/aes.h>
 
 #include <stdint.h>
 #include <stddef.h>
diff --git a/tests/test_cbc_mode.c b/tests/test_cbc_mode.c
index 1895ef3..5db3711 100644
--- a/tests/test_cbc_mode.c
+++ b/tests/test_cbc_mode.c
@@ -37,7 +37,7 @@
   - AES128 CBC mode encryption SP 800-38a tests
 */
 
-#include <cbc_mode.h>
+#include <tinycrypt/cbc_mode.h>
 #include <test_utils.h>
 
 #include <stdlib.h>
diff --git a/tests/test_ctr_mode.c b/tests/test_ctr_mode.c
index 0e63e63..fec588a 100644
--- a/tests/test_ctr_mode.c
+++ b/tests/test_ctr_mode.c
@@ -37,7 +37,7 @@
   - AES128 CTR mode encryption SP 800-38a tests
 */
 
-#include <ctr_mode.h>
+#include <tinycrypt/ctr_mode.h>
 #include <test_utils.h>
 
 #include <stdio.h>
diff --git a/tests/test_hmac.c b/tests/test_hmac.c
index 0be5308..dfc74ac 100644
--- a/tests/test_hmac.c
+++ b/tests/test_hmac.c
@@ -38,7 +38,7 @@
 */
 
 #include <test_utils.h>
-#include <hmac.h>
+#include <tinycrypt/hmac.h>
 
 uint32_t do_hmac_test(TCHmacState_t h, uint32_t testnum, const uint8_t *data, size_t datalen,
                   const uint8_t *expected, size_t expectedlen)
diff --git a/tests/test_hmac_prng.c b/tests/test_hmac_prng.c
index 8d6a208..fe1705c 100644
--- a/tests/test_hmac_prng.c
+++ b/tests/test_hmac_prng.c
@@ -42,7 +42,7 @@
 #include <test_utils.h>
 #include <stdio.h>
 
-#include <hmac_prng.h>
+#include <tinycrypt/hmac_prng.h>
 
 /*
  * Main task to test AES
diff --git a/tests/test_sha256.c b/tests/test_sha256.c
index cb53101..78ed36e 100644
--- a/tests/test_sha256.c
+++ b/tests/test_sha256.c
@@ -37,7 +37,7 @@
   - NIST SHA256 test vectors
 */
 
-#include <sha256.h>
+#include <tinycrypt/sha256.h>
 #include <test_utils.h>
 
 #include <stdio.h>