restructure the project

34 files changed, 30 insertions, 29 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6dc89d1..6ed976f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,35 +4,8 @@ project(aes_tools C CXX)
 
 include(cmake/common.cmake)
 
-option(AES_TOOLS_ASM "Use the assembly language implementation instead of the one in C")
-
-file(GLOB_RECURSE aes_include "include/*.h")
-
-if(MSVC AND AES_TOOLS_ASM)
-    enable_language(ASM_MASM)
-    file(GLOB aes_src_c "src/*.c")
-    file(GLOB aes_src_asm "src/asm/*.asm")
-    set(aes_src ${aes_src_asm} ${aes_src_c})
-    set_source_files_properties(${aes_src_asm} PROPERTIES COMPILE_FLAGS /safeseh)
-    # Setting CMAKE_ASM_MASM_FLAGS doesn't work: http://www.cmake.org/Bug/view.php?id=14711
-else()
-    file(GLOB_RECURSE aes_src "src/*.c")
-endif()
-
-add_library(aes ${aes_src} ${aes_include})
-target_include_directories(aes PUBLIC include/)
-
-if(MSVC)
-    target_compile_definitions(aes PRIVATE _CRT_SECURE_NO_WARNINGS)
-endif()
-
-if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
-    target_compile_options(aes PUBLIC -mssse3 -maes)
-endif()
-
-add_subdirectory(cxx)
+add_subdirectory(aes)
+add_subdirectory(aesxx)
 add_subdirectory(utils)
 
-install(TARGETS aes ARCHIVE DESTINATION lib)
-install(DIRECTORY include/aes DESTINATION include)
 install(FILES LICENSE.txt DESTINATION share)
