vbatts/shadowsocks
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #208 from felixonmars/table-py3

Browse source 
encrypt.py: port table to support python 3 (recreated)
This commit is contained in:
clowwindy 2014-11-05 17:15:43 +08:00
commit 2519fb9abe
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
shadowsocks/encrypt.py
View file

@ -65,9 +65,10 @@ def get_table(key):
m.update(key) m.update(key)
s = m.digest() s = m.digest()
(a, b) = struct.unpack('<QQ', s) (a, b) = struct.unpack('<QQ', s)
table = [c for c in maketrans(b'', b'')] table = maketrans(b'', b'')
table = [table[i: i + 1] for i in range(len(table))]
for i in range(1, 1024): for i in range(1, 1024):
table.sort(lambda x, y: int(a % (ord(x) + i) - a % (ord(y) + i))) table.sort(key=lambda x: int(a % (ord(x) + i)))
return table return table
@ -75,11 +76,11 @@ def init_table(key, method=None):
if method is not None and method == 'table': if method is not None and method == 'table':
method = None method = None
if not method: if not method:
if key in cached_tables: if key not in cached_tables:
return cached_tables[key] encrypt_table = b''.join(get_table(key))
encrypt_table = b''.join(get_table(key)) decrypt_table = maketrans(encrypt_table, maketrans(b'', b''))
decrypt_table = maketrans(encrypt_table, maketrans(b'', b'')) cached_tables[key] = [encrypt_table, decrypt_table]
cached_tables[key] = [encrypt_table, decrypt_table] return cached_tables[key]
else: else:
Encryptor(key, method) # test if the settings if OK Encryptor(key, method) # test if the settings if OK
@ -112,8 +113,6 @@ def EVP_BytesToKey(password, key_len, iv_len):
class Encryptor(object): class Encryptor(object):
def __init__(self, key, method=None): def __init__(self, key, method=None):
if method == b'table': if method == b'table':
if bytes != str:
raise Exception('table is not supported on Python 3')
method = None method = None
self.key = key self.key = key
self.method = method self.method = method