Rooba
/
pupy
mirror of https://github.com/n1nj4sec/pupy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix rsa transport that was buggy when used in chain (cf. obfs3)

This commit is contained in:
n1nj4sec 2017-03-25 20:15:08 +01:00
parent bc4de6cacd
commit 83952250ec
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pupy/network/lib/transports/rsa_aes.py
View File

@ -49,6 +49,7 @@ class RSA_AESTransport(BasePupyTransport):
def on_connect(self): def on_connect(self):
self.downstream.write(self._iv_enc) # send IV self.downstream.write(self._iv_enc) # send IV
logging.debug("IV sent to Client")
def upstream_recv(self, data): def upstream_recv(self, data):
try: try:
@ -137,7 +138,9 @@ class RSA_AESClient(RSA_AESTransport):
else: else:
self.enc_cipher = pyaes.AESModeOfOperationCBC(self.aes_key, iv = self._iv_enc) self.enc_cipher = pyaes.AESModeOfOperationCBC(self.aes_key, iv = self._iv_enc)
self.downstream.write(rsa.encrypt(self.aes_key, pk)) self.downstream.write(rsa.encrypt(self.aes_key, pk))
logging.debug("AES key crypted with RSA public key and sent to server")
self.downstream.write(self._iv_enc) self.downstream.write(self._iv_enc)
logging.debug("IV sent to Server")
@ -155,6 +158,7 @@ class RSA_AESServer(RSA_AESTransport):
if self.privkey is None: if self.privkey is None:
raise TransportError("A private key (pem format) needs to be supplied for RSA_AESServer") raise TransportError("A private key (pem format) needs to be supplied for RSA_AESServer")
self.pk=rsa.PrivateKey.load_pkcs1(self.privkey) self.pk=rsa.PrivateKey.load_pkcs1(self.privkey)
self.post_handshake_callbacks=[]
def downstream_recv(self, data): def downstream_recv(self, data):
try: try:
@ -174,11 +178,18 @@ class RSA_AESServer(RSA_AESTransport):
self.enc_cipher = AES.new(self.aes_key, AES.MODE_CBC, self._iv_enc) self.enc_cipher = AES.new(self.aes_key, AES.MODE_CBC, self._iv_enc)
else: else:
self.enc_cipher = pyaes.AESModeOfOperationCBC(self.aes_key, iv = self._iv_enc) self.enc_cipher = pyaes.AESModeOfOperationCBC(self.aes_key, iv = self._iv_enc)
logging.debug("client AES key received && decrypted from RSA private key")
for f, args in self.post_handshake_callbacks:
f(*args)
self.post_handshake_callbacks=[]
super(RSA_AESServer, self).downstream_recv(data) super(RSA_AESServer, self).downstream_recv(data)
except Exception as e: except Exception as e:
logging.debug(e) logging.debug(e)
def upstream_recv(self, data): def upstream_recv(self, data):
if self.enc_cipher is None: if self.enc_cipher is None:
logging.debug("data received but enc_cipher is not available yet")
self.post_handshake_callbacks.append((self.upstream_recv, (data,)))
return return
super(RSA_AESServer, self).upstream_recv(data) super(RSA_AESServer, self).upstream_recv(data)