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

fix auth_aes128_* client side

Browse source
This commit is contained in:
破娃酱 2017-01-11 14:43:24 +08:00
parent 278ce30c66
commit 588d8ad8b3
1 changed files with 22 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

28
shadowsocks/obfsplugin/auth.py
View file

@ -1222,9 +1222,16 @@ class auth_aes128_sha1(auth_base):
data = data + struct.pack('<H', data_len) + struct.pack('<H', rnd_len) data = data + struct.pack('<H', data_len) + struct.pack('<H', rnd_len)
mac_key = self.server_info.iv + self.server_info.key mac_key = self.server_info.iv + self.server_info.key
uid = os.urandom(4) uid = os.urandom(4)
#if self.user_key: uid = self.uid else: if b':' in to_bytes(self.server_info.protocol_param):
self.user_key = self.server_info.key try:
encryptor = encrypt.Encryptor(to_bytes(base64.b64encode(self.server_info.key)) + self.salt, 'aes-128-cbc', b'\x00' * 16) items = to_bytes(self.server_info.protocol_param).split(':')
self.user_key = self.hashfunc(items[1]).digest()
uid = struct.pack('<I', int(items[0]))
except:
pass
if self.user_key is None:
self.user_key = self.server_info.key
encryptor = encrypt.Encryptor(to_bytes(base64.b64encode(self.user_key)) + self.salt, 'aes-128-cbc', b'\x00' * 16)
data = uid + encryptor.encrypt(data)[16:] data = uid + encryptor.encrypt(data)[16:]
data += hmac.new(mac_key, data, self.hashfunc).digest()[:4] data += hmac.new(mac_key, data, self.hashfunc).digest()[:4]
check_head = os.urandom(1) check_head = os.urandom(1)
@ -1415,9 +1422,18 @@ class auth_aes128_sha1(auth_base):
return (out_buf, sendback) return (out_buf, sendback)
def client_udp_pre_encrypt(self, buf): def client_udp_pre_encrypt(self, buf):
uid = os.urandom(4) if self.user_key is None:
user_key = self.server_info.key if b':' in to_bytes(self.server_info.protocol_param):
buf += uid try:
items = to_bytes(self.server_info.protocol_param).split(':')
self.user_key = self.hashfunc(items[1]).digest()
self.user_id = struct.pack('<I', int(items[0]))
except:
pass
if self.user_key is None:
self.user_id = os.urandom(4)
self.user_key = self.server_info.key
buf += self.user_id
return buf + hmac.new(user_key, buf, self.hashfunc).digest()[:4] return buf + hmac.new(user_key, buf, self.hashfunc).digest()[:4]
def client_udp_post_decrypt(self, buf): def client_udp_post_decrypt(self, buf):