gandc/mtprotoproxy
1
0
Fork 0
mirror of https://github.com/alexbers/mtprotoproxy.git synced 2026-03-14 07:13:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

faster aes support and attachment download fix

Browse Source
This commit is contained in:
Alexander Bersenev
2018-05-28 17:08:07 +05:00
parent 632a4c2ba5
commit b42ddffef2
1 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
mtprotoproxy.py
View File

@@ -8,7 +8,22 @@ import time
import hashlib import hashlib
import random import random
import pyaes try:
from Crypto.Cipher import AES
from Crypto.Util import Counter
def create_aes(key, iv):
ctr = Counter.new(128, initial_value=iv)
return AES.new(key, AES.MODE_CTR, counter=ctr)
except ModuleNotFoundError:
print("Failed to find pycrypto, using slow AES version", flush=True)
import pyaes
def create_aes(key, iv):
ctr = pyaes.Counter(iv)
return pyaes.AESModeOfOperationCTR(key, ctr)
from config import PORT, USERS from config import PORT, USERS
@@ -55,14 +70,12 @@ async def handle_handshake(reader, writer):
dec_prekey_and_iv = handshake[SKIP_LEN:SKIP_LEN+PREKEY_LEN+IV_LEN] dec_prekey_and_iv = handshake[SKIP_LEN:SKIP_LEN+PREKEY_LEN+IV_LEN]
dec_prekey, dec_iv = dec_prekey_and_iv[:PREKEY_LEN], dec_prekey_and_iv[PREKEY_LEN:] dec_prekey, dec_iv = dec_prekey_and_iv[:PREKEY_LEN], dec_prekey_and_iv[PREKEY_LEN:]
dec_key = hashlib.sha256(dec_prekey + secret).digest() dec_key = hashlib.sha256(dec_prekey + secret).digest()
dec_ctr = pyaes.Counter(int.from_bytes(dec_iv, "big")) decryptor = create_aes(key=dec_key, iv=int.from_bytes(dec_iv, "big"))
decryptor = pyaes.AESModeOfOperationCTR(dec_key, dec_ctr)
enc_prekey_and_iv = handshake[SKIP_LEN:SKIP_LEN+PREKEY_LEN+IV_LEN][::-1] enc_prekey_and_iv = handshake[SKIP_LEN:SKIP_LEN+PREKEY_LEN+IV_LEN][::-1]
enc_prekey, enc_iv = enc_prekey_and_iv[:PREKEY_LEN], enc_prekey_and_iv[PREKEY_LEN:] enc_prekey, enc_iv = enc_prekey_and_iv[:PREKEY_LEN], enc_prekey_and_iv[PREKEY_LEN:]
enc_key = hashlib.sha256(enc_prekey + secret).digest() enc_key = hashlib.sha256(enc_prekey + secret).digest()
enc_ctr = pyaes.Counter(int.from_bytes(enc_iv, "big")) encryptor = create_aes(key=enc_key, iv=int.from_bytes(enc_iv, "big"))
encryptor = pyaes.AESModeOfOperationCTR(enc_key, enc_ctr)
decrypted = decryptor.decrypt(handshake) decrypted = decryptor.decrypt(handshake)
@@ -71,7 +84,7 @@ async def handle_handshake(reader, writer):
if check_val != MAGIC_VAL: if check_val != MAGIC_VAL:
continue continue
dc_idx = int.from_bytes(decrypted[60:62], "little") - 1 dc_idx = abs(int.from_bytes(decrypted[60:62], "little", signed=True)) - 1
if dc_idx < 0 or dc_idx >= len(TG_DATACENTERS): if dc_idx < 0 or dc_idx >= len(TG_DATACENTERS):
continue continue
@@ -103,14 +116,12 @@ async def do_handshake(dc, dec_key_and_iv=None):
dec_key_and_iv = rnd[SKIP_LEN:SKIP_LEN+KEY_LEN+IV_LEN][::-1] dec_key_and_iv = rnd[SKIP_LEN:SKIP_LEN+KEY_LEN+IV_LEN][::-1]
dec_key, dec_iv = dec_key_and_iv[:KEY_LEN], dec_key_and_iv[KEY_LEN:] dec_key, dec_iv = dec_key_and_iv[:KEY_LEN], dec_key_and_iv[KEY_LEN:]
dec_ctr = pyaes.Counter(int.from_bytes(dec_iv, "big")) decryptor = create_aes(key=dec_key, iv=int.from_bytes(dec_iv, "big"))
decryptor = pyaes.AESModeOfOperationCTR(dec_key, dec_ctr)
enc_key_and_iv = rnd[SKIP_LEN:SKIP_LEN+KEY_LEN+IV_LEN] enc_key_and_iv = rnd[SKIP_LEN:SKIP_LEN+KEY_LEN+IV_LEN]
enc_key, enc_iv = enc_key_and_iv[:KEY_LEN], enc_key_and_iv[KEY_LEN:] enc_key, enc_iv = enc_key_and_iv[:KEY_LEN], enc_key_and_iv[KEY_LEN:]
enc_ctr = pyaes.Counter(int.from_bytes(enc_iv, "big")) encryptor = create_aes(key=enc_key, iv=int.from_bytes(enc_iv, "big"))
encryptor = pyaes.AESModeOfOperationCTR(enc_key, enc_ctr)
rnd_enc = rnd[:56] + encryptor.encrypt(rnd)[56:] rnd_enc = rnd[:56] + encryptor.encrypt(rnd)[56:]
writer_tgt.write(rnd_enc) writer_tgt.write(rnd_enc)