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

PEP8 and undefined name 'gen_key_iv'

Browse source
This commit is contained in:
mengskysama 2016-01-12 12:17:46 +08:00
parent f163a7b094
commit 811a0e6eb8
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
shadowsocks/udprelay.py
View file

@ -164,7 +164,9 @@ class UDPRelay(object):
else: else:
data = data[3:] data = data[3:]
else: else:
data, key, iv = encrypt.dencrypt_all(self._password, self._method, data) data, key, iv = encrypt.dencrypt_all(self._password,
self._method,
data)
# decrypt data # decrypt data
if not data: if not data:
logging.debug( logging.debug(
@ -221,11 +223,11 @@ class UDPRelay(object):
self._eventloop.add(client, eventloop.POLL_IN, self) self._eventloop.add(client, eventloop.POLL_IN, self)
if self._is_local: if self._is_local:
key, iv, m = gen_key_iv(self._password, self._method) key, iv, m = encrypt.gen_key_iv(self._password, self._method)
# spec https://shadowsocks.org/en/spec/one-time-auth.html # spec https://shadowsocks.org/en/spec/one-time-auth.html
if self._one_time_auth_enable: if self._one_time_auth_enable:
data = self._ota_chunk_data_gen(key, iv, data) data = self._ota_chunk_data_gen(key, iv, data)
data = encrypt.encrypt_all_m(key, iv, m, method, data) data = encrypt.encrypt_all_m(key, iv, m, self._method, data)
if not data: if not data:
return return
else: else: