Add test example for utility functions

Author: bricef

Cryptopal-Challenges/brice/Makefile

@@ -3,6 +3,8 @@
 DEBUG=false
 CC=gcc
 
+CCOPTS= -Wno-pointer-sign
+
 LIBS= -lssl -lcrypto
 INCLUDES= -I/usr/local/opt/openssl/include -I./src/cryptolib
 LDFLAGS= -L/usr/local/opt/openssl/lib
@@ -39,26 +41,26 @@ test: $(TEST_DIR) $(TESTS_EXE)
 
 run-tests : test
 	@echo "\n============= BEGIN TESTS =============\n"
-	find $(TEST_DIR) -name "test*" -type file -exec {} \;
+	@find $(TEST_DIR) -name "test*" -type file -exec {} \;
 
 run-challenges : $(CHALLENGES_EXE)
 	@echo "\n============= BEGIN CHALLENGES =============\n"
-	find $(BUILD_DIR) -name "Challenge-*" -type file -exec {} \;
+	@find $(BUILD_DIR) -name "Challenge-*" -type file -exec {} \;
 
 
 lib: $(BUILD_DIR)/cryptolib.a
 
 $(TEST_DIR)/% : test/%.c test/common.c $(BUILD_DIR)/cryptolib.a
-	$(CC) $(CFLAGS) $^ -o $@  $(LIBS) $(LDFLAGS) $(INCLUDES)
+	$(CC) $(CCOPTS) $(CFLAGS) $^ -o $@  $(LIBS) $(LDFLAGS) $(INCLUDES)
 
 Challenge-%.exe : src/Challenges/Challenge-%.c $(BUILD_DIR)/cryptolib.a
-	$(CC) $(CFLAGS) $^ -o $@  $(LIBS) $(LDFLAGS) $(INCLUDES)
+	$(CC) $(CCOPTS) $(CFLAGS) $^ -o $@  $(LIBS) $(LDFLAGS) $(INCLUDES)
 
 $(BUILD_DIR)/cryptolib.a: $(CRYPTOLIB_OBJ)
 	 ar rcs $@ $^
 
 $(BUILD_DIR)/%.o : src/cryptolib/%.c $(BUILD_DIR)
-	$(CC) $(CFLAGS) $< -c -o $@ $(INCLUDES)
+	$(CC) $(CCOPTS) $(CFLAGS) $< -c -o $@ $(INCLUDES)
 
 clean:
 	rm -rf $(BUILD_DIR)

Cryptopal-Challenges/brice/src/cryptolib/errors.c

@@ -11,6 +11,7 @@ typedef struct {
 
 static ErrorMessage Errors[] = {
   {OK, "Everything OK"},
+  {BAD_INPUT, "Bad input provided to function."},
   {OPENSSL_ERROR, "Caught openssl exception"},
   {IV_PROVIDED_IN_ERROR, "IV was provided for a block cipher mode that doesn't need it."},
   {LIMIT_TOO_SMALL, "Size limit of output buffer was too small. Try again with a bigger buffer."},

Cryptopal-Challenges/brice/src/cryptolib/errors.h

@@ -3,6 +3,7 @@
 
 typedef enum {
   OK,
+  BAD_INPUT,
   OPENSSL_ERROR,
   IV_PROVIDED_IN_ERROR,
   LIMIT_TOO_SMALL,

Cryptopal-Challenges/brice/src/cryptolib/utils.c

@@ -1,4 +1,5 @@
 #include <stdlib.h>
+#include <stdbool.h>
 
 #include "common.h"
 #include "errors.h"
@@ -28,6 +29,15 @@ ERROR toHex(
   OUT int* out_length
 );
 
+bool isHex(c){
+  return ('0' <= c && c <= '9') || ( 'A' <= c && c <= 'F' ) || ('a' <= c && c <= 'f');
+}
+
+
+/**
+ * Limitations: Won't handle badly formatted input properly.
+ * bad input is not unsafe.
+ */
 ERROR fromHex(
   const unsigned char* hex,
   const int hex_length,
@@ -37,12 +47,15 @@ ERROR fromHex(
 ){
   int raw_index = 0;
   for (int i = 0; i < (hex_length-1); i+=2){
-    // grab two hex chars from string
+
+    if(!isHex(hex[i]) || !isHex(hex[i+1])){ return BAD_INPUT; }
+
     char aByte[3] = {hex[i],hex[i+1],0};
     long c = strtol(aByte, NULL, 16);
 
     if(raw_index>raw_limit){ return LIMIT_TOO_SMALL; }
     raw[raw_index] = (char) c;
+    raw_index++;
 
   }
   return OK;

Cryptopal-Challenges/brice/test/test_utils.c

@@ -7,26 +7,50 @@
 #include "common.h"
 
 typedef struct {
-  char* hex;
+  char* in;
   char* expected;
+  ERROR status;
 } Test ;
 
-Test tests[] = {
-  {"01", "\x01"},
-  {NULL, NULL}
-};
 
-int main(){
-  for (int i = 0; tests[i].hex != NULL; i++){
+
+
+int test_utils_fromHex(void){
+  Test tests[] = {
+    {"00", "\x00", OK},
+    {"01", "\x01", OK},
+    {"ff", "\xff", OK},
+    {"000x", "", BAD_INPUT},
+    {"000", "", BAD_INPUT},
+    {"0102030405060708090a0b0c0d0e0f10", "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10", OK},
+    {NULL, NULL}
+  };
+  printf("TESTING: fromHex()\n");
+  for (int i = 0; tests[i].in != NULL; i++){
     ERROR status = OK;
+    const bytes in = (const bytes) tests[i].in;
+    const bytes expected = (const bytes) tests[i].expected;
+    ERROR expected_status = tests[i].status;
     char buffer[256] = {0};
     int len = 0;
 
-    status = fromHex(tests[i].hex, strlen(tests[i].hex), buffer, 256, &len);
-    if(status != OK){
-      log_error(status); exit(1);
+    status = fromHex(in, strlen(in), (bytes) buffer, 256, &len);
+
+    if(status != expected_status){
+      printf("    FAIL: h(%s) unexpected status (got=%s, expected=%s)\n", in, error_string(status), error_string(expected_status));
+
+    }else if((strcmp(expected, buffer) !=0) || (strlen(expected) != strlen(buffer))){
+      printf("    FAIL: h(%s)\n", in);
+      printf("        expected: x(");print_hex(expected);printf(")%lu\n", strlen(expected));
+      printf("        got:      x(");print_hex((const bytes) buffer);printf(")%lu \n",strlen(buffer));
+    }else{
+      printf("    pass: h(%s)\n", in);
     }
-    printf("fromHex(%s) -> x(", tests[i].hex);print_hex(buffer);printf(")\n");
+
   }
   return 0;
 }
+
+int main(){
+  return test_utils_fromHex();
+}