Long PW

Author: Brotcrunsher

.gitignore

@@ -269,3 +269,6 @@ ModelManifest.xml
 /BrotBoxEngine/GlobalKeyboardDLL/EmbeddedDlls.cpp
 /BrotBoxEngine/GlobalKeyboardDLL/EmbeddedDlls.h
 imgui.ini
+ExamplePaintColorHistory.dat
+ExamplePaintDigitHotkeys.dat
+ExamplePaintFavoriteColors.dat

Examples/ExampleMother/ExampleMother.cpp

@@ -618,6 +618,7 @@ class MyGame : public bbe::Game
 #endif
 
 	bool terriActive = false;
+	bool pwLongPassword = false;
 
 	bbe::TimePoint lastServerReach = bbe::TimePoint::epoch();
 	bool serverUnreachableSilenced = false;
@@ -3504,6 +3505,10 @@ class MyGame : public bbe::Game
 
 		ImGui::BeginDisabled(generating);
 		bool newHashRequested = false;
+		if (ImGui::Checkbox("Long password (32 chars)", &pwLongPassword))
+		{
+			newHashRequested = true;
+		}
 		if (ImGui::bbe::InputText("Master PW", masterPw, ImGuiInputTextFlags_EnterReturnsTrue | ImGuiInputTextFlags_Password))
 		{
 			newHashRequested = true;
@@ -3535,12 +3540,13 @@ class MyGame : public bbe::Game
 			bbe::String capturedNormServ = normServ;
 			bbe::String capturedNormUser = normUser;
 			bbe::List<bbe::String> capturedKnownHashes = passwordManager->knownHashes;
+			const bool capturedLongPassword = pwLongPassword;
 
 			pwGenExpectedHashes = capturedNormServ.isEmpty() ? 1 : 2;
 			pwGenStartTime = bbe::TimePoint();
 
 			pwGenFuture = std::async(std::launch::async,
-				[capturedMasterPw, capturedRepeat, capturedNormServ, capturedNormUser, capturedKnownHashes]() -> PwGenResult
+				[capturedMasterPw, capturedRepeat, capturedNormServ, capturedNormUser, capturedKnownHashes, capturedLongPassword]() -> PwGenResult
 				{
 					PwGenResult result;
 					result.masterPwHash = PasswordGenerator::generateHash(std::string(capturedMasterPw.getRaw())).c_str();
@@ -3554,7 +3560,7 @@ class MyGame : public bbe::Game
 						std::string hashableString = std::string(capturedMasterPw.getRaw()) + "|||" + capturedNormServ.getRaw();
 						if (!capturedNormUser.isEmpty())
 							hashableString += std::string("|||") + capturedNormUser.getRaw();
-						result.servicePw = PasswordGenerator::generateHash(hashableString).c_str();
+						result.servicePw = PasswordGenerator::generateHash(hashableString, capturedLongPassword ? 32 : 16).c_str();
 						result.hashCount = 2;
 
 						if (!isKnown)
@@ -4327,6 +4333,7 @@ int main(int argc, char **argv)
 	_CrtSetDbgFlag(_CRTDBG_CHECK_ALWAYS_DF); // See: https://stackoverflow.com/questions/30413066/how-do-i-diagnose-heap-corruption-errors-on-windows
 #else
 	(void)argc;
+	(void)argv;
 #endif
 	MyGame *mg = new MyGame();
 	mg->setMsaaSamples(0);

Examples/ExampleMother/PasswordGenerator.cpp

@@ -60,8 +60,14 @@ std::string PasswordGenerator::normalizeUser(const std::string &user)
 
 std::string PasswordGenerator::generateHash(const std::string &data)
 {
-	unsigned char hash[16] = {};
-	const int err = crypto_pwhash_argon2id(hash, sizeof(hash), data.c_str(), data.size(), (const unsigned char *)"BrotbEnginePWGv1", 5, static_cast<size_t>(256 * 1024 * 1024), crypto_pwhash_argon2id_ALG_ARGON2ID13);
+	return generateHash(data, 16);
+}
+
+std::string PasswordGenerator::generateHash(const std::string &data, size_t length)
+{
+	if (length == 0) length = 16;
+	std::vector<unsigned char> hash(length);
+	const int err = crypto_pwhash_argon2id(hash.data(), hash.size(), data.c_str(), data.size(), (const unsigned char *)"BrotbEnginePWGv1", 5, static_cast<size_t>(256 * 1024 * 1024), crypto_pwhash_argon2id_ALG_ARGON2ID13);
 	if (err != 0)
 	{
 		std::cerr << "FATAL: crypto_pwhash_argon2id failed." << std::endl;
@@ -73,7 +79,8 @@ std::string PasswordGenerator::generateHash(const std::string &data)
 	const std::string special = "!@#%*-_=+,.?";
 	const std::string all = lower + upper + digits + special;
 	std::string retVal;
-	for (size_t i = 0; i < sizeof(hash); i++)
+	retVal.reserve(hash.size());
+	for (size_t i = 0; i < hash.size(); i++)
 	{
 		const std::string *set = nullptr;
 		// The first char is always lower, second always upper and so on. This is a very simple way to ensure
@@ -95,11 +102,16 @@ std::string PasswordGenerator::generateHash(const std::string &data)
 }
 
 std::string PasswordGenerator::generateServicePassword(const std::string &masterPw, const std::string &service, const std::string &user)
+{
+	return generateServicePassword(masterPw, service, user, 16);
+}
+
+std::string PasswordGenerator::generateServicePassword(const std::string &masterPw, const std::string &service, const std::string &user, size_t length)
 {
 	std::string normServ = normalizeService(service);
 	std::string normUser = normalizeUser(user);
 	std::string hashableString = masterPw + "|||" + normServ;
 	if (!normUser.empty())
 		hashableString += "|||" + normUser;
-	return generateHash(hashableString);
+	return generateHash(hashableString, length);
 }

Examples/ExampleMother/PasswordGenerator.h

@@ -6,5 +6,7 @@ namespace PasswordGenerator
 	std::string normalizeService(const std::string &service);
 	std::string normalizeUser(const std::string &user);
 	std::string generateHash(const std::string &data);
+	std::string generateHash(const std::string &data, size_t length);
 	std::string generateServicePassword(const std::string &masterPw, const std::string &service, const std::string &user);
+	std::string generateServicePassword(const std::string &masterPw, const std::string &service, const std::string &user, size_t length);
 }

Examples/ExamplePasswordGenerator/ExamplePasswordGenerator.cpp

@@ -103,8 +103,35 @@ static bool setClipboard(const std::string &text)
 #endif
 }
 
-int main()
+static void printUsage(const char *exe)
 {
+	std::cout << "Usage: " << exe << " [--long-password]" << std::endl;
+	std::cout << "  --long-password   Generate 32 character password (default: 16)" << std::endl;
+}
+
+int main(int argc, char **argv)
+{
+	bool longPassword = false;
+	for (int i = 1; i < argc; i++)
+	{
+		const char *a = argv[i];
+		if (std::strcmp(a, "--long-password") == 0)
+		{
+			longPassword = true;
+		}
+		else if (std::strcmp(a, "--help") == 0 || std::strcmp(a, "-h") == 0)
+		{
+			printUsage(argv[0]);
+			return 0;
+		}
+		else
+		{
+			std::cerr << "Unknown argument: " << a << std::endl;
+			printUsage(argv[0]);
+			return 1;
+		}
+	}
+
 	std::string masterPw = readPassword("Master Password: ");
 	std::string masterPwRepeat = readPassword("Repeat Password: ");
 
@@ -124,7 +151,7 @@ int main()
 	}
 
 	std::cout << "Generating..." << std::flush;
-	std::string password = PasswordGenerator::generateServicePassword(masterPw, service, user);
+	std::string password = PasswordGenerator::generateServicePassword(masterPw, service, user, longPassword ? 32 : 16);
 	std::cout << " Done." << std::endl;
 
 	if (setClipboard(password))