Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into master-Impacket
Browse files Browse the repository at this point in the history
  • Loading branch information
0xdeaddood committed May 3, 2022
2 parents 6afc269 + bffca7e commit 678981d
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion tests/SMB_RPC/test_rpcrt.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ class dummyCall(NDRCALL):
self.stringBinding = epm.hept_map(self.machine, samr.MSRPC_UUID_SAMR, protocol = 'ncacn_ip_tcp')
print(self.stringBinding)
dce = self.connectDCE(self.username, '', self.domain, self.lmhash, self.nthash, dceFragment=0,
auth_level=RPC_C_AUTHN_LEVEL_PKT_INTEGRITY, auth_type=RPC_C_AUTHN_GSS_NEGOTIATE,
auth_level=RPC_C_AUTHN_LEVEL_PKT_PRIVACY, auth_type=RPC_C_AUTHN_GSS_NEGOTIATE,
dceAuth=True,
doKerberos=True, bind=samr.MSRPC_UUID_SAMR)
self.stringBinding = oldBinding
Expand Down
3 changes: 2 additions & 1 deletion tests/dcerpc/test_even.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,15 @@

from impacket.dcerpc.v5 import even
from impacket.dcerpc.v5.dtypes import NULL
from impacket.dcerpc.v5.rpcrt import DCERPCException
from impacket.dcerpc.v5.rpcrt import DCERPCException, RPC_C_AUTHN_LEVEL_PKT_PRIVACY


class RRPTests(DCERPCTests):

iface_uuid = even.MSRPC_UUID_EVEN
string_binding = r"ncacn_np:{0.machine}[\PIPE\eventlog]"
authn = True
authn_level = RPC_C_AUTHN_LEVEL_PKT_PRIVACY

def test_ElfrOpenBELW(self):
dce, rpctransport = self.connect()
Expand Down
4 changes: 2 additions & 2 deletions tests/dcerpc/test_par.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@

from impacket.dcerpc.v5 import par
from impacket.dcerpc.v5.dtypes import NULL
from impacket.dcerpc.v5.rpcrt import RPC_C_AUTHN_LEVEL_PKT_INTEGRITY
from impacket.dcerpc.v5.rpcrt import RPC_C_AUTHN_LEVEL_PKT_PRIVACY


class PARTests(DCERPCTests):
iface_uuid = par.MSRPC_UUID_PAR
string_binding_formatting = DCERPCTests.STRING_BINDING_MAPPER
authn = True
authn_level = RPC_C_AUTHN_LEVEL_PKT_INTEGRITY
authn_level = RPC_C_AUTHN_LEVEL_PKT_PRIVACY

def test_RpcAsyncEnumPrinters(self):
dce, rpc_transport = self.connect()
Expand Down
8 changes: 4 additions & 4 deletions tests/dcerpc/test_tsch.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,15 @@
from impacket.dcerpc.v5 import tsch, atsvc, sasec
from impacket.dcerpc.v5.atsvc import AT_INFO
from impacket.dcerpc.v5.dtypes import NULL
from impacket.dcerpc.v5.rpcrt import RPC_C_AUTHN_LEVEL_PKT_INTEGRITY
from impacket.dcerpc.v5.rpcrt import RPC_C_AUTHN_LEVEL_PKT_PRIVACY
from impacket.system_errors import ERROR_NOT_SUPPORTED


class ATSVCTests(DCERPCTests):
iface_uuid = atsvc.MSRPC_UUID_ATSVC
string_binding = r"ncacn_np:{0.machine}[\PIPE\atsvc]"
authn = True
authn_level = RPC_C_AUTHN_LEVEL_PKT_INTEGRITY
authn_level = RPC_C_AUTHN_LEVEL_PKT_PRIVACY

def test_NetrJobEnum(self):
dce, rpc_transport = self.connect()
Expand Down Expand Up @@ -208,7 +208,7 @@ class SASECTests(DCERPCTests):
iface_uuid = sasec.MSRPC_UUID_SASEC
string_binding = r"ncacn_np:{0.machine}[\PIPE\atsvc]"
authn = True
authn_level = RPC_C_AUTHN_LEVEL_PKT_INTEGRITY
authn_level = RPC_C_AUTHN_LEVEL_PKT_PRIVACY

def test_SASetAccountInformation(self):
dce, rpc_transport = self.connect()
Expand Down Expand Up @@ -292,7 +292,7 @@ class TSCHTests(DCERPCTests):
iface_uuid = tsch.MSRPC_UUID_TSCHS
string_binding = r"ncacn_np:{0.machine}[\PIPE\atsvc]"
authn = True
authn_level = RPC_C_AUTHN_LEVEL_PKT_INTEGRITY
authn_level = RPC_C_AUTHN_LEVEL_PKT_PRIVACY

def test_SchRpcHighestVersion(self):
dce, rpc_transport = self.connect()
Expand Down

0 comments on commit 678981d

Please sign in to comment.