Skip to content

Commit fae6ca9

Browse files
Ebrixgpotter2
authored andcommitted
Implement [MS-RRP] RPC manipulation & various other changes
This PR also: - regroups windows helpers in a scapy/layers/windows folder
1 parent 85825ed commit fae6ca9

File tree

20 files changed

+2704
-926
lines changed

20 files changed

+2704
-926
lines changed

scapy/layers/kerberos.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,6 @@
146146
)
147147
from scapy.layers.inet import TCP, UDP
148148
from scapy.layers.smb import _NV_VERSION
149-
from scapy.layers.smb2 import STATUS_ERREF
150149
from scapy.layers.tls.cert import (
151150
Cert,
152151
CertList,
@@ -161,6 +160,7 @@
161160
Hash_SHA512,
162161
)
163162
from scapy.layers.tls.crypto.groups import _ffdh_groups
163+
from scapy.layers.windows.erref import STATUS_ERREF
164164
from scapy.layers.x509 import (
165165
_CMS_ENCAPSULATED,
166166
CMS_ContentInfo,

scapy/layers/ldap.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
NETLOGON,
100100
NETLOGON_SAM_LOGON_RESPONSE_EX,
101101
)
102-
from scapy.layers.smb2 import STATUS_ERREF
102+
from scapy.layers.windows.erref import STATUS_ERREF
103103

104104
# Typing imports
105105
from typing import (

scapy/layers/msrpce/msnrpc.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
from scapy.layers.msrpce.rpcclient import (
3838
DCERPC_Client,
3939
DCERPC_Transport,
40-
STATUS_ERREF,
4140
)
41+
from scapy.layers.windows.erref import STATUS_ERREF
4242
from scapy.layers.msrpce.raw.ms_nrpc import (
4343
NetrServerAuthenticate3_Request,
4444
NetrServerAuthenticate3_Response,
@@ -610,7 +610,7 @@ def __init__(
610610

611611
def connect(self, host, **kwargs):
612612
"""
613-
This calls DCERPC_Client's connect_and_bind to bind the 'logon' interface.
613+
This calls DCERPC_Client's connect to bind the 'logon' interface.
614614
"""
615615
super(NetlogonClient, self).connect(
616616
host=host,

scapy/layers/msrpce/mspac.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
_NTLMPayloadField,
6969
_NTLMPayloadPacket,
7070
)
71-
from scapy.layers.smb2 import WINNT_SID
71+
from scapy.layers.windows.security import WINNT_SID
7272

7373
# sect 2.4
7474

0 commit comments

Comments
 (0)