dnrops
/
peda
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mixed the default charset

This commit is contained in:
Dang Hoang Vu 2013-05-31 12:29:00 +02:00
parent a4ec2ba5df
commit 012e52a247
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/utils.py
View File

@ -527,13 +527,22 @@ def cyclic_pattern_charset(charset_type=None):
charset_type = config.Option.get("pattern")
if charset_type == 1: # extended type
charset[1] = "%$-" + charset[1]
charset[2] = "sn();" + charset[2]
charset[1] = "%$-;" + charset[1]
charset[2] = "sn()" + charset[2]
if charset_type == 2: # maximum type
charset += ['!"#$%&\()*+,-./:;<=>?@[\\]^_{|}~'] # string.punctuation
return charset
mixed_charset = mixed = ''
k = 0
while True:
for i in range(0, len(charset)): mixed += charset[i][k:k+1]
if not mixed: break
mixed_charset += mixed
mixed = ''
k+=1
return mixed_charset
def de_bruijn(charset, n, maxlen):
"""
@ -581,7 +590,7 @@ def cyclic_pattern(size=None, start=None, charset_type=None):
"""
charset = config.Option.get("p_charset")
if not charset:
charset = ''.join(cyclic_pattern_charset(charset))
charset = cyclic_pattern_charset(charset)
else:
charset = ''.join(set(charset))