itzmeanjan · itzmeanjan · Feb 27, 2024 · Feb 27, 2024 · Feb 27, 2024
diff --git a/Makefile b/Makefile
@@ -71,13 +71,13 @@ $(PERF_BUILD_DIR): $(BUILD_DIR)
 	mkdir -p $@
 
 $(SUBTLE_INC_DIR):
-	git submodule update --init
+	git submodule update --init subtle
 
 $(GTEST_PARALLEL): $(SUBTLE_INC_DIR)
-	git submodule update --init
+	git submodule update --init gtest-parallel
 
 $(DUDECT_INC_DIR): $(GTEST_PARALLEL)
-	git submodule update --init
+	git submodule update --init dudect
 
 $(TEST_BUILD_DIR)/%.o: $(TEST_DIR)/%.cpp $(TEST_BUILD_DIR) $(SUBTLE_INC_DIR)
 	$(CXX) $(CXX_FLAGS) $(WARN_FLAGS) $(OPT_FLAGS) $(I_FLAGS) $(DEP_IFLAGS) -c $< -o $@

diff --git a/benchmarks/bench_ascon128_aead.cpp b/benchmarks/bench_ascon128_aead.cpp
@@ -1,4 +1,4 @@
-#include "aead/ascon128.hpp"
+#include "ascon/aead/ascon128.hpp"
 #include "bench_helper.hpp"
 #include <benchmark/benchmark.h>
 #include <cassert>

diff --git a/benchmarks/bench_ascon128a_aead.cpp b/benchmarks/bench_ascon128a_aead.cpp
@@ -1,4 +1,4 @@
-#include "aead/ascon128a.hpp"
+#include "ascon/aead/ascon128a.hpp"
 #include "bench_helper.hpp"
 #include <benchmark/benchmark.h>
 #include <cassert>

diff --git a/benchmarks/bench_ascon80pq_aead.cpp b/benchmarks/bench_ascon80pq_aead.cpp
@@ -1,4 +1,4 @@
-#include "aead/ascon80pq.hpp"
+#include "ascon/aead/ascon80pq.hpp"
 #include "bench_helper.hpp"
 #include <benchmark/benchmark.h>
 #include <cassert>

diff --git a/benchmarks/bench_ascon_hash.cpp b/benchmarks/bench_ascon_hash.cpp
@@ -1,5 +1,5 @@
+#include "ascon/hashing/ascon_hash.hpp"
 #include "bench_helper.hpp"
-#include "hashing/ascon_hash.hpp"
 #include <benchmark/benchmark.h>
 #include <span>
 #include <vector>

diff --git a/benchmarks/bench_ascon_hasha.cpp b/benchmarks/bench_ascon_hasha.cpp
@@ -1,5 +1,5 @@
+#include "ascon/hashing/ascon_hasha.hpp"
 #include "bench_helper.hpp"
-#include "hashing/ascon_hasha.hpp"
 #include <benchmark/benchmark.h>
 #include <span>
 #include <vector>

diff --git a/benchmarks/bench_ascon_mac.cpp b/benchmarks/bench_ascon_mac.cpp
@@ -1,4 +1,4 @@
-#include "auth/ascon_mac.hpp"
+#include "ascon/auth/ascon_mac.hpp"
 #include "bench_helper.hpp"
 #include <benchmark/benchmark.h>
 

diff --git a/benchmarks/bench_ascon_perm.cpp b/benchmarks/bench_ascon_perm.cpp
@@ -1,6 +1,6 @@
-#include "ascon_perm.hpp"
+#include "ascon/ascon_perm.hpp"
+#include "ascon/utils.hpp"
 #include "bench_helper.hpp"
-#include "utils.hpp"
 #include <benchmark/benchmark.h>
 
 // Benchmarking Ascon permutation routine, while applying `ROUNDS` -many

diff --git a/benchmarks/bench_ascon_prf.cpp b/benchmarks/bench_ascon_prf.cpp
@@ -1,4 +1,4 @@
-#include "auth/ascon_prf.hpp"
+#include "ascon/auth/ascon_prf.hpp"
 #include "bench_helper.hpp"
 #include <benchmark/benchmark.h>
 

diff --git a/benchmarks/bench_ascon_prfs.cpp b/benchmarks/bench_ascon_prfs.cpp
@@ -1,4 +1,4 @@
-#include "auth/ascon_prfs.hpp"
+#include "ascon/auth/ascon_prfs.hpp"
 #include "bench_helper.hpp"
 #include <benchmark/benchmark.h>
 

