Core/Crypto: Rename our Argon2 to avoid possible conflict with library file on some configurations

3 files changed, 2 insertions, 2 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
diff --git a/src/server/shared/Secrets/SecretMgr.cpp b/src/server/shared/Secrets/SecretMgr.cpp
index 81bc2c1c392..a4d487b3401 100644
--- a/src/server/shared/Secrets/SecretMgr.cpp
+++ b/src/server/shared/Secrets/SecretMgr.cpp
@@ -17,7 +17,7 @@
 
 #include "SecretMgr.h"
 #include "AES.h"
-#include "Argon2.h"
+#include "Argon2Hash.h"
 #include "Config.h"
 #include "CryptoGenerics.h"
 #include "DatabaseEnv.h"