tests/krb5: Return encpart from get_tgt() as part of KerberosTicketCreds

The encpart is already contained in ticket_creds, so it no longer needs
to be returned as a separate value.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14642

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Isaac Boukris <iboukris@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/python/samba/tests/krb5/fast_tests.py b/python/samba/tests/krb5/fast_tests.py
index cf64b1220233fcccec1cfa4aa8da059fe8b736c4..44853365d1efd0a97352bb3b2e25e1972b85cc59 100755 (executable)
--- a/python/samba/tests/krb5/fast_tests.py
+++ b/python/samba/tests/krb5/fast_tests.py
@@ -67,11 +67,9 @@ class FAST_Tests(KDCBaseTest):
         super().setUpClass()
 
         cls.user_tgt = None
-        cls.user_enc_part = None
         cls.user_service_ticket = None
 
         cls.mach_tgt = None
-        cls.mach_enc_part = None
         cls.mach_service_ticket = None
 
     def setUp(self):
@@ -1543,16 +1541,14 @@ class FAST_Tests(KDCBaseTest):
     def get_mach_tgt(self):
         if self.mach_tgt is None:
             mach_creds = self.get_mach_creds()
-            type(self).mach_tgt, type(self).mach_enc_part = (
-                self.get_tgt(mach_creds))
+            type(self).mach_tgt = self.get_tgt(mach_creds)
 
         return self.mach_tgt
 
     def get_user_tgt(self):
         if self.user_tgt is None:
             user_creds = self.get_client_creds()
-            type(self).user_tgt, type(self).user_enc_part = (
-                self.get_tgt(user_creds))
+            type(self).user_tgt = self.get_tgt(user_creds)
 
         return self.user_tgt
 

diff --git a/python/samba/tests/krb5/kdc_base_test.py b/python/samba/tests/krb5/kdc_base_test.py
index fbcc89a9b319bd2989d4c01f53167ecafe8df95a..28d34210fcef3c4d1dd269af8f358aa82c7ee502 100644 (file)
--- a/python/samba/tests/krb5/kdc_base_test.py
+++ b/python/samba/tests/krb5/kdc_base_test.py
@@ -1251,21 +1251,9 @@ class KDCBaseTest(RawKerberosTest):
             to_rodc=to_rodc)
         self.check_as_reply(rep)
 
-        tgt = rep['ticket']
+        ticket_creds = kdc_exchange_dict['rep_ticket_creds']
 
-        enc_part = self.get_as_rep_enc_data(preauth_key, rep)
-        session_key = self.EncryptionKey_import(enc_part['key'])
-
-        ticket_creds = KerberosTicketCreds(
-            tgt,
-            session_key,
-            crealm=realm,
-            cname=cname,
-            srealm=realm,
-            sname=sname,
-            decryption_key=ticket_decryption_key)
-
-        return ticket_creds, enc_part
+        return ticket_creds
 
     # Named tuple to contain values of interest when the PAC is decoded.
     PacData = namedtuple(