Use sha256 and std::string instead of BinaryToHex, hopefully will fix…

… weird client side hashing errors
jameskr97 · Jul 22, 2018 · 98070cc · 98070cc
1 parent 5def426
commit 98070cc
Show file tree

Hide file tree

Showing 3 changed files with 385 additions and 2 deletions.
diff --git a/src/CMakeData-globals.cmake b/src/CMakeData-globals.cmake
@@ -14,6 +14,7 @@ list(APPEND SMDATA_GLOBAL_FILES_HPP
   "SpecialFiles.h"
   "StdString.h" # TODO: Remove the need for this file, transition to std::string.
   "StepMania.h" # TODO: Refactor into separate main project.
+  "picosha2.h"
 )
 
 source_group("Global Files" FILES ${SMDATA_GLOBAL_FILES_SRC} ${SMDATA_GLOBAL_FILES_HPP})
diff --git a/src/HighScore.cpp b/src/HighScore.cpp
@@ -3,6 +3,7 @@
 #include "Foreach.h"
 #include "GameConstantsAndTypes.h"
 #include "HighScore.h"
+#include "picosha2.h"
 #include "PlayerNumber.h"
 #include "ProfileManager.h"
 #include "RadarValues.h"
@@ -846,7 +847,7 @@ bool HighScore::IsEmpty() const
 }
 
 string HighScore::GenerateValidationKeys() {
-	string key = "";
+	std::string key = "";
 
 	FOREACH_ENUM(TapNoteScore, tns) {
 
@@ -878,7 +879,11 @@ string HighScore::GenerateValidationKeys() {
 	key.append(to_string(static_cast<int>(GetEtternaValid())));
 	key.append(GradeToString(GetWifeGrade()));
 
-	SetValidationKey(ValidationKey_Brittle, BinaryToHex(CryptManager::GetSHA1ForString(key)));
+	std::string hash_hex_str;
+
+	picosha2::hash256_hex_string(key, hash_hex_str);
+
+	SetValidationKey(ValidationKey_Brittle, hash_hex_str);
 
 	// just testing stuff
 	//hs.SetValidationKey(ValidationKey_Weak, GenerateWeakValidationKey(m_iTapNoteScores, m_iHoldNoteScores));