md5 in common

5 files changed, 32 insertions, 32 deletions

diff --git a/src/2015/day4/aoc.cpp b/src/2015/day4/aoc.cpp
index ab5f301..34693df 100644
--- a/src/2015/day4/aoc.cpp
+++ b/src/2015/day4/aoc.cpp
@@ -2,31 +2,6 @@
 
 namespace aoc2015 {
 
-char* md5sum(char* s) {
-  static char md5[64] = {0};
-  uint8_t* x = md5String(s);
-  memset(md5, 0x0, 64);
-  for (auto i = 0; i < 16; i++) {
-    sprintf(md5 + i * 2, "%02x", x[i]);
-  }
-  return md5;
-}
-
-int lead_zeros(char* s) {
-  char* p = s;
-  int total = 0;
-  while (*p != '\0') {
-    if (*p == '0') {
-      total += 1;
-      p++;
-    }
-    else {
-      break;
-    }
-  }
-  return total;
-}
-
 int day4(const char* secret, int target) {
   char buf[128] = {0};
   int len = strlen(secret);
diff --git a/src/2015/day4/aoc.h b/src/2015/day4/aoc.h
index 88a38fc..8c4c846 100644
--- a/src/2015/day4/aoc.h
+++ b/src/2015/day4/aoc.h
@@ -4,8 +4,5 @@
 
 namespace aoc2015 {
 
-char* md5sum(char *);
-int lead_zeros(char*);
 int day4(const char*, int);
-
 }
diff --git a/src/md5.cpp b/src/md5.cpp
index c11bf2f..0cd4254 100644
--- a/src/md5.cpp
+++ b/src/md5.cpp
@@ -224,4 +224,30 @@ uint8_t* md5File(FILE *file){
 uint32_t rotateLeft(uint32_t x, uint32_t n){
 	return (x << n) | (x >> (32 - n));
 }
+
+char* md5sum(char* s) {
+  static char md5[64] = {0};
+  uint8_t* x = md5String(s);
+  memset(md5, 0x0, 64);
+  for (auto i = 0; i < 16; i++) {
+    sprintf(md5 + i * 2, "%02x", x[i]);
+  }
+  return md5;
+}
+
+int lead_zeros(char* s) {
+  char* p = s;
+  int total = 0;
+  while (*p != '\0') {
+    if (*p == '0') {
+      total += 1;
+      p++;
+    }
+    else {
+      break;
+    }
+  }
+  return total;
+}
+
 }
diff --git a/src/md5.h b/src/md5.h
index 2726e41..5393e43 100644
--- a/src/md5.h
+++ b/src/md5.h
@@ -27,4 +27,6 @@ uint32_t H(uint32_t X, uint32_t Y, uint32_t Z);
 uint32_t I(uint32_t X, uint32_t Y, uint32_t Z);
 
 uint32_t rotateLeft(uint32_t x, uint32_t n);
+char* md5sum(char*); 
+int lead_zeros(char* s);
 }
diff --git a/test/test_2015.cpp b/test/test_2015.cpp
index 8b6c73a..74d6c25 100644
--- a/test/test_2015.cpp
+++ b/test/test_2015.cpp
@@ -60,10 +60,10 @@ TEST_CASE("The Ideal Stocking Stuffer", "[2015]") {
   char s3[] = "bgvyzdsv254575";
   char s4[] = "bgvyzdsv1038736";
 
-  REQUIRE(aoc2015::lead_zeros(aoc2015::md5sum(s1)) >= 5);
-  REQUIRE(aoc2015::lead_zeros(aoc2015::md5sum(s2)) >= 5);
-  REQUIRE(aoc2015::lead_zeros(aoc2015::md5sum(s3)) >= 5);
-  REQUIRE(aoc2015::lead_zeros(aoc2015::md5sum(s4)) >= 6);
+  REQUIRE(lead_zeros(md5sum(s1)) >= 5);
+  REQUIRE(lead_zeros(md5sum(s2)) >= 5);
+  REQUIRE(lead_zeros(md5sum(s3)) >= 5);
+  REQUIRE(lead_zeros(md5sum(s4)) >= 6);
 }
 
 TEST_CASE("Doesn't He Have Intern-Elves For This?", "[2015]") {