diff --git a/benchmarks/bench_ascon_xof.cpp b/benchmarks/bench_ascon_xof.cpp
@@ -1,5 +1,5 @@
+#include "ascon/hashing/ascon_xof.hpp"
 #include "bench_helper.hpp"
-#include "hashing/ascon_xof.hpp"
 #include <benchmark/benchmark.h>
 #include <span>
 #include <vector>

diff --git a/benchmarks/bench_ascon_xofa.cpp b/benchmarks/bench_ascon_xofa.cpp
@@ -1,5 +1,5 @@
+#include "ascon/hashing/ascon_xofa.hpp"
 #include "bench_helper.hpp"
-#include "hashing/ascon_xofa.hpp"
 #include <benchmark/benchmark.h>
 #include <span>
 #include <vector>

diff --git a/examples/ascon128_aead.cpp b/examples/ascon128_aead.cpp
@@ -1,4 +1,4 @@
-#include "aead/ascon128.hpp"
+#include "ascon/aead/ascon128.hpp"
 #include <cassert>
 #include <iostream>
 

diff --git a/examples/ascon128a_aead.cpp b/examples/ascon128a_aead.cpp
@@ -1,4 +1,4 @@
-#include "aead/ascon128a.hpp"
+#include "ascon/aead/ascon128a.hpp"
 #include <cassert>
 #include <iostream>
 

diff --git a/examples/ascon80pq_aead.cpp b/examples/ascon80pq_aead.cpp
@@ -1,4 +1,4 @@
-#include "aead/ascon80pq.hpp"
+#include "ascon/aead/ascon80pq.hpp"
 #include <cassert>
 #include <iostream>
 

diff --git a/examples/ascon_hash.cpp b/examples/ascon_hash.cpp
@@ -1,4 +1,4 @@
-#include "hashing/ascon_hash.hpp"
+#include "ascon/hashing/ascon_hash.hpp"
 #include <iostream>
 
 // Compile with

diff --git a/examples/ascon_hasha.cpp b/examples/ascon_hasha.cpp
@@ -1,4 +1,4 @@
-#include "hashing/ascon_hasha.hpp"
+#include "ascon/hashing/ascon_hasha.hpp"
 #include <iostream>
 
 // Compile with

diff --git a/examples/ascon_mac.cpp b/examples/ascon_mac.cpp
@@ -1,4 +1,4 @@
-#include "auth/ascon_mac.hpp"
+#include "ascon/auth/ascon_mac.hpp"
 #include <iostream>
 #include <vector>
 

diff --git a/examples/ascon_prf.cpp b/examples/ascon_prf.cpp
@@ -1,4 +1,4 @@
-#include "auth/ascon_prf.hpp"
+#include "ascon/auth/ascon_prf.hpp"
 #include <iostream>
 #include <vector>
 

diff --git a/examples/ascon_prfs.cpp b/examples/ascon_prfs.cpp
@@ -1,4 +1,4 @@
-#include "auth/ascon_prfs.hpp"
+#include "ascon/auth/ascon_prfs.hpp"
 #include <iostream>
 #include <vector>
 

diff --git a/examples/ascon_xof.cpp b/examples/ascon_xof.cpp
@@ -1,4 +1,4 @@
-#include "hashing/ascon_xof.hpp"
+#include "ascon/hashing/ascon_xof.hpp"
 #include <iostream>
 
 // Compile with

diff --git a/examples/ascon_xofa.cpp b/examples/ascon_xofa.cpp
@@ -1,4 +1,4 @@
-#include "hashing/ascon_xofa.hpp"
+#include "ascon/hashing/ascon_xofa.hpp"
 #include <iostream>
 
 // Compile with

diff --git a/include/aead/ascon128.hpp → include/ascon/aead/ascon128.hpp b/include/aead/ascon128.hpp → include/ascon/aead/ascon128.hpp
diff --git a/include/aead/ascon128a.hpp → include/ascon/aead/ascon128a.hpp b/include/aead/ascon128a.hpp → include/ascon/aead/ascon128a.hpp
diff --git a/include/aead/ascon80pq.hpp → include/ascon/aead/ascon80pq.hpp b/include/aead/ascon80pq.hpp → include/ascon/aead/ascon80pq.hpp
diff --git a/include/aead/common.hpp → include/ascon/aead/common.hpp b/include/aead/common.hpp → include/ascon/aead/common.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#include "ascon_perm.hpp"
-#include "utils.hpp"
+#include "ascon/ascon_perm.hpp"
+#include "ascon/utils.hpp"
 #include <array>
 
 // Common functions required for implementing Ascon-{128, 128a, 80pq}

