Merge pull request #1362 from csoler/v0.6-ImprovedGUI

V0.6 improved gui

libretroshare/src/pqi/p3cfgmgr.cc

@@ -299,27 +299,38 @@ bool p3Config::loadAttempt(const std::string& cfgFname,const std::string& signFn
 	/* set hash */
 	setHash(bio->gethash());
 
+    // In order to check the signature that is stored on disk, we compute the hash of the current data (which should match the hash of the data on disc because we just read it),
+    // and validate the signature from the disk on this data. The config file data is therefore hashed twice. Not a security issue, but
+    // this is a bit inelegant.
+
 	std::string signatureRead;
 	RsFileHash strHash(Hash());
-	AuthSSL::getAuthSSL()->SignData(strHash.toByteArray(), RsFileHash::SIZE_IN_BYTES, signatureRead);
 
-	BinMemInterface *signbio = new BinMemInterface(signatureRead.size(), BIN_FLAGS_READABLE);
+	BinFileInterface bfi(signFname.c_str(), BIN_FLAGS_READABLE);
 
-	if(!signbio->readfromfile(signFname.c_str()))
+    if(bfi.getFileSize() == 0)
-	{
+        return false ;
-		delete signbio;
+
+    RsTemporaryMemory mem(bfi.getFileSize()) ;
+
+    if(!bfi.readdata(mem,mem.size()))
 		return false;
+
+    // signature is stored as ascii so we need to convert it back to binary
+
+    RsTemporaryMemory mem2(bfi.getFileSize()/2) ;
+
+    if(!RsUtil::HexToBin(std::string((char*)(unsigned char*)mem,mem.size()),mem2,mem2.size()))
+    {
+        std::cerr << "Input string is not a Hex string!!"<< std::endl;
+        return false ;
 	}
 
-	std::string signatureStored((char *) signbio->memptr(), signbio->memsize());
+	bool signature_checks = AuthSSL::getAuthSSL()->VerifyOwnSignBin(strHash.toByteArray(), RsFileHash::SIZE_IN_BYTES,mem2,mem2.size());
 
-	delete signbio;
+    std::cerr << "(II) checked signature of config file " << cfgFname << ": " << (signature_checks?"OK":"Wrong!") << std::endl;
 
-	if(signatureRead != signatureStored)
+    return signature_checks;
-		return false;
-
-    std::cerr << "(II) Loaded configuration file " << cfgFname << std::endl;
-	return true;
 }
 
 bool p3Config::saveConfiguration()

libretroshare/src/pqi/pqibin.h

@@ -69,7 +69,6 @@ virtual bool    bandwidthLimited() { return false; }
 virtual RsFileHash gethash();
 virtual uint64_t bytecount();
 
-protected:
 	virtual uint64_t getFileSize();
 
 private:

libretroshare/src/util/rsprint.cc

@@ -104,6 +104,33 @@ std::string RsUtil::HashId(const std::string &id, bool reverse)
 	return hash;
 }
 
+static int toHalfByte(char u,bool& ok)
+{
+    if(u >= 'a' && u <= 'f') return u-'a' + 0xa;
+    if(u >= 'A' && u <= 'F') return u-'A' + 0xa;
+    if(u >= '0' && u <= '9') return u-'0' + 0x0;
+
+    ok = false ;
+
+    return 0;
+}
+
+bool RsUtil::HexToBin(const std::string& input,unsigned char *data, const uint32_t len)
+{
+	if(input.size() & 1)
+		return false ;
+
+	if(len != input.size()/2)
+		return false ;
+
+	bool ok = true ;
+
+	for(uint32_t i=0;(i<len) && ok;++i)
+		data[i] = (toHalfByte(input[2*i],ok) << 4) + (toHalfByte(input[2*i+1],ok));
+
+	return ok;
+}
+
 //static double getCurrentTS()
 //{
 //#ifndef WINDOWS_SYS

libretroshare/src/util/rsprint.h

@@ -34,6 +34,7 @@ std::string BinToHex(const char *arr, const uint32_t len);
 // proxy function. When max_len>0 and len>max_len, only the first "max_len" bytes are writen to the string and "..." is happened.
 
 std::string BinToHex(const unsigned char *arr, const uint32_t len, uint32_t max_len=0);
+bool HexToBin(const std::string& input,unsigned char *data, const uint32_t len);
 std::string NumberToString(uint64_t n, bool hex=false);
 std::string HashId(const std::string &id, bool reverse = false);
 std::vector<uint8_t> BinToSha256(const std::vector<uint8_t> &in);