BlockStorage/repertory
1
0
Fork 0
Code Issues 8 Pull Requests Releases 6 Wiki Activity

refactor

Browse Source
This commit is contained in:
Scott E. Graves 2024-08-02 09:50:53 -05:00
parent 9f76f20ea8
commit 4015c1bb6e
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
repertory/librepertory/include/utils/encryption.hpp
View File

@ -68,7 +68,9 @@ decrypt_data(const key_type &key, const unsigned char *buffer,
template <typename buffer, typename result> template <typename buffer, typename result>
[[nodiscard]] inline auto decrypt_data(const key_type &key, const buffer &buf, [[nodiscard]] inline auto decrypt_data(const key_type &key, const buffer &buf,
result &res) -> bool { result &res) -> bool {
return decrypt_data<result>(key, buf.data(), buf.size(), res); return decrypt_data<result>(
key, reinterpret_cast<const unsigned char *>(buf.data()), buf.size(),
res);
} }
template <typename buffer, typename result> template <typename buffer, typename result>
@ -134,13 +136,15 @@ inline void encrypt_data(std::string_view encryption_token,
template <typename buffer, typename result> template <typename buffer, typename result>
inline void encrypt_data(std::string_view encryption_token, const buffer &buf, inline void encrypt_data(std::string_view encryption_token, const buffer &buf,
result &res) { result &res) {
encrypt_data<result>(generate_key(encryption_token), buf.data(), buf.size(), encrypt_data<result>(generate_key(encryption_token),
res); reinterpret_cast<const unsigned char *>(buf.data()),
buf.size(), res);
} }
template <typename buffer, typename result> template <typename buffer, typename result>
inline void encrypt_data(const key_type &key, const buffer &buf, result &res) { inline void encrypt_data(const key_type &key, const buffer &buf, result &res) {
encrypt_data<result>(key, buf.data(), buf.size(), res); encrypt_data<result>(key, reinterpret_cast<const unsigned char *>(buf.data()),
buf.size(), res);
} }
template <typename buffer, typename result> template <typename buffer, typename result>
@ -148,7 +152,9 @@ inline void
encrypt_data(const std::array<unsigned char, encrypt_data(const std::array<unsigned char,
crypto_aead_xchacha20poly1305_IETF_NPUBBYTES> &iv, crypto_aead_xchacha20poly1305_IETF_NPUBBYTES> &iv,
const key_type &key, const buffer &buf, result &res) { const key_type &key, const buffer &buf, result &res) {
encrypt_data<result>(iv, key, buf.data(), buf.size(), res); encrypt_data<result>(iv, key,
reinterpret_cast<const unsigned char *>(buf.data()),
buf.size(), res);
} }
} // namespace repertory::utils::encryption } // namespace repertory::utils::encryption

3
repertory/repertory_test/src/encrypting_reader_test.cpp
View File

@ -189,7 +189,8 @@ TEST(encrypting_reader, file_data_as_stream) {
for (std::uint8_t j = 0U; j < 2U; j++) { for (std::uint8_t j = 0U; j < 2U; j++) {
EXPECT_FALSE( EXPECT_FALSE(
io_stream io_stream
->read(&buffer[(buffer.size() / 2U) * j], ->read(
reinterpret_cast<char *>(&buffer[(buffer.size() / 2U) * j]),
static_cast<std::streamsize>(buffer.size()) / 2U) static_cast<std::streamsize>(buffer.size()) / 2U)
.fail()); .fail());
EXPECT_TRUE(io_stream->good()); EXPECT_TRUE(io_stream->good());