tests/krb5: Don't manually create PAC request and options in fast_tests

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 ae696e88c7858b1b02c1349fdcc2e5cde1a73e7a..d18122ce6597a1150f5147b1341f7aaa6d052df5 100755 (executable)
--- a/python/samba/tests/krb5/fast_tests.py
+++ b/python/samba/tests/krb5/fast_tests.py
@@ -1596,10 +1596,7 @@ class FAST_Tests(KDCBaseTest):
                                                'canonicalize,'
                                                'renewable-ok'))
 
-        pac_request = self.get_pa_pac_request()
-        pac_options = self.get_pa_pac_options('1')  # supports claims
-
-        padata = [pac_request, pac_options]
+        pac_options = '1'  # supports claims
 
         rep, kdc_exchange_dict = self._test_as_exchange(
             cname=cname,
@@ -1614,10 +1611,12 @@ class FAST_Tests(KDCBaseTest):
             expected_sname=sname,
             expected_salt=salt,
             etypes=etype,
-            padata=padata,
+            padata=None,
             kdc_options=kdc_options,
             preauth_key=None,
-            ticket_decryption_key=ticket_decryption_key)
+            ticket_decryption_key=ticket_decryption_key,
+            pac_request=True,
+            pac_options=pac_options)
         self.check_pre_authentication(rep)
 
         etype_info2 = kdc_exchange_dict['preauth_etype_info2']
@@ -1628,7 +1627,7 @@ class FAST_Tests(KDCBaseTest):
 
         ts_enc_padata = self.get_enc_timestamp_pa_data(creds, rep)
 
-        padata = [ts_enc_padata, pac_request, pac_options]
+        padata = [ts_enc_padata]
 
         expected_realm = realm.upper()
 
@@ -1651,7 +1650,9 @@ class FAST_Tests(KDCBaseTest):
             padata=padata,
             kdc_options=kdc_options,
             preauth_key=preauth_key,
-            ticket_decryption_key=ticket_decryption_key)
+            ticket_decryption_key=ticket_decryption_key,
+            pac_request=True,
+            pac_options=pac_options)
         self.check_as_reply(rep)
 
         tgt = rep['ticket']

diff --git a/python/samba/tests/krb5/raw_testcase.py b/python/samba/tests/krb5/raw_testcase.py
index 7eba62b4022d502a32b35201d90318a63cdbd3cd..398212409419cb46cf9fd7fb28343620318beaca 100644 (file)
--- a/python/samba/tests/krb5/raw_testcase.py
+++ b/python/samba/tests/krb5/raw_testcase.py
@@ -1177,11 +1177,6 @@ class RawKerberosTest(TestCaseInTempDir):
         pa_data = self.PA_DATA_create(PADATA_PAC_REQUEST, pa_pac)
         return pa_data
 
-    def get_pa_pac_request(self, request_pac=True):
-        pac_request = self.KERB_PA_PAC_REQUEST_create(request_pac)
-
-        return pac_request
-
     def get_pa_pac_options(self, options):
         pac_options = self.PA_PAC_OPTIONS_create(options)
         pac_options = self.der_encode(pac_options,