Add registry abstraction layer to ease the manipulation of [MS-RRP] RPC

scapy/layers/kerberos.py

@@ -146,7 +146,6 @@
 )
 from scapy.layers.inet import TCP, UDP
 from scapy.layers.smb import _NV_VERSION
-from scapy.layers.smb2 import STATUS_ERREF
 from scapy.layers.tls.cert import (
     Cert,
     CertList,
@@ -161,6 +160,7 @@
     Hash_SHA512,
 )
 from scapy.layers.tls.crypto.groups import _ffdh_groups
+from scapy.layers.windows.erref import STATUS_ERREF
 from scapy.layers.x509 import (
     _CMS_ENCAPSULATED,
     CMS_ContentInfo,

scapy/layers/ldap.py

@@ -99,7 +99,7 @@
     NETLOGON,
     NETLOGON_SAM_LOGON_RESPONSE_EX,
 )
-from scapy.layers.smb2 import STATUS_ERREF
+from scapy.layers.windows.erref import STATUS_ERREF
 
 # Typing imports
 from typing import (

scapy/layers/msrpce/msnrpc.py

@@ -37,8 +37,8 @@
 from scapy.layers.msrpce.rpcclient import (
     DCERPC_Client,
     DCERPC_Transport,
-    STATUS_ERREF,
 )
+from scapy.layers.windows.erref import STATUS_ERREF
 from scapy.layers.msrpce.raw.ms_nrpc import (
     NetrServerAuthenticate3_Request,
     NetrServerAuthenticate3_Response,
@@ -610,7 +610,7 @@ def __init__(
 
     def connect(self, host, **kwargs):
         """
-        This calls DCERPC_Client's connect_and_bind to bind the 'logon' interface.
+        This calls DCERPC_Client's connect to bind the 'logon' interface.
         """
         super(NetlogonClient, self).connect(
             host=host,

scapy/layers/msrpce/mspac.py

@@ -68,7 +68,7 @@
     _NTLMPayloadField,
     _NTLMPayloadPacket,
 )
-from scapy.layers.smb2 import WINNT_SID
+from scapy.layers.windows.security import WINNT_SID
 
 # sect 2.4