Removing pycrypto dependancy + python3 comp

Winter3un · Jul 27, 2018 · 0ffb335 · 0ffb335
1 parent 2aadd44
commit 0ffb335
Show file tree

Hide file tree

Showing 23 changed files with 1,065 additions and 118 deletions.
diff --git a/Linux/laZagne.py b/Linux/laZagne.py
@@ -42,7 +42,7 @@ def output():
 		if os.path.isdir(args['output']):
 			constant.folder_name = args['output']
 		else:
-			print '[!] Specify a directory, not a file !'
+			print('[!] Specify a directory, not a file !')
 
 	if args['write_normal']:
 		constant.output = 'txt'
@@ -82,12 +82,6 @@ def verbosity():
 	root.addHandler(stream)
 	del args['verbose']
 
-def manage_advanced_options():
-
-	# Jitsi advanced options
-	if 'master_pwd' in args:
-		constant.jitsi_masterpass = args['master_pwd']
-
 def launch_module(module):
 
 	modulesToLaunch = []
@@ -114,7 +108,7 @@ def launch_module(module):
 			yield True, i.capitalize(), pwdFound
 		except:
 			traceback.print_exc()
-			print
+			print()
 			error_message = traceback.format_exc()
 			yield False, i.capitalize(), error_message
 
@@ -215,7 +209,7 @@ def runLaZagne(category_choosed='all'):
 				parser_tab += categories[c]['subparser']
 		parser_tab += [PWrite]
 		dic_tmp = {c: {'parents': parser_tab, 'help':'Run %s module' % c, 'func': runModule}}
-		dic = dict(dic.items() + dic_tmp.items())
+		dic.update(dic_tmp)
 
 	#2- Main commands
 	subparsers = parser.add_subparsers(help='Choose a main command')
@@ -240,7 +234,6 @@ def runLaZagne(category_choosed='all'):
 	# Define constant variables
 	output()
 	verbosity()
-	manage_advanced_options()
 
 	start_time = time.time()
 

diff --git a/Linux/lazagne/config/constant.py b/Linux/lazagne/config/constant.py
@@ -12,7 +12,6 @@ class constant():
 	output 				= None
 	file_logger 		= None
 	verbose 			= False
-	jitsi_masterpass 	= None 		# Jitsi options
 	nbPasswordFound 	= 0 		# Total password found
 	passwordFound 		= []
 	finalResults 		= {}

diff --git a/Linux/lazagne/config/crypto/__init__.py b/Linux/lazagne/config/crypto/__init__.py