dash/rdpy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix build issue

Browse Source
This commit is contained in:
speyrefitte
2014-12-16 18:03:12 +01:00
parent f2481149d9
commit a0ae3d97ec
5 changed files with 41 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rdpy/protocol/rdp/rdp.py
View File

@@ -324,10 +324,11 @@ class RDPServerController(pdu.layer.PDUServerListener):
"""
@summary: Controller use in server side mode
"""
def __init__(self, privateKeyFileName, certificateFileName, colorDepth):
def __init__(self, colorDepth, privateKeyFileName = None, certificateFileName = None, rsaKeys = None):
"""
@param privateKeyFileName: file contain server private key
@param certficiateFileName: file that contain public key
@param rsaKeys: {Tuple(rsa.PublicKey, rsa.PrivateKey)} rsa crypto
@param colorDepth: 15, 16, 24
"""
self._isReady = False
@@ -336,11 +337,11 @@ class RDPServerController(pdu.layer.PDUServerListener):
#build RDP protocol stack
self._pduLayer = pdu.layer.Server(self)
#secure layer
self._secLayer = sec.Server(self._pduLayer)
self._secLayer = sec.Server(self._pduLayer, rsaKeys)
#multi channel service
self._mcsLayer = mcs.Server(self._secLayer)
#transport pdu layer
self._x224Layer = x224.Server(self._mcsLayer, privateKeyFileName, certificateFileName)
self._x224Layer = x224.Server(self._mcsLayer, privateKeyFileName, certificateFileName, False)
#transport packet (protocol layer)
self._tpktLayer = tpkt.TPKT(self._x224Layer)
#fastpath stack
@@ -553,7 +554,7 @@ class ServerFactory(layer.RawLayerServerFactory):
@summary: Function call from twisted and build rdp protocol stack
@param addr: destination address
"""
controller = RDPServerController(self._privateKeyFileName, self._certificateFileName, self._colorDepth)
controller = RDPServerController(self._colorDepth, self._privateKeyFileName, self._certificateFileName)
self.buildObserver(controller, addr)
return controller.getProtocol()