diff options
| author | Shauren <shauren.trinity@gmail.com> | 2024-06-02 00:18:33 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2025-04-13 18:18:15 +0200 |
| commit | 9d945f0db0265b00bc6e28bcffd4ab5440d3a99b (patch) | |
| tree | 6509c503c067a9a6421cec1f0c127693c93cefe3 /src/common | |
| parent | 857d0b2c273923c5a0236c5d36c80ab4a16fdb42 (diff) | |
Core/Crypto: Rename our Argon2 to avoid possible conflict with library file on some configurations
(cherry picked from commit 4f6b49cccf87638864a636989a41f9ca7eb7a89c)
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/Cryptography/Argon2Hash.cpp (renamed from src/common/Cryptography/Argon2.cpp) | 2 | ||||
| -rw-r--r-- | src/common/Cryptography/Argon2Hash.h (renamed from src/common/Cryptography/Argon2.h) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/common/Cryptography/Argon2.cpp b/src/common/Cryptography/Argon2Hash.cpp index 225d92c3994..3113ea39108 100644 --- a/src/common/Cryptography/Argon2.cpp +++ b/src/common/Cryptography/Argon2Hash.cpp @@ -15,7 +15,7 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "Argon2.h" +#include "Argon2Hash.h" #include <argon2/argon2.h> /*static*/ Optional<std::string> Trinity::Crypto::Argon2::Hash(std::string const& password, BigNumber const& salt, uint32 nIterations, uint32 kibMemoryCost) diff --git a/src/common/Cryptography/Argon2.h b/src/common/Cryptography/Argon2Hash.h index 2c1d44d10d7..2c1d44d10d7 100644 --- a/src/common/Cryptography/Argon2.h +++ b/src/common/Cryptography/Argon2Hash.h |