PEP8 fixes

Author: gpotter2

scapy/layers/kerberos.py

@@ -5100,7 +5100,7 @@ def GSS_Init_sec_context(
                     # Update UPN (could have been canonicalized)
                     self.UPN = res.upn
 
-                    # Store TGT, 
+                    # Store TGT,
                     self.TGT = res.asrep.ticket
                     self.TGTSessionKey = res.sessionkey
                 else:
@@ -5134,7 +5134,9 @@ def GSS_Init_sec_context(
                 Context.STSessionKey = self.KEY
 
                 if Context.flags & GSS_C_FLAGS.GSS_C_DELEG_FLAG:
-                    raise ValueError("Cannot use GSS_C_DELEG_FLAG when passed a service ticket !")
+                    raise ValueError(
+                        "Cannot use GSS_C_DELEG_FLAG when passed a service ticket !"
+                    )
 
             # Save ServerHostname
             if len(self.ST.sname.nameString) == 2:
@@ -5199,16 +5201,14 @@ def GSS_Init_sec_context(
                 #     )
                 # )
 
-
             # Build and encrypt the full KRB_Authenticator
             ap_req.authenticator.encrypt(
                 Context.STSessionKey,
                 KRB_Authenticator(
                     crealm=crealm,
                     cname=PrincipalName.fromUPN(self.UPN),
                     cksum=Checksum(
-                        cksumtype="KRB-AUTHENTICATOR",
-                        checksum=authenticator_checksum
+                        cksumtype="KRB-AUTHENTICATOR", checksum=authenticator_checksum
                     ),
                     ctime=ASN1_GENERALIZED_TIME(now_time),
                     cusec=ASN1_INTEGER(0),

scapy/layers/msrpce/msnrpc.py

@@ -676,7 +676,7 @@ def establish_secure_channel(
         :param mode: one of NETLOGON_SECURE_CHANNEL_METHOD. This defines which method
                      to use to establish the secure channel.
         :param UPN: the UPN of the computer account name that is used to establish
-                    the secure channel. (e.g. [email protected])
+                    the secure channel. (e.g. WIN10$@domain.local)
         :param DC_FQDN: the FQDN name of the DC.
 
         The function then requires one of the following:
@@ -687,6 +687,10 @@ def establish_secure_channel(
         :param ssp: a KerberosSSP to use (in Kerberos mode)
         """
         computername, domainname = _parse_upn(UPN)
+        # We need to normalize here, since the functions require both the accountname
+        # and the normal (no dollar) computer name.
+        if computername.endswith("$"):
+            computername = computername[:-1]
 
         if mode == NETLOGON_SECURE_CHANNEL_METHOD.NetrServerAuthenticate3:
             if ssp or KEY:
@@ -858,7 +862,11 @@ def establish_secure_channel(
                     ndrendian=self.ndrendian,
                 )
             )
-            if netr_server_authkerb_response.status != 0:
+            if (
+                NetrServerAuthenticateKerberos_Response
+                not in netr_server_authkerb_response
+                or netr_server_authkerb_response.status != 0
+            ):
                 # An error occured
                 netr_server_authkerb_response.show()
                 raise ValueError("NetrServerAuthenticateKerberos failed !")

scapy/layers/spnego.py

@@ -705,15 +705,14 @@ def from_cli_arguments(
             if ST is None and ccache is not None:
                 # In this case, load the KerberosSSP from ccache
                 from scapy.modules.ticketer import Ticketer
-                
+
                 # Import into a Ticketer object
                 t = Ticketer()
                 t.open_ccache(ccache)
 
                 # Look for the ticketer that we'll use
                 raise NotImplementedError
 
-
                 ssps.append(t.ssp())
             elif ST is None:
                 # In this case, KEY is supposed to be the user's key.