xeals/pack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed timing generation.

Browse Source
This commit is contained in:
iphelix 2013-07-27 23:30:41 -07:00
parent eb71ca4352
commit 32e92d10d3
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rulegen.py
View File

@ -807,12 +807,6 @@ class RuleGen:
hashcat_rule_str = " ".join(hashcat_rule + word["pre_rule"] or [':']) hashcat_rule_str = " ".join(hashcat_rule + word["pre_rule"] or [':'])
if self.verbose: print "[+] %s => %s => %s" % (word["suggestion"], hashcat_rule_str, password) if self.verbose: print "[+] %s => %s => %s" % (word["suggestion"], hashcat_rule_str, password)
# Obtain a lock and write to files.
#if self.hashcat:
# self.verify_hashcat_rules(word["suggestion"], hashcat_rule + word["pre_rule"], password)
#self.output_rules_f.write("%s\n" % hashcat_rule_str)
#self.output_words_f.write("%s\n" % word["suggestion"])
rules_queue.put(hashcat_rule_str) rules_queue.put(hashcat_rule_str)
@ -896,6 +890,7 @@ class RuleGen:
password_count = 0 password_count = 0
analysis_start = time.time() analysis_start = time.time()
segment_start = analysis_start
try: try:
for password in f: for password in f:
password = password.rstrip('\r\n') password = password.rstrip('\r\n')
@ -903,10 +898,12 @@ class RuleGen:
# Provide analysis time feedback to the user # Provide analysis time feedback to the user
if password_count != 0 and password_count % 5000 == 0: if password_count != 0 and password_count % 5000 == 0:
current_analysis_time = time.time() - analysis_start segment_time = time.time() - segment_start
if not self.quiet: if not self.quiet:
print "[*] Processed %d passwords in %.2f seconds at the rate of %.2f p/sec" % \ print "[*] Processed %d passwords in %.2f seconds at the rate of %.2f p/sec" % \
(password_count, current_analysis_time, password_count/current_analysis_time ) (password_count, segment_time, 5000/segment_time )
segment_start = time.time()
password_count += 1 password_count += 1
# Perform preliminary checks and add password to the queue # Perform preliminary checks and add password to the queue