From e30c7f4cdce64fbadba295a059037481c8736ffb Mon Sep 17 00:00:00 2001
From: fabiobento512 <fbgithub001@gmail.com>
Date: Sun, 4 Mar 2018 15:52:31 +0000
Subject: [PATCH] updated readme, fixed possible system implementation of
 passwords obfuscation (you may need to re-enter your project passwords)

---
 readme.txt       |  7 ++++---
 utilfrequest.cpp | 10 ++++++++--
 utilfrequest.h   |  1 +
 utilglobalvars.h |  2 +-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/readme.txt b/readme.txt
index d7a64b5..2ca2594 100644
--- a/readme.txt
+++ b/readme.txt
@@ -54,10 +54,11 @@ https://github.com/fabiobento512/FRequest
 ----------------------------------
 Change Log:
 ----------------------------------
-1.1b, 03-02-2018
-- Added dark theme 
-- Some changes on design and code to accommodate the new dark theme (thanks Jorgen-VikingGod!)
+1.1b, 04-03-2018
+- Added dark theme (thanks Jorgen-VikingGod!)
 - Added a clear button for the filter text box
+- Fixed possible system implementation of passwords obfuscation (you may need to re-enter your project passwords)
+- Some code refactoring (using now override C++ keyword for instance)
 ----------------------------------
 1.1a, 03-02-2018
 - Added rename request / project to requests tree context menu (thanks pingzing!)
diff --git a/utilfrequest.cpp b/utilfrequest.cpp
index 27d8bca..fc5f7e4 100755
--- a/utilfrequest.cpp
+++ b/utilfrequest.cpp
@@ -299,8 +299,14 @@ QByteArray simpleStringObfuscationDeobfuscation(const QString& ofuscationSalt, c
 	QByteArray saltByteArray = ofuscationSalt.toUtf8();
     QByteArray inputByteArray = input.toUtf8();
 
-    for(int i=0; i<inputByteArray.size(); i++){
-        inputByteArray[i] = inputByteArray[i] ^ (i < (saltByteArray.size()) ? saltByteArray[i] : i);
+    // Using unsigned types as they have a defined truncation in iso c++:
+    // https://stackoverflow.com/a/34886065
+    // (so the static_cast<unsigned char> below works the same in all different systems)
+    uint32_t saltByteArraySize = static_cast<uint32_t>(saltByteArray.size());
+    uint32_t inputByteArraySize = static_cast<uint32_t>(inputByteArray.size());
+
+    for(uint32_t i=0; i< inputByteArraySize; i++){
+        inputByteArray[i] = inputByteArray[i] ^ (i < saltByteArraySize ? saltByteArray[i] : static_cast<unsigned char>(i));
     }
 
     return inputByteArray;
diff --git a/utilfrequest.h b/utilfrequest.h
index 7f09d88..53e398f 100755
--- a/utilfrequest.h
+++ b/utilfrequest.h
@@ -28,6 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <plog/Converters/NativeEOLConverter.h>
 #include <pugixml/pugixml.hpp>
 #include <cpp17optional/optional.hpp>
+#include <cstdint>
 
 #include <QComboBox>
 #include <QDateTime>
diff --git a/utilglobalvars.h b/utilglobalvars.h
index 36f3b8f..2d71f1c 100755
--- a/utilglobalvars.h
+++ b/utilglobalvars.h
@@ -23,7 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 namespace GlobalVars{
 
 static const QString AppName = "FRequest";
-static const QString AppVersion = "1.1b (Development)";
+static const QString AppVersion = "1.1b";
 static const QString LastCompatibleVersionConfig = "1.1b";
 static const QString LastCompatibleVersionProjects= "1.1";
 static const QString AppConfigFileName = AppName + ".cfg";