Structure refactoring 1

chardoncs · May 27, 2023 · 6e0629d · 6e0629d
1 parent 98ed9f2
commit 6e0629d
Show file tree

Hide file tree

Showing 99 changed files with 294 additions and 271 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -59,10 +59,14 @@ add_executable(pgfetestcpp ${test_dir}/test.cpp)
 # add_executable(totptest ${test_dir}/totptest.c)
 # add_executable(totptestcpp ${test_dir}/totptest.cpp)
 
-target_include_directories(pgfe PRIVATE
+target_include_directories(pgfe PUBLIC
   ${include_dir}
 )
 
+target_include_directories(pgfe PRIVATE
+  ${src_dir}
+)
+
 target_link_libraries(pgfetest pgfe)
 target_link_libraries(pgfetestcpp pgfe)
 # target_link_libraries(totptest pgfe)

diff --git a/include/backend/keccak-backend.h b/include/backend/keccak-backend.h
diff --git a/...de/backend_cpp/abstract_base_encoding.hpp → include/libpgfe/abstract_base_encoding.hpp b/...de/backend_cpp/abstract_base_encoding.hpp → include/libpgfe/abstract_base_encoding.hpp
@@ -15,8 +15,8 @@
 #include <mutex>
 #include <string>
 
-#include "../generic.h"
-#include "../sequential_data.hpp"
+#include "libpgfe/generic.h"
+#include "libpgfe/sequential_data.hpp"
 
 namespace libpgfe {
 

diff --git a/include/backend_cpp/abstract_encoder.hpp → include/libpgfe/abstract_encoder.hpp b/include/backend_cpp/abstract_encoder.hpp → include/libpgfe/abstract_encoder.hpp
@@ -14,9 +14,9 @@
 #include <cstring>
 #include <string>
 
-#include "../generic.h"
-#include "../sequential_data.hpp"
-#include "../utils.hpp"
+#include "libpgfe/generic.h"
+#include "libpgfe/sequential_data.hpp"
+#include "libpgfe/utils.hpp"
 
 namespace libpgfe {
 

diff --git a/...ude/backend_cpp/abstract_hash_encoder.hpp → include/libpgfe/abstract_hash_encoder.hpp b/...ude/backend_cpp/abstract_hash_encoder.hpp → include/libpgfe/abstract_hash_encoder.hpp
@@ -13,12 +13,12 @@
 
 #include <string>
 
-#include "abstract_encoder.hpp"
+#include "libpgfe/abstract_encoder.hpp"
 
-#include "../algorithm-choice.h"
-#include "../algorithm_selectable.hpp"
-#include "../generic.h"
-#include "../generic.hpp"
+#include "libpgfe/algorithm-choice.h"
+#include "libpgfe/algorithm_selectable.hpp"
+#include "libpgfe/generic.h"
+#include "libpgfe/generic.hpp"
 
 namespace libpgfe {
 

diff --git a/include/backend_cpp/abstract_otp.hpp → include/libpgfe/abstract_otp.hpp b/include/backend_cpp/abstract_otp.hpp → include/libpgfe/abstract_otp.hpp
@@ -13,10 +13,10 @@
 
 #include <string>
 
-#include "../algorithm_selectable.hpp"
-#include "../backend/otp-generic.h"
-#include "../generic.h"
-#include "../sequential_data.hpp"
+#include "libpgfe/algorithm_selectable.hpp"
+#include "libpgfe/generic.h"
+#include "libpgfe/otp_types.h"
+#include "libpgfe/sequential_data.hpp"
 
 namespace libpgfe {
 

diff --git a/...ackend_cpp/abstract_symmetric_crypter.hpp → ...de/libpgfe/abstract_symmetric_crypter.hpp b/...ackend_cpp/abstract_symmetric_crypter.hpp → ...de/libpgfe/abstract_symmetric_crypter.hpp
@@ -13,7 +13,7 @@
 
 #include <string>
 
-#include "../sequential_data.hpp"
+#include "libpgfe/sequential_data.hpp"
 
 namespace libpgfe {
 

diff --git a/include/algorithm-choice.h → include/libpgfe/algorithm-choice.h b/include/algorithm-choice.h → include/libpgfe/algorithm-choice.h
diff --git a/include/algorithm_selectable.hpp → include/libpgfe/algorithm_selectable.hpp b/include/algorithm_selectable.hpp → include/libpgfe/algorithm_selectable.hpp
@@ -12,7 +12,7 @@
 #include <cstring>
 #include <string>
 
-#include "algorithm-choice.h"
+#include "libpgfe/algorithm-choice.h"
 
 namespace libpgfe {
 

diff --git a/include/base-encoding.h → include/libpgfe/base-encoding.h b/include/base-encoding.h → include/libpgfe/base-encoding.h
@@ -8,7 +8,7 @@
 #ifndef LIBPGFE_BASE_ENCODING_H
 #define LIBPGFE_BASE_ENCODING_H
 
-#include "generic.h"
+#include "libpgfe/generic.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/include/base16.hpp → include/libpgfe/base16.hpp b/include/base16.hpp → include/libpgfe/base16.hpp
@@ -11,7 +11,7 @@
 #error libpgfe error: C++ headers are not compatible with C source
 #endif
 
-#include "backend_cpp/abstract_base_encoding.hpp"
+#include "libpgfe/abstract_base_encoding.hpp"
 
 namespace libpgfe {
 

diff --git a/include/base32.hpp → include/libpgfe/base32.hpp b/include/base32.hpp → include/libpgfe/base32.hpp
@@ -11,7 +11,7 @@
 #error libpgfe error: C++ headers are not compatible with C source
 #endif
 
-#include "backend_cpp/abstract_base_encoding.hpp"
+#include "libpgfe/abstract_base_encoding.hpp"
 
 namespace libpgfe {
 

diff --git a/include/base64.hpp → include/libpgfe/base64.hpp b/include/base64.hpp → include/libpgfe/base64.hpp
@@ -11,7 +11,7 @@
 #error libpgfe error: C++ headers are not compatible with C source
 #endif
 
-#include "backend_cpp/abstract_base_encoding.hpp"
+#include "libpgfe/abstract_base_encoding.hpp"
 
 namespace libpgfe {
 

diff --git a/include/blowfish.h → include/libpgfe/blowfish.h b/include/blowfish.h → include/libpgfe/blowfish.h
@@ -13,7 +13,7 @@
 extern "C" {
 #endif
 
-#include "backend/generic-internal.h"
+#include "libpgfe/generic.h"
 
 #define __PGFE_BF_N 16
 #define __PGFE_BF_Np2 18

diff --git a/include/blowfish.hpp → include/libpgfe/blowfish.hpp b/include/blowfish.hpp → include/libpgfe/blowfish.hpp
@@ -13,8 +13,8 @@
 
 #include <string>
 
-#include "backend_cpp/abstract_symmetric_crypter.hpp"
-#include "blowfish.h"
+#include "libpgfe/abstract_symmetric_crypter.hpp"
+#include "libpgfe/blowfish.h"
 
 namespace libpgfe {
 

diff --git a/include/exceptions.hpp → include/libpgfe/exceptions.hpp b/include/exceptions.hpp → include/libpgfe/exceptions.hpp
diff --git a/include/generic.h → include/libpgfe/generic.h b/include/generic.h → include/libpgfe/generic.h
@@ -11,7 +11,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "algorithm-choice.h"
+#include "libpgfe/algorithm-choice.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/include/generic.hpp → include/libpgfe/generic.hpp b/include/generic.hpp → include/libpgfe/generic.hpp
@@ -14,12 +14,12 @@
 #include <string>
 #include <unordered_map>
 
-#include "algorithm-choice.h"
-#include "exceptions.hpp"
-#include "md5.h"
-#include "sha1.h"
-#include "sha2.h"
-#include "sha3.h"
+#include "libpgfe/algorithm-choice.h"
+#include "libpgfe/exceptions.hpp"
+#include "libpgfe/md5.h"
+#include "libpgfe/sha1.h"
+#include "libpgfe/sha2.h"
+#include "libpgfe/sha3.h"
 
 #define __PGFE_BATCH_SHAKE_CASES(name)                                                                                 \
     switch (cur_alg) {                                                                                                 \

diff --git a/include/libpgfe/hash.h b/include/libpgfe/hash.h
@@ -0,0 +1,4 @@
+#include "libpgfe/md5.h"
+#include "libpgfe/sha1.h"
+#include "libpgfe/sha2.h"
+#include "libpgfe/sha3.h"
diff --git a/include/hash_encoder.hpp → include/libpgfe/hash_encoder.hpp b/include/hash_encoder.hpp → include/libpgfe/hash_encoder.hpp
@@ -13,7 +13,7 @@
 #error libpgfe error: C++ headers are not compatible with C source
 #endif
 
-#include "backend_cpp/abstract_hash_encoder.hpp"
+#include "libpgfe/abstract_hash_encoder.hpp"
 
 #include <memory>
 

diff --git a/include/hmac.h → include/libpgfe/hmac.h b/include/hmac.h → include/libpgfe/hmac.h
@@ -8,12 +8,11 @@
 #ifndef LIBPGFE_HMAC_H
 #define LIBPGFE_HMAC_H
 
-#include "backend/generic-internal.h"
-#include "generic.h"
-#include "md5.h"
-#include "sha1.h"
-#include "sha2.h"
-#include "sha3.h"
+#include "libpgfe/generic.h"
+#include "libpgfe/md5.h"
+#include "libpgfe/sha1.h"
+#include "libpgfe/sha2.h"
+#include "libpgfe/sha3.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/include/hmac_encoder.hpp → include/libpgfe/hmac_encoder.hpp b/include/hmac_encoder.hpp → include/libpgfe/hmac_encoder.hpp
@@ -14,10 +14,10 @@
 #include <memory>
 #include <vector>
 
-#include "backend_cpp/abstract_hash_encoder.hpp"
-#include "generic.h"
-#include "generic.hpp"
-#include "hmac.h"
+#include "libpgfe/abstract_hash_encoder.hpp"
+#include "libpgfe/generic.h"
+#include "libpgfe/generic.hpp"
+#include "libpgfe/hmac.h"
 
 namespace libpgfe {
 

diff --git a/include/hotp.h → include/libpgfe/hotp.h b/include/hotp.h → include/libpgfe/hotp.h
@@ -8,8 +8,8 @@
 #ifndef LIBPGFE_HOTP_H
 #define LIBPGFE_HOTP_H
 
-#include "backend/generic-internal.h"
-#include "backend/otp-generic.h"
+#include "libpgfe/generic.h"
+#include "libpgfe/otp_types.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/include/hotp.hpp → include/libpgfe/hotp.hpp b/include/hotp.hpp → include/libpgfe/hotp.hpp
@@ -13,8 +13,8 @@
 
 #include <memory>
 
-#include "backend_cpp/abstract_otp.hpp"
-#include "base32.hpp"
+#include "libpgfe/abstract_otp.hpp"
+#include "libpgfe/base32.hpp"
 
 namespace libpgfe {
 

diff --git a/include/md5.h → include/libpgfe/md5.h b/include/md5.h → include/libpgfe/md5.h
@@ -10,8 +10,7 @@
 
 #include <stdio.h>
 
-#include "backend/generic-internal.h"
-#include "generic.h"
+#include "libpgfe/generic.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/include/libpgfe/otp_types.h b/include/libpgfe/otp_types.h
@@ -0,0 +1,17 @@
+#ifndef LIBPGFE_OTP_TYPES_H
+#define LIBPGFE_OTP_TYPES_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef uint32_t pgfe_otp_t;
+
+typedef uint64_t pgfe_otp_counter_t;
+
+typedef pgfe_encode_t pgfe_otp_secret_t;
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/include/sequential_data.hpp → include/libpgfe/sequential_data.hpp b/include/sequential_data.hpp → include/libpgfe/sequential_data.hpp
@@ -16,8 +16,8 @@
 #include <ostream>
 #include <string>
 
-#include "generic.h"
-#include "utils.h"
+#include "libpgfe/generic.h"
+#include "libpgfe/utils.h"
 
 namespace libpgfe {
 

diff --git a/include/sha1.h → include/libpgfe/sha1.h b/include/sha1.h → include/libpgfe/sha1.h
@@ -10,7 +10,7 @@
 
 #include <stdio.h>
 
-#include "backend/generic-internal.h"
+#include "libpgfe/generic.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/include/sha2.h → include/libpgfe/sha2.h b/include/sha2.h → include/libpgfe/sha2.h
@@ -10,7 +10,7 @@
 
 #include <stdio.h>
 
-#include "backend/generic-internal.h"
+#include "libpgfe/generic.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/include/sha3.h → include/libpgfe/sha3.h b/include/sha3.h → include/libpgfe/sha3.h
@@ -10,13 +10,32 @@
 
 #include <stdio.h>
 
-#include "backend/keccak-backend.h"
-#include "generic.h"
+#include "libpgfe/generic.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#define __PGFE_KECCAK_MAX_RATE 1536
+
+typedef uint64_t pgfe_keccak_lane_t;
+
+typedef pgfe_keccak_lane_t pgfe_keccak_bitcube_t[5][5];
+
+// Generic Keccak Sponge Context
+struct pgfe_keccak_sponge_ctx
+{
+    pgfe_keccak_bitcube_t state;                               // Keccak sponge state array
+    pgfe_encode_t data_queue[to_byte(__PGFE_KECCAK_MAX_RATE)]; // Data queue
+    uint32_t rate, capacity, inqueue_bits, out_length;         // Rate, capacity, bits in queue, output bit length
+    uint16_t nr;                                               // Number of rounds (Usually 24)
+    int squeezing;                                             // Is squeezing
+    unsigned int squeezable;                                   // Size of squeezable bits
+    pgfe_encode_t ap;                                          // Reserved appendix for adapting SHA-3
+    uint8_t ap_len;                                            // Bit length of appendix
+    int ap_added;                                              // Is appendix added
+};
+
 #define PGFE_SHA3_224_DIGEST_SIZE 28
 #define PGFE_SHA3_256_DIGEST_SIZE 32
 #define PGFE_SHA3_384_DIGEST_SIZE 48