Fix whitespace and consistency in test cases format, add macros for easy mapping of print functions to other projects

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

Author: Constanza Heath

Makefile.conf

@@ -6,7 +6,7 @@
 #
 ################################################################################
 
-CFLAGS = -Os -std=c99 -Wall -Wextra -I../lib -v
+CFLAGS = -Os -std=c99 -Wall -Wextra -I../lib -v -I../tests/include
 CC=gcc 
 
 export CC

tests/Makefile

@@ -30,23 +30,23 @@ clean:
 
 
 # Dependencies
-test_aes:		test_aes.o test_utils.o ../lib/aes_encrypt.o \
+test_aes:		test_aes.o ../lib/aes_encrypt.o \
 						../lib/aes_decrypt.o ../lib/utils.o 
 
-test_cbc_mode:	test_cbc_mode.o test_utils.o ../lib/cbc_mode.o \
+test_cbc_mode:	test_cbc_mode.o ../lib/cbc_mode.o \
 						../lib/aes_encrypt.o ../lib/aes_decrypt.o \
 						../lib/utils.o 
 
-test_ctr_mode:	test_ctr_mode.o test_utils.o ../lib/ctr_mode.o \
+test_ctr_mode:	test_ctr_mode.o ../lib/ctr_mode.o \
 						../lib/aes_encrypt.o ../lib/utils.o 
 
-test_hmac:		test_hmac.o test_utils.o ../lib/hmac.o ../lib/sha256.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 
 
-test_sha256:	test_sha256.o test_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
@@ -55,5 +55,4 @@ 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_utils.o:			test_utils.c test_utils.h
 

tests/include/test_utils.h

@@ -0,0 +1,118 @@
+/*  test_utils.h - TinyCrypt interface to common functions for tests */
+
+/*
+ *  Copyright (C) 2015 by Intel Corporation, All Rights Reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *    - Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *
+ *    - Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ *    - Neither the name of Intel Corporation nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ *  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ *  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+ *  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ *  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ *  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __TEST_UTILS_H__
+#define __TEST_UTILS_H__
+
+#include <string.h>
+#include <stdio.h>
+#include <stdint.h>
+
+#define PRINT_DATA(fmt, ...) printf(fmt, ##__VA_ARGS__)
+
+#define PRINT_LINE                                                     \
+	PRINT_DATA(                                                        \
+		"============================================================" \
+		"=======\n")
+
+
+#define FAIL "FAIL"
+#define PASS "PASS"
+#define FMT_ERROR "%s - %s@%d. "
+
+#define TC_PASS 0
+#define TC_FAIL 1
+
+#define TC_ERROR(fmt, ...)                               \
+	do {                                                 \
+		PRINT_DATA(FMT_ERROR, FAIL, __func__, __LINE__); \
+		PRINT_DATA(fmt, ##__VA_ARGS__);                  \
+	} while (0)
+
+#define TC_PRINT(fmt, ...) PRINT_DATA(fmt, ##__VA_ARGS__)
+#define TC_START(name) PRINT_DATA("tc_start() - %s\n", name)
+#define TC_END(result, fmt, ...) PRINT_DATA(fmt, ##__VA_ARGS__)
+
+/* prints result and the function name */
+#define TC_END_RESULT(result)                           \
+	do {                                                \
+		PRINT_LINE;                                     \
+		TC_END(result, "%s - %s.\n",                    \
+			result == TC_PASS ? PASS : FAIL, __func__); \
+	} while (0)
+
+#define TC_END_REPORT(result)                               \
+	do {                                                    \
+		PRINT_LINE;                                         \
+		TC_END(result,                                      \
+			"PROJECT EXECUTION %s\n",               \
+			result == TC_PASS ? "SUCCESSFUL" : "FAILED");   \
+	} while (0)
+
+static inline void show_str(const char *label, const uint8_t *s, size_t len)
+{
+        uint32_t i;
+
+        TC_PRINT("%s = ", label);
+        for (i = 0; i < (uint32_t) len; ++i) {
+                TC_PRINT("%02x", s[i]);
+        }
+        TC_PRINT("\n");
+}
+
+static inline void fatal(uint32_t testnum, const void *expected, size_t expectedlen,
+           const void *computed, size_t computedlen)
+{
+
+        TC_ERROR("\tTest #%d Failed!\n", testnum);
+        show_str("\t\tExpected", expected, expectedlen);
+        show_str("\t\tComputed  ", computed, computedlen);
+        TC_PRINT("\n");
+}
+
+static inline uint32_t check_result(uint32_t testnum, const void *expected, size_t expectedlen,
+                   const void *computed, size_t computedlen)
+{
+	uint32_t result = TC_PASS;
+
+        if (expectedlen != computedlen) {
+                TC_ERROR("The length of the computed buffer (%zu)", computedlen);
+                TC_ERROR("does not match the expected length (%zu).", expectedlen);
+                result = TC_FAIL;
+        } else if (memcmp(computed, expected, computedlen) != 0) {
+                fatal(testnum, expected, expectedlen, computed, computedlen);
+                result = TC_FAIL;
+        }
+
+        return result;
+}
+
+#endif