Fixed authentication bug

ly4k · Dec 27, 2022 · 415ab3f · 415ab3f
1 parent 759f8a2
commit 415ab3f
Show file tree

Hide file tree

Showing 7 changed files with 1,073 additions and 1,093 deletions.
diff --git a/certipy/lib/pkinit.py b/certipy/lib/pkinit.py
@@ -10,10 +10,6 @@
 from asn1crypto import keys as asn1keys
 from asn1crypto import x509 as asn1x509
 from impacket.krb5 import constants
-from impacket.krb5.asn1 import AS_REQ, KERB_PA_PAC_REQUEST, seq_set, seq_set_iter
-from impacket.krb5.types import KerberosTime, Principal
-from pyasn1.codec.der import encoder
-from pyasn1.type.univ import noValue
 
 from certipy.lib.certificate import (
     cert_to_der,
@@ -23,7 +19,7 @@
     rsa_pkcs1v15_sign,
     x509,
 )
-from certipy.lib.sspi.structs import KDC_REQ_BODY, PrincipalName, KDCOptions, AS_REQ, PA_PAC_REQUEST
+from certipy.lib.structs import KDC_REQ_BODY, PrincipalName, KDCOptions, AS_REQ, PA_PAC_REQUEST
 
 # https://github.com/dirkjanm/PKINITtools/blob/master/gettgtpkinit.py#L292
 DH_PARAMS = {

diff --git a/certipy/lib/sspi/__init__ copy.py b/certipy/lib/sspi/__init__ copy.py
diff --git a/certipy/lib/sspi/__init__.py b/certipy/lib/sspi/__init__.py
@@ -1 +1 @@
-from .kerberos import get_tgs, get_tgt, submit_ticket
+from .kerberos import get_tgs, get_tgt, submit_ticket
diff --git a/certipy/lib/sspi/kerberos.py b/certipy/lib/sspi/kerberos.py
@@ -18,7 +18,7 @@
     get_lsa_error,
     submit_tkt_helper,
 )
-from .structs import (
+from certipy.lib.structs import (
     AP_REQ,
     KRB_CRED,
     Authenticator,
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		from .kerberos import get_tgs, get_tgt, submit_ticket
		from .kerberos import get_tgs, get_tgt, submit_ticket