Merge lp:~forsslundsystems/forssim/newhashOpenSSL into lp:forssim

[parhe]

[parhe (par-hellstrom)]

Removed the home made hash and replaced it with the standard openSSL library routines.
Now user name and password are concatenated and then hashed the resulting hash hex string are then used as user name and password for the database. Proper updates has been made of the web implementation.

=== modified file 'FsWisdom/ApplicationNode.cpp'
--- FsWisdom/ApplicationNode.cpp	2009-07-10 08:58:08 +0000
+++ FsWisdom/ApplicationNode.cpp	2009-07-13 16:14:21 +0000
@@ -209,23 +209,27 @@
 	selectCaseWindow->close();
 }
 
-int ApplicationNode::hashUsername(QString original)
+QString ApplicationNode::hashUsername(QString original)
 {
-	string cr = original.toStdString();
-	int b    = 378551; //Random Ranges I've chosen (can be modified)
-	int a    = 63689;
-	int hash = 0;  //Output hash
-	int i;  //Temp number that scrolls through the string array
-
-	for(i = 0; i < cr.length(); i++) //Loop to convert each character
-	{
-		hash = hash * a + cr[i];  //Algorithm that hashs
-		a    = a * b;
-	}
-
-	return (hash & 0x7FFFFFFF); //Returns the hashed string
+      string cr;
+
+	  cr = original.toStdString();
+
+	  unsigned char buf[MD5_DIGEST_LENGTH];
+
+	  MD5((unsigned char *)cr.c_str(), cr.length(), buf);
+
+	  std::ostringstream stm;
+
+	  for (int i=0;i<MD5_DIGEST_LENGTH;i++)
+		  stm << hex << setfill('0') << setw(2) << nouppercase << (unsigned short)buf[i];
+
+
+	 return QString::fromStdString(stm.str());
 }
 
+
+
 void ApplicationNode::RegisterUser(QString username, QString password)
 {
 	this->setOverrideCursor(QCursor(Qt::WaitCursor));
@@ -234,10 +238,12 @@
 	this->password = password;
 
 	cout << "username: " << username.toStdString() << endl;
-	int temp = hashUsername(username);
-	QString hashUsername = QString::number(temp,10);
-	hashUsername.insert(0,"u");
+	QString temp = hashUsername(username+password);
+	QString hashUsername = temp.left(16);
+	QString hashPassword = temp.right(16);
+
 	cout << "Hashed Username: " << hashUsername.toStdString() << endl;
+	cout << "Hashed password: " << hashPassword.toStdString() << endl;
 
 	/* Maybe need to connect to database and make a query instead. It could be other problems than
 	 * incorrect user name and password.
@@ -245,7 +251,7 @@
 	forsDatabase.setHostName(databaseIP);
 	forsDatabase.setDatabaseName(databaseName);
 	forsDatabase.setUserName(hashUsername);
-	forsDatabase.setPassword(password);
+	forsDatabase.setPassword(hashPassword);
 	if(!forsDatabase.open())
 	{
 		throw ApplicationNodeException("Please check username and password.");

=== modified file 'FsWisdom/ApplicationNode.h'
--- FsWisdom/ApplicationNode.h	2009-07-07 16:00:07 +0000
+++ FsWisdom/ApplicationNode.h	2009-07-13 16:14:21 +0000
@@ -37,6 +37,14 @@
 
 #include <stdexcept>
 #include <time.h>
+#include <openssl/md5.h>
+#include <iostream>
+#include <string.h>
+#include <stdlib.h>
+#include <iomanip>
+#include <ios>
+#include <sstream>
+
 
 
 #include "../src/VolumeModel.h"
@@ -88,7 +96,7 @@
 	 * MySQL can only handle 16 character username. Therefore we generate a hashed
 	 * username from user-email to be used in mySQL.
 	 */
-	int hashUsername(QString cr);
+	QString hashUsername(QString original);
 
 	/**
 	 * Registers a User. This involves creating their logging directory if it doesn't already exist.