diff --git a/include/ascon_perm.hpp → include/ascon/ascon_perm.hpp b/include/ascon_perm.hpp → include/ascon/ascon_perm.hpp
diff --git a/include/auth/ascon_mac.hpp → include/ascon/auth/ascon_mac.hpp b/include/auth/ascon_mac.hpp → include/ascon/auth/ascon_mac.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "ascon_perm.hpp"
+#include "ascon/ascon_perm.hpp"
 #include "sponge.hpp"
 
 // Ascon-MAC ( message authentication code )

diff --git a/include/auth/ascon_prf.hpp → include/ascon/auth/ascon_prf.hpp b/include/auth/ascon_prf.hpp → include/ascon/auth/ascon_prf.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "ascon_perm.hpp"
+#include "ascon/ascon_perm.hpp"
 #include "sponge.hpp"
 
 // Ascon-PRF ( pseudo-random function )

diff --git a/include/auth/ascon_prfs.hpp → include/ascon/auth/ascon_prfs.hpp b/include/auth/ascon_prfs.hpp → include/ascon/auth/ascon_prfs.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#include "ascon_perm.hpp"
-#include "utils.hpp"
+#include "ascon/ascon_perm.hpp"
+#include "ascon/utils.hpp"
 
 // Ascon-PRFShort
 namespace ascon_prfs {

diff --git a/include/auth/sponge.hpp → include/ascon/auth/sponge.hpp b/include/auth/sponge.hpp → include/ascon/auth/sponge.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#include "ascon_perm.hpp"
-#include "utils.hpp"
+#include "ascon/ascon_perm.hpp"
+#include "ascon/utils.hpp"
 #include <array>
 #include <span>
 

diff --git a/include/hashing/ascon_hash.hpp → include/ascon/hashing/ascon_hash.hpp b/include/hashing/ascon_hash.hpp → include/ascon/hashing/ascon_hash.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "ascon_perm.hpp"
+#include "ascon/ascon_perm.hpp"
 #include "sponge.hpp"
 
 // Ascon-Hash

diff --git a/include/hashing/ascon_hasha.hpp → include/ascon/hashing/ascon_hasha.hpp b/include/hashing/ascon_hasha.hpp → include/ascon/hashing/ascon_hasha.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "ascon_perm.hpp"
+#include "ascon/ascon_perm.hpp"
 #include "sponge.hpp"
 
 // Ascon-Hasha

diff --git a/include/hashing/ascon_xof.hpp → include/ascon/hashing/ascon_xof.hpp b/include/hashing/ascon_xof.hpp → include/ascon/hashing/ascon_xof.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "ascon_perm.hpp"
+#include "ascon/ascon_perm.hpp"
 #include "sponge.hpp"
 
 // Ascon-Xof

diff --git a/include/hashing/ascon_xofa.hpp → include/ascon/hashing/ascon_xofa.hpp b/include/hashing/ascon_xofa.hpp → include/ascon/hashing/ascon_xofa.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "ascon_perm.hpp"
+#include "ascon/ascon_perm.hpp"
 #include "sponge.hpp"
 
 // Ascon-XofA

diff --git a/include/hashing/sponge.hpp → include/ascon/hashing/sponge.hpp b/include/hashing/sponge.hpp → include/ascon/hashing/sponge.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#include "ascon_perm.hpp"
-#include "utils.hpp"
+#include "ascon/ascon_perm.hpp"
+#include "ascon/utils.hpp"
 #include <algorithm>
 #include <array>
 #include <cstdint>

diff --git a/include/utils.hpp → include/ascon/utils.hpp b/include/utils.hpp → include/ascon/utils.hpp
diff --git a/tests/dudect/test_ascon128a_aead_decrypt.cpp b/tests/dudect/test_ascon128a_aead_decrypt.cpp
@@ -1,4 +1,4 @@
-#include "aead/ascon128a.hpp"
+#include "ascon/aead/ascon128a.hpp"
 #include <cstdio>
 
 #define DUDECT_IMPLEMENTATION

diff --git a/tests/dudect/test_ascon128a_aead_encrypt.cpp b/tests/dudect/test_ascon128a_aead_encrypt.cpp
@@ -1,4 +1,4 @@
-#include "aead/ascon128a.hpp"
+#include "ascon/aead/ascon128a.hpp"
 #include <cstdio>
 
 #define DUDECT_IMPLEMENTATION

diff --git a/tests/test_ascon128_aead.cpp b/tests/test_ascon128_aead.cpp
@@ -1,4 +1,4 @@
-#include "aead/ascon128.hpp"
+#include "ascon/aead/ascon128.hpp"
 #include "test_common.hpp"
 #include <fstream>
 #include <gtest/gtest.h>

diff --git a/tests/test_ascon128a_aead.cpp b/tests/test_ascon128a_aead.cpp
@@ -1,4 +1,4 @@
-#include "aead/ascon128a.hpp"
+#include "ascon/aead/ascon128a.hpp"
 #include "test_common.hpp"
 #include <fstream>
 #include <gtest/gtest.h>

diff --git a/tests/test_ascon80pq_aead.cpp b/tests/test_ascon80pq_aead.cpp
@@ -1,4 +1,4 @@
-#include "aead/ascon80pq.hpp"
+#include "ascon/aead/ascon80pq.hpp"
 #include "test_common.hpp"
 #include <fstream>
 #include <gtest/gtest.h>

diff --git a/tests/test_ascon_hash.cpp b/tests/test_ascon_hash.cpp
@@ -1,4 +1,4 @@
-#include "hashing/ascon_hash.hpp"
+#include "ascon/hashing/ascon_hash.hpp"
 #include "test_common.hpp"
 #include <array>
 #include <fstream>

diff --git a/tests/test_ascon_hasha.cpp b/tests/test_ascon_hasha.cpp
@@ -1,4 +1,4 @@
-#include "hashing/ascon_hasha.hpp"
+#include "ascon/hashing/ascon_hasha.hpp"
 #include "test_common.hpp"
 #include <array>
 #include <fstream>

diff --git a/tests/test_ascon_mac.cpp b/tests/test_ascon_mac.cpp
@@ -1,4 +1,4 @@
-#include "auth/ascon_mac.hpp"
+#include "ascon/auth/ascon_mac.hpp"
 #include <fstream>
 #include <gtest/gtest.h>
 

diff --git a/tests/test_ascon_perm.cpp b/tests/test_ascon_perm.cpp
@@ -1,8 +1,8 @@
-#include "ascon_perm.hpp"
-#include "hashing/ascon_hash.hpp"
-#include "hashing/ascon_hasha.hpp"
-#include "hashing/ascon_xof.hpp"
-#include "hashing/ascon_xofa.hpp"
+#include "ascon/ascon_perm.hpp"
+#include "ascon/hashing/ascon_hash.hpp"
+#include "ascon/hashing/ascon_hasha.hpp"
+#include "ascon/hashing/ascon_xof.hpp"
+#include "ascon/hashing/ascon_xofa.hpp"
 #include <array>
 #include <gtest/gtest.h>
 

diff --git a/tests/test_ascon_prf.cpp b/tests/test_ascon_prf.cpp
@@ -1,4 +1,4 @@
-#include "auth/ascon_prf.hpp"
+#include "ascon/auth/ascon_prf.hpp"
 #include <fstream>
 #include <gtest/gtest.h>
 

diff --git a/tests/test_ascon_prfs.cpp b/tests/test_ascon_prfs.cpp
@@ -1,4 +1,4 @@
-#include "auth/ascon_prfs.hpp"
+#include "ascon/auth/ascon_prfs.hpp"
 #include <cstdint>
 #include <fstream>
 #include <gtest/gtest.h>

diff --git a/tests/test_ascon_xof.cpp b/tests/test_ascon_xof.cpp
@@ -1,4 +1,4 @@
-#include "hashing/ascon_xof.hpp"
+#include "ascon/hashing/ascon_xof.hpp"
 #include "test_common.hpp"
 #include <array>
 #include <fstream>

diff --git a/tests/test_ascon_xofa.cpp b/tests/test_ascon_xofa.cpp
@@ -1,4 +1,4 @@
-#include "hashing/ascon_xofa.hpp"
+#include "ascon/hashing/ascon_xofa.hpp"
 #include "test_common.hpp"
 #include <fstream>
 #include <gtest/gtest.h>