Refactor to standard layout.

.idea/scopes/ProjectSources.xml

@@ -1,3 +1,3 @@
 <component name="DependencyValidationManager">
-  <scope name="ProjectSources" pattern="file[emsha]:emsha/*||file:hmac.cc||file:emsha.cc||file:sha256.cc" />
+  <scope name="ProjectSources" pattern="file[emsha]:include/emsha/*||file:hmac.cc||file:emsha.cc||file:sha256.cc" />
 </component>

CMakeLists.txt

@@ -46,13 +46,13 @@ endif ()
 
 ### Set up the build ###
 set(HEADERS
-	emsha/emsha.h
+        include/emsha/emsha.h
-	emsha/sha256.h
+        include/emsha/sha256.h
-	emsha/hmac.h
+        include/emsha/hmac.h
-	emsha/internal.h)
+        include/emsha/internal.h)
-set(SOURCES emsha.cc sha256.cc hmac.cc)
+set(SOURCES src/emsha.cc src/sha256.cc src/hmac.cc)
 
-include_directories(SYSTEM .)
+include_directories(include)
 
 ### Build products ###
 
@@ -60,14 +60,15 @@ add_library(${PROJECT_NAME} STATIC ${SOURCES} ${HEADERS})
 
 ### TESTS ###
 
-set(TEST_SOURCES test_utils.cc)
+set(TEST_SOURCES test/test_utils.cc)
 macro(generate_test name)
-	add_executable(${name} ${name}.cc ${TEST_SOURCES} ${ARGN})
+	add_executable(${name} test/${name}.cc ${TEST_SOURCES} ${ARGN})
 	target_link_libraries(${name} ${PROJECT_NAME})
+	target_include_directories(${name} PRIVATE test)
 	add_test(${name} ${name})
 endmacro()
 
-generate_test(test_${PROJECT_NAME} test_${PROJECT_NAME}.cc)
+generate_test(test_${PROJECT_NAME})
 generate_test(test_hmac)
 generate_test(test_mem)
 generate_test(test_sha256)

include/emsha/emsha.h

@@ -54,37 +54,37 @@ namespace emsha {
 #endif
 
 /// SHA256_HASH_SIZE is the output length of SHA-256 in bytes.
-const std::uint32_t SHA256_HASH_SIZE = 32;
+const std::uint32_t SHA256_HASH_SIZE = 32U;
 
 
 /// \brief Describe the result of an EMSHA operation.
 ///
 /// The EMSHAResult type is used to indicate whether an operation
 /// succeeded, and if not, what the general fault type was.
-typedef enum class EMSHAResult : std::uint8_t {
+enum class EMSHAResult : std::uint8_t {
 	/// An unknown fault occurred. This is a serious bug in the
 	/// program.
-	Unknown = 0,
+	Unknown = 0U,
 
 	/// All operations have completed successfully so far.
-	OK = 1,
+	OK = 1U,
 
 	/// The self-test failed.
-	TestFailure = 2,
+	TestFailure = 2U,
 
 	/// A null pointer was passed in as a buffer where it shouldn't
 	/// have been.
-	NullPointer = 3,
+	NullPointer = 3U,
 
 	/// The Hash is in an invalid state.
-	InvalidState = 4,
+	InvalidState = 4U,
 
 	/// The input to SHA256::update is too large.
-	InputTooLong = 5,
+	InputTooLong = 5U,
 
 	/// The self tests have been disabled, but a self-test function
 	/// was called.
-	SelfTestDisabled = 6
+	SelfTestDisabled = 6U
 } ;
 
 

include/emsha/sha256.h

@@ -33,8 +33,8 @@
 
 #include <cstdint>
 
-#include <emsha/emsha.h>
 #include <array>
+#include <emsha/emsha.h>
 
 
 namespace emsha {

src/emsha.cc

@@ -28,7 +28,7 @@
 #include <cstring>
 #include <iostream>
 
-#include <emsha/emsha.h>
+#include "emsha/emsha.h"
 
 
 using std::uint8_t;

src/hmac.cc

@@ -28,9 +28,9 @@
 #include <cstdint>
 
 
-#include <emsha/emsha.h>
+#include "emsha/emsha.h"
-#include <emsha/sha256.h>
+#include "emsha/hmac.h"
-#include <emsha/hmac.h>
+#include "emsha/sha256.h"
 
 
 namespace emsha {

src/sha256.cc

@@ -27,9 +27,9 @@
 #include <cstdint>
 #include <cstring>
 
-#include <emsha/emsha.h>
+#include "emsha/emsha.h"
-#include <emsha/sha256.h>
+#include "emsha/internal.h"
-#include <emsha/internal.h>
+#include "emsha/sha256.h"
 #include <algorithm>
 #include <iostream>
 

test/test_emsha.cc

@@ -23,9 +23,9 @@
  */
 
 
+#include "emsha/emsha.h"
 #include <chrono>
 #include <iostream>
-#include <emsha/emsha.h>
 
 #include "test_utils.h"
 

test/test_hmac.cc

@@ -25,8 +25,8 @@
 
 #include <iostream>
 
-#include <emsha/emsha.h>
+#include "emsha/emsha.h"
-#include <emsha/hmac.h>
+#include "emsha/hmac.h"
 
 #include "test_utils.h"
 

test/test_mem.cc

@@ -35,9 +35,9 @@
 #include <cstdio>
 #include <iostream>
 
-#include <emsha/emsha.h>
+#include "emsha/emsha.h"
-#include <emsha/sha256.h>
+#include "emsha/hmac.h"
-#include <emsha/hmac.h>
+#include "emsha/sha256.h"
 
 
 // Number of test iterations.

test/test_sha256.cc

@@ -23,9 +23,9 @@
  */
 
 
-#include <iostream>
+#include "emsha/sha256.h"
-#include <emsha/sha256.h>
 #include <cassert>
+#include <iostream>
 
 #include "test_utils.h"
 

test/test_utils.h

@@ -30,9 +30,9 @@
 #include <cstdint>
 #include <string>
 
-#include <emsha/emsha.h>
+#include "emsha/emsha.h"
-#include <emsha/sha256.h>
+#include "emsha/hmac.h"
-#include <emsha/hmac.h>
+#include "emsha/sha256.h"
 
 
 // How many times should a test result be checked? The goal is to