AaronFiore/docker-finance
1
0
Fork 0
forked from EvergreenCrypto/docker-finance
Code Activity

root: macro: crypto: namespace refactor into common

Browse Source
This commit is contained in:
Aaron Fiore
2024-07-20 22:16:54 -07:00
parent c3aee1dee8
commit 5c47cee552
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
container/src/root/macro/common/crypto.hh
View File

@@ -37,8 +37,12 @@ namespace docker_finance
//! \since docker-finance 1.0.0
namespace macro
{
//! \namespace docker_finance::macro::crypto::botan
//! \namespace docker_finance::macro::common
//! \brief Shared ROOT macro-related functionality
//! \since docker-finance 1.0.0
namespace common
{
//! \namespace docker_finance::macro::common::crypto::botan
//! \since docker-finance 1.0.0
namespace crypto::botan
{
@@ -51,7 +55,7 @@ auto g_Hash = std::make_unique<::docker_finance::crypto::botan::Hash>();
auto g_Random = std::make_unique<::docker_finance::crypto::botan::Random>();
} // namespace crypto::botan
//! \namespace docker_finance::macro::crypto::cryptopp
//! \namespace docker_finance::macro::common::crypto::cryptopp
//! \since docker-finance 1.0.0
namespace crypto::cryptopp
{
@@ -64,7 +68,7 @@ auto g_Hash = std::make_unique<::docker_finance::crypto::cryptopp::Hash>();
auto g_Random = std::make_unique<::docker_finance::crypto::cryptopp::Random>();
} // namespace crypto::cryptopp
//! \namespace docker_finance::macro::crypto::libsodium
//! \namespace docker_finance::macro::common::crypto::libsodium
//! \since docker-finance 1.0.0
namespace crypto::libsodium
{
@@ -77,6 +81,7 @@ auto g_Hash = std::make_unique<::docker_finance::crypto::libsodium::Hash>();
auto g_Random = std::make_unique<::docker_finance::crypto::libsodium::Random>();
} // namespace crypto::libsodium
} // namespace common
} // namespace macro
} // namespace docker_finance

10
container/src/root/macro/web/internal/crypto.C
View File

@@ -344,20 +344,22 @@ class Random final
});
namespace common = ::docker_finance::macro::common;
const std::string timestamp{common::make_timestamp()};
data.title = "Botan_RNG_" + timestamp;
random(
data, []() -> uint32_t { return crypto::botan::g_Random->generate(); });
random(data, []() -> uint32_t {
return common::crypto::botan::g_Random->generate();
});
data.title = "Crypto++_RNG_" + timestamp;
random(data, []() -> uint32_t {
return crypto::cryptopp::g_Random->generate();
return common::crypto::cryptopp::g_Random->generate();
});
data.title = "libsodium_RNG_" + timestamp;
random(data, []() -> uint32_t {
return crypto::libsodium::g_Random->generate();
return common::crypto::libsodium::g_Random->generate();
});
// TODO(unassigned): when clicking reload to create another sample, it doesn't do a clean refresh of the canvas