diff --git a/aes/CMakeLists.txt b/aes/CMakeLists.txt
new file mode 100644
index 0000000..0ec262d
--- /dev/null
+++ b/aes/CMakeLists.txt
@@ -0,0 +1,28 @@
+option(AES_TOOLS_ASM "Use the assembly language implementation instead of the one in C")
+
+file(GLOB_RECURSE aes_include "include/*.h")
+
+if(MSVC AND AES_TOOLS_ASM)
+    enable_language(ASM_MASM)
+    file(GLOB aes_src_c "src/*.c")
+    file(GLOB aes_src_asm "src/asm/*.asm")
+    set(aes_src ${aes_src_asm} ${aes_src_c})
+    set_source_files_properties(${aes_src_asm} PROPERTIES COMPILE_FLAGS /safeseh)
+    # Setting CMAKE_ASM_MASM_FLAGS doesn't work: http://www.cmake.org/Bug/view.php?id=14711
+else()
+    file(GLOB_RECURSE aes_src "src/*.c")
+endif()
+
+add_library(aes ${aes_src} ${aes_include})
+target_include_directories(aes PUBLIC include/)
+
+if(MSVC)
+    target_compile_definitions(aes PRIVATE _CRT_SECURE_NO_WARNINGS)
+endif()
+
+if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
+    target_compile_options(aes PUBLIC -mssse3 -maes)
+endif()
+
+install(TARGETS aes ARCHIVE DESTINATION lib)
+install(DIRECTORY include/aes DESTINATION include)
diff --git a/include/aes/aes.h b/aes/include/aes/aes.h
index 1108235..1108235 100644
--- a/include/aes/aes.h
+++ b/aes/include/aes/aes.h
diff --git a/include/aes/algorithm.h b/aes/include/aes/algorithm.h
index d88cf59..d88cf59 100644
--- a/include/aes/algorithm.h
+++ b/aes/include/aes/algorithm.h
diff --git a/include/aes/all.h b/aes/include/aes/all.h
index ff27c18..ff27c18 100644
--- a/include/aes/all.h
+++ b/aes/include/aes/all.h
diff --git a/include/aes/box.h b/aes/include/aes/box.h
index 2051d3d..2051d3d 100644
--- a/include/aes/box.h
+++ b/aes/include/aes/box.h
diff --git a/include/aes/box_aes.h b/aes/include/aes/box_aes.h
index c92d883..c92d883 100644
--- a/include/aes/box_aes.h
+++ b/aes/include/aes/box_aes.h
diff --git a/include/aes/box_data.h b/aes/include/aes/box_data.h
index e2315eb..e2315eb 100644
--- a/include/aes/box_data.h
+++ b/aes/include/aes/box_data.h
diff --git a/include/aes/data.h b/aes/include/aes/data.h
index a441939..a441939 100644
--- a/include/aes/data.h
+++ b/aes/include/aes/data.h
diff --git a/include/aes/error.h b/aes/include/aes/error.h
index e094f8a..e094f8a 100644
--- a/include/aes/error.h
+++ b/aes/include/aes/error.h
diff --git a/include/aes/mode.h b/aes/include/aes/mode.h
index 090628b..090628b 100644
--- a/include/aes/mode.h
+++ b/aes/include/aes/mode.h
diff --git a/include/aes/padding.h b/aes/include/aes/padding.h
index ba316f5..ba316f5 100644
--- a/include/aes/padding.h
+++ b/aes/include/aes/padding.h
diff --git a/include/aes/workarounds.h b/aes/include/aes/workarounds.h
index 914bd21..914bd21 100644
--- a/include/aes/workarounds.h
+++ b/aes/include/aes/workarounds.h
diff --git a/src/aes.c b/aes/src/aes.c
index 1f7da13..1f7da13 100644
--- a/src/aes.c
+++ b/aes/src/aes.c
diff --git a/src/asm/aes128.asm b/aes/src/asm/aes128.asm
index 80be57c..80be57c 100644
--- a/src/asm/aes128.asm
+++ b/aes/src/asm/aes128.asm
diff --git a/src/asm/aes192.asm b/aes/src/asm/aes192.asm
index 6a41243..6a41243 100644
--- a/src/asm/aes192.asm
+++ b/aes/src/asm/aes192.asm
diff --git a/src/asm/aes256.asm b/aes/src/asm/aes256.asm
index 82f5f6f..82f5f6f 100644
--- a/src/asm/aes256.asm
+++ b/aes/src/asm/aes256.asm
diff --git a/src/box.c b/aes/src/box.c
index c7e1e90..c7e1e90 100644
--- a/src/box.c
+++ b/aes/src/box.c
diff --git a/src/box_aes.c b/aes/src/box_aes.c
index 4d08d10..4d08d10 100644
--- a/src/box_aes.c
+++ b/aes/src/box_aes.c
diff --git a/src/c/aes128.c b/aes/src/c/aes128.c
index a1bad40..a1bad40 100644
--- a/src/c/aes128.c
+++ b/aes/src/c/aes128.c
diff --git a/src/c/aes192.c b/aes/src/c/aes192.c
index d661b78..d661b78 100644
--- a/src/c/aes192.c
+++ b/aes/src/c/aes192.c
diff --git a/src/c/aes256.c b/aes/src/c/aes256.c
index 2190322..2190322 100644
--- a/src/c/aes256.c
+++ b/aes/src/c/aes256.c
diff --git a/src/error.c b/aes/src/error.c
index d49c456..d49c456 100644
--- a/src/error.c
+++ b/aes/src/error.c
diff --git a/src/padding.c b/aes/src/padding.c
index a161ec7..a161ec7 100644
--- a/src/padding.c
+++ b/aes/src/padding.c
diff --git a/cxx/CMakeLists.txt b/aesxx/CMakeLists.txt
index 9bbf777..9bbf777 100644
--- a/cxx/CMakeLists.txt
+++ b/aesxx/CMakeLists.txt
diff --git a/cxx/include/aesxx/aes.hpp b/aesxx/include/aesxx/aes.hpp
index efac790..efac790 100644
--- a/cxx/include/aesxx/aes.hpp
+++ b/aesxx/include/aesxx/aes.hpp
diff --git a/cxx/include/aesxx/algorithm.hpp b/aesxx/include/aesxx/algorithm.hpp
index 823e57f..823e57f 100644
--- a/cxx/include/aesxx/algorithm.hpp
+++ b/aesxx/include/aesxx/algorithm.hpp
diff --git a/cxx/include/aesxx/all.hpp b/aesxx/include/aesxx/all.hpp
index 99202a7..99202a7 100644
--- a/cxx/include/aesxx/all.hpp
+++ b/aesxx/include/aesxx/all.hpp
diff --git a/cxx/include/aesxx/api.hpp b/aesxx/include/aesxx/api.hpp
index 68112bf..68112bf 100644
--- a/cxx/include/aesxx/api.hpp
+++ b/aesxx/include/aesxx/api.hpp
diff --git a/cxx/include/aesxx/box.hpp b/aesxx/include/aesxx/box.hpp
index 076407c..076407c 100644
--- a/cxx/include/aesxx/box.hpp
+++ b/aesxx/include/aesxx/box.hpp
diff --git a/cxx/include/aesxx/data.hpp b/aesxx/include/aesxx/data.hpp
index f36df5e..f36df5e 100644
--- a/cxx/include/aesxx/data.hpp
+++ b/aesxx/include/aesxx/data.hpp
diff --git a/cxx/include/aesxx/debug.hpp b/aesxx/include/aesxx/debug.hpp
index 96e81b5..96e81b5 100644
--- a/cxx/include/aesxx/debug.hpp
+++ b/aesxx/include/aesxx/debug.hpp
diff --git a/cxx/include/aesxx/error.hpp b/aesxx/include/aesxx/error.hpp
index 4d2c783..4d2c783 100644
--- a/cxx/include/aesxx/error.hpp
+++ b/aesxx/include/aesxx/error.hpp
diff --git a/cxx/include/aesxx/mode.hpp b/aesxx/include/aesxx/mode.hpp
index 1c6c4cf..1c6c4cf 100644
--- a/cxx/include/aesxx/mode.hpp
+++ b/aesxx/include/aesxx/mode.hpp