cf changelog v0.7

H1d3r · May 29, 2015 · e444550 · e444550
1 parent b2c7473
commit e444550
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 11 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,10 @@
+LaZagne 0.7 (29/05/2015)
+- For Windows / Linux 
+	* Fix mozilla bug (special characters were not printed)
+
 LaZagne 0.6 (26/05/2015)
 - For Windows / Linux 
-	* Firefox / Thunderbird: No more dependency with nss library (many thanks to Laurent for his technic: https://github.com/lclevy/firepwd)
+	* Firefox / Thunderbird: No more dependency with nss library (many thanks to Laurent Clevy for its awesome technic: https://github.com/lclevy/firepwd)
 	* Fix opera bug
 
 - Only Windows

diff --git a/Linux/src/config/constant.py b/Linux/src/config/constant.py
@@ -2,7 +2,7 @@
 class constant():
 	folder_name = 'results'
 	MAX_HELP_POSITION = 27
-	CURRENT_VERSION = 0.6
+	CURRENT_VERSION = 0.7
 	output = None
 	file_logger = None
 	verbose = False

diff --git a/Linux/src/softwares/browsers/mozilla.py b/Linux/src/softwares/browsers/mozilla.py
@@ -503,15 +503,26 @@ def run(self):
 						loginASN1 = decoder.decode(b64decode(user))
 						iv = loginASN1[0][1][1].asOctets()
 						ciphertext = loginASN1[0][2].asOctets()
-						login = re.sub( r'[^\\x\w]', '', DES3.new( key, DES3.MODE_CBC, iv).decrypt(ciphertext) )
-						values["Username"] = login
+						login = DES3.new( key, DES3.MODE_CBC, iv).decrypt(ciphertext)
+						# remove bad character at the end
+						try:
+							nb = unpack('B', login[-1])[0]
+							values["Username"] = login[:-nb]
+						except:
+							values["Username"] = login
+
 
 						# Password
 						passwdASN1 = decoder.decode(b64decode(passw))
 						iv = passwdASN1[0][1][1].asOctets()
 						ciphertext = passwdASN1[0][2].asOctets()
-						password = re.sub( r'[^\\x\w]', '', DES3.new( key, DES3.MODE_CBC, iv).decrypt(ciphertext) )
-						values["Password"] =  password
+						password = DES3.new( key, DES3.MODE_CBC, iv).decrypt(ciphertext)
+						# remove bad character at the end
+						try:
+							nb = unpack('B', password[-1])[0]
+							values["Password"] =  password[:-nb]
+						except:
+							values["Password"] =  password
 
 						if len(values):
 							pwdFound.append(values)

diff --git a/Linux/standalone/32bits/LaZagne-32bits b/Linux/standalone/32bits/LaZagne-32bits
diff --git a/Linux/standalone/64bits/LaZagne-64bits b/Linux/standalone/64bits/LaZagne-64bits
diff --git a/Windows/src/LaZagne/config/constant.py b/Windows/src/LaZagne/config/constant.py
@@ -2,7 +2,7 @@
 class constant():
 	folder_name = 'results'
 	MAX_HELP_POSITION = 27
-	CURRENT_VERSION = 0.6
+	CURRENT_VERSION = 0.7
 	output = None 
 	file_logger = None 
 

diff --git a/Windows/src/LaZagne/softwares/browsers/mozilla.py b/Windows/src/LaZagne/softwares/browsers/mozilla.py
@@ -507,15 +507,26 @@ def run(self):
 						loginASN1 = decoder.decode(b64decode(user))
 						iv = loginASN1[0][1][1].asOctets()
 						ciphertext = loginASN1[0][2].asOctets()
-						login = re.sub( r'[^\\x\w]', '', DES3.new( key, DES3.MODE_CBC, iv).decrypt(ciphertext) )
-						values["Username"] = login
+						login = DES3.new( key, DES3.MODE_CBC, iv).decrypt(ciphertext)
+						# remove bad character at the end
+						try:
+							nb = unpack('B', login[-1])[0]
+							values["Username"] = login[:-nb]
+						except:
+							values["Username"] = login
 
 						# Password
 						passwdASN1 = decoder.decode(b64decode(passw))
 						iv = passwdASN1[0][1][1].asOctets()
 						ciphertext = passwdASN1[0][2].asOctets()
-						password = re.sub( r'[^\\x\w]', '', DES3.new( key, DES3.MODE_CBC, iv).decrypt(ciphertext) )
-						values["Password"] =  password
+						password = DES3.new( key, DES3.MODE_CBC, iv).decrypt(ciphertext)
+						# remove bad character at the end
+						try:
+							nb = unpack('B', password[-1])[0]
+							values["Password"] =  password[:-nb]
+						except:
+							values["Password"] =  password
+
 
 						if len(values):
 							pwdFound.append(values)

diff --git a/Windows/standalone/laZagne.exe b/Windows/standalone/laZagne.exe