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

Correct spelling. (#755)

Browse source 
thx
This commit is contained in:
ImPerat0R_ 2017-02-28 22:19:36 +08:00 • committed by mengskysama
parent 8ac72b0b25
commit fe13c20dc1
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
shadowsocks/encrypt.py
View file

@ -153,7 +153,7 @@ def encrypt_all_m(key, iv, m, method, data):
return b''.join(result) return b''.join(result)
def dencrypt_all(password, method, data): def decrypt_all(password, method, data):
result = [] result = []
method = method.lower() method = method.lower()
(key_len, iv_len, m) = method_supported[method] (key_len, iv_len, m) = method_supported[method]
@ -228,7 +228,7 @@ def test_encrypt_all_m():
logging.warn(method) logging.warn(method)
key, iv, m = gen_key_iv(b'key', method) key, iv, m = gen_key_iv(b'key', method)
cipher = encrypt_all_m(key, iv, m, method, plain) cipher = encrypt_all_m(key, iv, m, method, plain)
plain2, key, iv = dencrypt_all(b'key', method, cipher) plain2, key, iv = decrypt_all(b'key', method, cipher)
assert plain == plain2 assert plain == plain2

6
shadowsocks/udprelay.py
View file

@ -158,9 +158,9 @@ class UDPRelay(object):
else: else:
data = data[3:] data = data[3:]
else: else:
data, key, iv = encrypt.dencrypt_all(self._password, data, key, iv = encrypt.decrypt_all(self._password,
self._method, self._method,
data) data)
# decrypt data # decrypt data
if not data: if not data:
logging.debug( logging.debug(