Skip to content

Commit

Permalink
move ascon headers under include/ascon directory, previously it use…
Browse files Browse the repository at this point in the history
…d to under `include` directory

Avoiding file name collision when Ascon is used, in other projects, as dependency.

Signed-off-by: Anjan Roy <[email protected]>
  • Loading branch information
itzmeanjan committed Feb 27, 2024
1 parent 62f61c9 commit d1d7e59
Show file tree
Hide file tree
Showing 49 changed files with 53 additions and 53 deletions.
2 changes: 1 addition & 1 deletion benchmarks/bench_ascon128_aead.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "aead/ascon128.hpp"
#include "ascon/aead/ascon128.hpp"
#include "bench_helper.hpp"
#include <benchmark/benchmark.h>
#include <cassert>
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/bench_ascon128a_aead.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "aead/ascon128a.hpp"
#include "ascon/aead/ascon128a.hpp"
#include "bench_helper.hpp"
#include <benchmark/benchmark.h>
#include <cassert>
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/bench_ascon80pq_aead.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "aead/ascon80pq.hpp"
#include "ascon/aead/ascon80pq.hpp"
#include "bench_helper.hpp"
#include <benchmark/benchmark.h>
#include <cassert>
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/bench_ascon_hash.cpp
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/bench_ascon_hasha.cpp
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/bench_ascon_mac.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "auth/ascon_mac.hpp"
#include "ascon/auth/ascon_mac.hpp"
#include "bench_helper.hpp"
#include <benchmark/benchmark.h>

Expand Down
4 changes: 2 additions & 2 deletions benchmarks/bench_ascon_perm.cpp
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/bench_ascon_prf.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "auth/ascon_prf.hpp"
#include "ascon/auth/ascon_prf.hpp"
#include "bench_helper.hpp"
#include <benchmark/benchmark.h>

Expand Down
2 changes: 1 addition & 1 deletion benchmarks/bench_ascon_prfs.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "auth/ascon_prfs.hpp"
#include "ascon/auth/ascon_prfs.hpp"
#include "bench_helper.hpp"
#include <benchmark/benchmark.h>

Expand Down
2 changes: 1 addition & 1 deletion benchmarks/bench_ascon_xof.cpp
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/bench_ascon_xofa.cpp
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion examples/ascon128_aead.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "aead/ascon128.hpp"
#include "ascon/aead/ascon128.hpp"
#include <cassert>
#include <iostream>

Expand Down
2 changes: 1 addition & 1 deletion examples/ascon128a_aead.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "aead/ascon128a.hpp"
#include "ascon/aead/ascon128a.hpp"
#include <cassert>
#include <iostream>

Expand Down
2 changes: 1 addition & 1 deletion examples/ascon80pq_aead.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "aead/ascon80pq.hpp"
#include "ascon/aead/ascon80pq.hpp"
#include <cassert>
#include <iostream>

Expand Down
2 changes: 1 addition & 1 deletion examples/ascon_hash.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "hashing/ascon_hash.hpp"
#include "ascon/hashing/ascon_hash.hpp"
#include <iostream>

// Compile with
Expand Down
2 changes: 1 addition & 1 deletion examples/ascon_hasha.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "hashing/ascon_hasha.hpp"
#include "ascon/hashing/ascon_hasha.hpp"
#include <iostream>

// Compile with
Expand Down
2 changes: 1 addition & 1 deletion examples/ascon_mac.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "auth/ascon_mac.hpp"
#include "ascon/auth/ascon_mac.hpp"
#include <iostream>
#include <vector>

Expand Down
2 changes: 1 addition & 1 deletion examples/ascon_prf.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "auth/ascon_prf.hpp"
#include "ascon/auth/ascon_prf.hpp"
#include <iostream>
#include <vector>

Expand Down
2 changes: 1 addition & 1 deletion examples/ascon_prfs.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "auth/ascon_prfs.hpp"
#include "ascon/auth/ascon_prfs.hpp"
#include <iostream>
#include <vector>

Expand Down
2 changes: 1 addition & 1 deletion examples/ascon_xof.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "hashing/ascon_xof.hpp"
#include "ascon/hashing/ascon_xof.hpp"
#include <iostream>

// Compile with
Expand Down
2 changes: 1 addition & 1 deletion examples/ascon_xofa.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "hashing/ascon_xofa.hpp"
#include "ascon/hashing/ascon_xofa.hpp"
#include <iostream>

