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

PEP8

Browse source
This commit is contained in:
jsy 2016-01-11 23:27:21 +08:00
parent 7c8ecb811c
commit 614eed2bf0
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
shadowsocks/common.py
View file

@ -37,9 +37,11 @@ def sha1_hmac(secret, data):
def onetimeauth_verify(_hash, data, key): def onetimeauth_verify(_hash, data, key):
return _hash == sha1_hmac(key, data)[:ONETIMEAUTH_BYTES] return _hash == sha1_hmac(key, data)[:ONETIMEAUTH_BYTES]
def onetimeauth_gen(data, key): def onetimeauth_gen(data, key):
return sha1_hmac(key, data)[:ONETIMEAUTH_BYTES] return sha1_hmac(key, data)[:ONETIMEAUTH_BYTES]
def compat_ord(s): def compat_ord(s):
if type(s) == int: if type(s) == int:
return s return s

2
shadowsocks/udprelay.py
View file

@ -184,7 +184,7 @@ class UDPRelay(object):
logging.warn('UDP one time auth header is too short') logging.warn('UDP one time auth header is too short')
return return
_hash = data[-ONETIMEAUTH_BYTES:] _hash = data[-ONETIMEAUTH_BYTES:]
_data = data[header_length: -ONETIMEAUTH_BYTES] _data = data[header_length: -ONETIMEAUTH_BYTES]
_key = self._encryptor.decipher_iv + self._encryptor.key _key = self._encryptor.decipher_iv + self._encryptor.key
if onetimeauth_verify(_hash, _data, _key) is False: if onetimeauth_verify(_hash, _data, _key) is False:
logging.warn('UDP one time auth fail') logging.warn('UDP one time auth fail')