updated build system
This commit is contained in:
		| @@ -38,14 +38,15 @@ public: | ||||
|                     std::optional<std::string> relative_parent_path, | ||||
|                     std::size_t error_return = 0U); | ||||
|  | ||||
|   encrypting_reader(std::string_view encrypted_file_path, | ||||
|                     std::string_view source_path, | ||||
|                     stop_type_callback stop_requested_cb, | ||||
|                     std::string_view token, std::size_t error_return = 0U); | ||||
|   encrypting_reader(stop_type_callback stop_requested_cb, | ||||
|                     std::string_view encrypted_file_path, | ||||
|                     std::string_view source_path, std::string_view token, | ||||
|                     std::size_t error_return = 0U); | ||||
|  | ||||
|   encrypting_reader( | ||||
|       stop_type_callback stop_requested_cb, | ||||
|       std::string_view encrypted_file_path, std::string_view source_path, | ||||
|       stop_type_callback stop_requested_cb, std::string_view token, | ||||
|       std::string_view token, | ||||
|       std::vector<std::array<unsigned char, | ||||
|                              crypto_aead_xchacha20poly1305_IETF_NPUBBYTES>> | ||||
|           iv_list, | ||||
| @@ -57,16 +58,37 @@ public: | ||||
|                     std::optional<std::string> relative_parent_path, | ||||
|                     std::size_t error_return = 0U); | ||||
|  | ||||
|   encrypting_reader(std::string_view encrypted_file_path, | ||||
|                     std::string_view source_path, | ||||
|                     stop_type_callback stop_requested_cb, | ||||
|                     std::string_view token, kdf_config cfg, | ||||
|                     std::size_t error_return = 0U); | ||||
|   encrypting_reader(stop_type_callback stop_requested_cb, | ||||
|                     std::string_view encrypted_file_path, | ||||
|                     std::string_view source_path, std::string_view token, | ||||
|                     kdf_config cfg, std::size_t error_return = 0U); | ||||
|  | ||||
|   encrypting_reader( | ||||
|       stop_type_callback stop_requested_cb, | ||||
|       std::string_view encrypted_file_path, std::string_view source_path, | ||||
|       stop_type_callback stop_requested_cb, std::string_view token, | ||||
|       kdf_config cfg, | ||||
|       std::string_view token, kdf_config cfg, | ||||
|       std::vector<std::array<unsigned char, | ||||
|                              crypto_aead_xchacha20poly1305_IETF_NPUBBYTES>> | ||||
|           iv_list, | ||||
|       std::size_t error_return = 0U); | ||||
|  | ||||
|   encrypting_reader(std::string_view file_name, std::string_view source_path, | ||||
|                     stop_type_callback stop_requested_cb, | ||||
|                     const utils::hash::hash_256_t &master_key, | ||||
|                     const kdf_config &cfg, | ||||
|                     std::optional<std::string> relative_parent_path, | ||||
|                     std::size_t error_return = 0U); | ||||
|  | ||||
|   encrypting_reader(stop_type_callback stop_requested_cb, | ||||
|                     std::string_view encrypted_file_path, | ||||
|                     std::string_view source_path, | ||||
|                     const utils::hash::hash_256_t &master_key, | ||||
|                     const kdf_config &cfg, std::size_t error_return = 0U); | ||||
|  | ||||
|   encrypting_reader( | ||||
|       stop_type_callback stop_requested_cb, | ||||
|       std::string_view encrypted_file_path, std::string_view source_path, | ||||
|       const utils::hash::hash_256_t &master_key, const kdf_config &cfg, | ||||
|       std::vector<std::array<unsigned char, | ||||
|                              crypto_aead_xchacha20poly1305_IETF_NPUBBYTES>> | ||||
|           iv_list, | ||||
| @@ -82,10 +104,13 @@ public: | ||||
|  | ||||
| public: | ||||
|   using iostream = std::basic_iostream<char, std::char_traits<char>>; | ||||
|   using kdf_pair_t = std::pair<data_buffer, data_buffer>; | ||||
|   using key_pair_t = | ||||
|       std::pair<utils::hash::hash_256_t, utils::hash::hash_256_t>; | ||||
|   using streambuf = std::basic_streambuf<char, std::char_traits<char>>; | ||||
|  | ||||
| private: | ||||
|   utils::hash::hash_256_t key_; | ||||
|   key_pair_t keys_; | ||||
|   stop_type_callback stop_requested_cb_; | ||||
|   size_t error_return_; | ||||
|   std::unique_ptr<utils::file::i_file> source_file_; | ||||
| @@ -97,7 +122,7 @@ private: | ||||
|  | ||||
| private: | ||||
|   std::unordered_map<std::size_t, data_buffer> chunk_buffers_; | ||||
|   std::optional<data_buffer> kdf_header_; | ||||
|   std::optional<kdf_pair_t> kdf_headers_; | ||||
|   std::size_t last_data_chunk_{}; | ||||
|   std::size_t last_data_chunk_size_{}; | ||||
|   std::uint64_t read_offset_{}; | ||||
| @@ -113,6 +138,11 @@ private: | ||||
|  | ||||
|   void common_initialize(bool procces_iv_list); | ||||
|  | ||||
|   void common_initialize_kdf_data(const kdf_config &cfg, | ||||
|                                   const utils::hash::hash_256_t &master_key); | ||||
|  | ||||
|   void common_initialize_kdf_path(const utils::hash::hash_256_t &master_key); | ||||
|  | ||||
|   void create_encrypted_paths(std::string_view file_name, | ||||
|                               std::optional<std::string> relative_parent_path); | ||||
|  | ||||
| @@ -157,7 +187,11 @@ public: | ||||
|     return iv_list_; | ||||
|   } | ||||
|  | ||||
|   [[nodiscard]] auto get_kdf_config() const -> std::optional<kdf_config>; | ||||
|   [[nodiscard]] auto get_kdf_config_for_data() const | ||||
|       -> std::optional<kdf_config>; | ||||
|  | ||||
|   [[nodiscard]] auto get_kdf_config_for_path() const | ||||
|       -> std::optional<kdf_config>; | ||||
|  | ||||
|   [[nodiscard]] auto get_stop_requested() const -> bool { | ||||
|     return stop_requested_cb_(); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user