diff --git a/Makefile b/Makefile index 89bb438..bd9582b 100644 --- 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 index 3b9ca10..898a84a 100644 --- 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 #include diff --git a/benchmarks/bench_ascon128a_aead.cpp b/benchmarks/bench_ascon128a_aead.cpp index 3f16d2c..c285708 100644 --- 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 #include diff --git a/benchmarks/bench_ascon80pq_aead.cpp b/benchmarks/bench_ascon80pq_aead.cpp index e4ab65a..cc2e567 100644 --- 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 #include diff --git a/benchmarks/bench_ascon_hash.cpp b/benchmarks/bench_ascon_hash.cpp index 0376a01..a7c336e 100644 --- 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 #include #include diff --git a/benchmarks/bench_ascon_hasha.cpp b/benchmarks/bench_ascon_hasha.cpp index a0d1766..6e7582e 100644 --- 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 #include #include diff --git a/benchmarks/bench_ascon_mac.cpp b/benchmarks/bench_ascon_mac.cpp index 4ccf327..e5d9778 100644 --- 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 diff --git a/benchmarks/bench_ascon_perm.cpp b/benchmarks/bench_ascon_perm.cpp index 23f94ee..cb456ea 100644 --- 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 // Benchmarking Ascon permutation routine, while applying `ROUNDS` -many diff --git a/benchmarks/bench_ascon_prf.cpp b/benchmarks/bench_ascon_prf.cpp index b015330..a353095 100644 --- 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 diff --git a/benchmarks/bench_ascon_prfs.cpp b/benchmarks/bench_ascon_prfs.cpp index 003efb1..3f7a8f1 100644 --- 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 diff --git a/benchmarks/bench_ascon_xof.cpp b/benchmarks/bench_ascon_xof.cpp index dda460b..ed5e4b3 100644 --- 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 #include #include diff --git a/benchmarks/bench_ascon_xofa.cpp b/benchmarks/bench_ascon_xofa.cpp index 9edbf1f..67aa82e 100644 --- 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 #include #include diff --git a/examples/ascon128_aead.cpp b/examples/ascon128_aead.cpp index 0fd44bb..e4434b9 100644 --- a/examples/ascon128_aead.cpp +++ b/examples/ascon128_aead.cpp @@ -1,4 +1,4 @@ -#include "aead/ascon128.hpp" +#include "ascon/aead/ascon128.hpp" #include #include diff --git a/examples/ascon128a_aead.cpp b/examples/ascon128a_aead.cpp index 8ead783..3c4ac70 100644 --- a/examples/ascon128a_aead.cpp +++ b/examples/ascon128a_aead.cpp @@ -1,4 +1,4 @@ -#include "aead/ascon128a.hpp" +#include "ascon/aead/ascon128a.hpp" #include #include diff --git a/examples/ascon80pq_aead.cpp b/examples/ascon80pq_aead.cpp index f383c53..787232d 100644 --- a/examples/ascon80pq_aead.cpp +++ b/examples/ascon80pq_aead.cpp @@ -1,4 +1,4 @@ -#include "aead/ascon80pq.hpp" +#include "ascon/aead/ascon80pq.hpp" #include #include diff --git a/examples/ascon_hash.cpp b/examples/ascon_hash.cpp index ecbe055..66bc581 100644 --- 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 // Compile with diff --git a/examples/ascon_hasha.cpp b/examples/ascon_hasha.cpp index 43881c5..e8930df 100644 --- 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 // Compile with diff --git a/examples/ascon_mac.cpp b/examples/ascon_mac.cpp index 9048003..0b4c55e 100644 --- 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 #include diff --git a/examples/ascon_prf.cpp b/examples/ascon_prf.cpp index 66ff029..abecb5f 100644 --- 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 #include diff --git a/examples/ascon_prfs.cpp b/examples/ascon_prfs.cpp index e9d7c24..a380416 100644 --- 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 #include diff --git a/examples/ascon_xof.cpp b/examples/ascon_xof.cpp index 45ba2ed..740acea 100644 --- 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 // Compile with diff --git a/examples/ascon_xofa.cpp b/examples/ascon_xofa.cpp index 0e13ce2..d4c5321 100644 --- 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 // Compile with diff --git a/include/aead/ascon128.hpp b/include/ascon/aead/ascon128.hpp similarity index 100% rename from include/aead/ascon128.hpp rename to include/ascon/aead/ascon128.hpp diff --git a/include/aead/ascon128a.hpp b/include/ascon/aead/ascon128a.hpp similarity index 100% rename from include/aead/ascon128a.hpp rename to include/ascon/aead/ascon128a.hpp diff --git a/include/aead/ascon80pq.hpp b/include/ascon/aead/ascon80pq.hpp similarity index 100% rename from include/aead/ascon80pq.hpp rename to include/ascon/aead/ascon80pq.hpp diff --git a/include/aead/common.hpp b/include/ascon/aead/common.hpp similarity index 99% rename from include/aead/common.hpp rename to include/ascon/aead/common.hpp index 01b7773..565927e 100644 --- a/include/aead/common.hpp +++ b/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 // Common functions required for implementing Ascon-{128, 128a, 80pq} diff --git a/include/ascon_perm.hpp b/include/ascon/ascon_perm.hpp similarity index 100% rename from include/ascon_perm.hpp rename to include/ascon/ascon_perm.hpp diff --git a/include/auth/ascon_mac.hpp b/include/ascon/auth/ascon_mac.hpp similarity index 98% rename from include/auth/ascon_mac.hpp rename to include/ascon/auth/ascon_mac.hpp index 86723ef..905b9ca 100644 --- a/include/auth/ascon_mac.hpp +++ b/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 b/include/ascon/auth/ascon_prf.hpp similarity index 98% rename from include/auth/ascon_prf.hpp rename to include/ascon/auth/ascon_prf.hpp index 2bc43c3..5b4a0cf 100644 --- a/include/auth/ascon_prf.hpp +++ b/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 b/include/ascon/auth/ascon_prfs.hpp similarity index 98% rename from include/auth/ascon_prfs.hpp rename to include/ascon/auth/ascon_prfs.hpp index f2d8873..0702945 100644 --- a/include/auth/ascon_prfs.hpp +++ b/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 b/include/ascon/auth/sponge.hpp similarity index 99% rename from include/auth/sponge.hpp rename to include/ascon/auth/sponge.hpp index fb9c79c..2597903 100644 --- a/include/auth/sponge.hpp +++ b/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 #include diff --git a/include/hashing/ascon_hash.hpp b/include/ascon/hashing/ascon_hash.hpp similarity index 99% rename from include/hashing/ascon_hash.hpp rename to include/ascon/hashing/ascon_hash.hpp index 92b6aff..a3e9187 100644 --- a/include/hashing/ascon_hash.hpp +++ b/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 b/include/ascon/hashing/ascon_hasha.hpp similarity index 99% rename from include/hashing/ascon_hasha.hpp rename to include/ascon/hashing/ascon_hasha.hpp index 4277126..1736722 100644 --- a/include/hashing/ascon_hasha.hpp +++ b/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 b/include/ascon/hashing/ascon_xof.hpp similarity index 99% rename from include/hashing/ascon_xof.hpp rename to include/ascon/hashing/ascon_xof.hpp index c8f0e76..e9fd854 100644 --- a/include/hashing/ascon_xof.hpp +++ b/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 b/include/ascon/hashing/ascon_xofa.hpp similarity index 99% rename from include/hashing/ascon_xofa.hpp rename to include/ascon/hashing/ascon_xofa.hpp index 01138a4..4f44647 100644 --- a/include/hashing/ascon_xofa.hpp +++ b/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 b/include/ascon/hashing/sponge.hpp similarity index 98% rename from include/hashing/sponge.hpp rename to include/ascon/hashing/sponge.hpp index 746bbb5..8053acb 100644 --- a/include/hashing/sponge.hpp +++ b/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 #include #include diff --git a/include/utils.hpp b/include/ascon/utils.hpp similarity index 100% rename from include/utils.hpp rename to include/ascon/utils.hpp diff --git a/tests/dudect/test_ascon128a_aead_decrypt.cpp b/tests/dudect/test_ascon128a_aead_decrypt.cpp index 9ceb148..f72d6f7 100644 --- 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 #define DUDECT_IMPLEMENTATION diff --git a/tests/dudect/test_ascon128a_aead_encrypt.cpp b/tests/dudect/test_ascon128a_aead_encrypt.cpp index a1d83e8..d787a42 100644 --- 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 #define DUDECT_IMPLEMENTATION diff --git a/tests/test_ascon128_aead.cpp b/tests/test_ascon128_aead.cpp index 72558a8..e8a01b7 100644 --- 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 #include diff --git a/tests/test_ascon128a_aead.cpp b/tests/test_ascon128a_aead.cpp index c751f97..0457dc9 100644 --- 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 #include diff --git a/tests/test_ascon80pq_aead.cpp b/tests/test_ascon80pq_aead.cpp index 881a96c..877ea79 100644 --- 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 #include diff --git a/tests/test_ascon_hash.cpp b/tests/test_ascon_hash.cpp index 7b04804..48aabd2 100644 --- 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 #include diff --git a/tests/test_ascon_hasha.cpp b/tests/test_ascon_hasha.cpp index 7c615de..f508f4e 100644 --- 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 #include diff --git a/tests/test_ascon_mac.cpp b/tests/test_ascon_mac.cpp index 0d61b33..d85d080 100644 --- 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 #include diff --git a/tests/test_ascon_perm.cpp b/tests/test_ascon_perm.cpp index 092b82b..7a37030 100644 --- 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 #include diff --git a/tests/test_ascon_prf.cpp b/tests/test_ascon_prf.cpp index 46a8b08..b94b3af 100644 --- 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 #include diff --git a/tests/test_ascon_prfs.cpp b/tests/test_ascon_prfs.cpp index f349004..206265e 100644 --- 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 #include #include diff --git a/tests/test_ascon_xof.cpp b/tests/test_ascon_xof.cpp index 9376cef..6116862 100644 --- 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 #include diff --git a/tests/test_ascon_xofa.cpp b/tests/test_ascon_xofa.cpp index fa4a4c5..cc73349 100644 --- 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 #include