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

fix key cache when just method changes

Browse source
This commit is contained in:
clowwindy 2014-12-11 23:44:42 +08:00
parent cbbc880f44
commit 676bf9617b
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
shadowsocks/encrypt.py
View file

@ -62,7 +62,8 @@ def EVP_BytesToKey(password, key_len, iv_len):
# so that we make the same key and iv as nodejs version # so that we make the same key and iv as nodejs version
if hasattr(password, 'encode'): if hasattr(password, 'encode'):
password = password.encode('utf-8') password = password.encode('utf-8')
r = cached_keys.get(password, None) cached_key = '%s-%d-%d' % (password, key_len, iv_len)
r = cached_keys.get(cached_key, None)
if r: if r:
return r return r
m = [] m = []
@ -78,7 +79,7 @@ def EVP_BytesToKey(password, key_len, iv_len):
ms = b''.join(m) ms = b''.join(m)
key = ms[:key_len] key = ms[:key_len]
iv = ms[key_len:key_len + iv_len] iv = ms[key_len:key_len + iv_len]
cached_keys[password] = (key, iv) cached_keys[cached_key] = (key, iv)
return key, iv return key, iv
@ -198,5 +199,5 @@ def test_encrypt_all():
if __name__ == '__main__': if __name__ == '__main__':
test_encrypt_all() #test_encrypt_all()
test_encryptor() test_encryptor()