// Compile with
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions include/aead/common.hpp → include/ascon/aead/common.hpp
Original file line number Diff line number Diff line change
@@ -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}
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#pragma once
#include "ascon_perm.hpp"
#include "ascon/ascon_perm.hpp"
#include "sponge.hpp"

// Ascon-MAC ( message authentication code )
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#pragma once
#include "ascon_perm.hpp"
#include "ascon/ascon_perm.hpp"
#include "sponge.hpp"

// Ascon-PRF ( pseudo-random function )
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions include/auth/sponge.hpp → include/ascon/auth/sponge.hpp
Original file line number Diff line number Diff line change
@@ -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>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#pragma once
#include "ascon_perm.hpp"
#include "ascon/ascon_perm.hpp"
#include "sponge.hpp"

// Ascon-Hash
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#pragma once
#include "ascon_perm.hpp"
#include "ascon/ascon_perm.hpp"
#include "sponge.hpp"

// Ascon-Hasha
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#pragma once
#include "ascon_perm.hpp"
#include "ascon/ascon_perm.hpp"
#include "sponge.hpp"

// Ascon-Xof
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#pragma once
#include "ascon_perm.hpp"
#include "ascon/ascon_perm.hpp"
#include "sponge.hpp"

// Ascon-XofA
Expand Down
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion tests/dudect/test_ascon128a_aead_decrypt.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "aead/ascon128a.hpp"
#include "ascon/aead/ascon128a.hpp"
#include <cstdio>

#define DUDECT_IMPLEMENTATION
Expand Down
2 changes: 1 addition & 1 deletion tests/dudect/test_ascon128a_aead_encrypt.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "aead/ascon128a.hpp"
#include "ascon/aead/ascon128a.hpp"
#include <cstdio>

#define DUDECT_IMPLEMENTATION
Expand Down
2 changes: 1 addition & 1 deletion tests/test_ascon128_aead.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "aead/ascon128.hpp"
#include "ascon/aead/ascon128.hpp"
#include "test_common.hpp"
#include <fstream>
#include <gtest/gtest.h>
Expand Down
2 changes: 1 addition & 1 deletion tests/test_ascon128a_aead.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "aead/ascon128a.hpp"
#include "ascon/aead/ascon128a.hpp"
#include "test_common.hpp"
#include <fstream>
#include <gtest/gtest.h>
Expand Down
2 changes: 1 addition & 1 deletion tests/test_ascon80pq_aead.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "aead/ascon80pq.hpp"
#include "ascon/aead/ascon80pq.hpp"
#include "test_common.hpp"
#include <fstream>
#include <gtest/gtest.h>
Expand Down
2 changes: 1 addition & 1 deletion tests/test_ascon_hash.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "hashing/ascon_hash.hpp"
#include "ascon/hashing/ascon_hash.hpp"
#include "test_common.hpp"
#include <array>
#include <fstream>
Expand Down
2 changes: 1 addition & 1 deletion tests/test_ascon_hasha.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "hashing/ascon_hasha.hpp"
#include "ascon/hashing/ascon_hasha.hpp"
#include "test_common.hpp"
#include <array>
#include <fstream>
Expand Down
2 changes: 1 addition & 1 deletion tests/test_ascon_mac.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "auth/ascon_mac.hpp"
#include "ascon/auth/ascon_mac.hpp"
#include <fstream>
#include <gtest/gtest.h>

Expand Down
10 changes: 5 additions & 5 deletions tests/test_ascon_perm.cpp
Original file line number Diff line number Diff line change
@@ -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>

Expand Down
2 changes: 1 addition & 1 deletion tests/test_ascon_prf.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "auth/ascon_prf.hpp"
#include "ascon/auth/ascon_prf.hpp"
#include <fstream>
#include <gtest/gtest.h>

Expand Down
2 changes: 1 addition & 1 deletion tests/test_ascon_prfs.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "auth/ascon_prfs.hpp"
#include "ascon/auth/ascon_prfs.hpp"
#include <cstdint>
#include <fstream>
#include <gtest/gtest.h>
Expand Down
2 changes: 1 addition & 1 deletion tests/test_ascon_xof.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "hashing/ascon_xof.hpp"
#include "ascon/hashing/ascon_xof.hpp"
#include "test_common.hpp"
#include <array>
#include <fstream>
Expand Down
2 changes: 1 addition & 1 deletion tests/test_ascon_xofa.cpp
Original file line number Diff line number Diff line change
@@ -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>
Expand Down

0 comments on commit d1d7e59

Please sign in to comment.