sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

tests/krb5: Refactor encryption type selection

Browse Source 
Add and use some methods to calculate the highest supported AES and RC4
encryption types, respectively.

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Joseph Sutton 2023-07-03 14:41:55 +12:00 committed by Andrew Bartlett
parent ef9ffbacb9
commit 7f9547fda7
1 changed files with 37 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
python/samba/tests/krb5/raw_testcase.py
View File

@ -3995,31 +3995,17 @@ class RawKerberosTest(TestCase):
if self.strict_checking:
self.assertIsNone(s2kparams)
def check_rep_padata(self,
kdc_exchange_dict,
callback_dict,
rep_padata,
error_code):
rep_msg_type = kdc_exchange_dict['rep_msg_type']
req_body = kdc_exchange_dict['req_body']
proposed_etypes = req_body['etype']
sent_fast = self.sent_fast(kdc_exchange_dict)
sent_enc_challenge = self.sent_enc_challenge(kdc_exchange_dict)
if rep_msg_type == KRB_TGS_REP:
self.assertTrue(sent_fast)
rc4_support = kdc_exchange_dict['rc4_support']
def expected_etype(etypes, proposed_etypes):
return max(filter(lambda e: e in etypes, proposed_etypes),
default=None)
@staticmethod
def greatest_common_etype(etypes, proposed_etypes):
return max(filter(lambda e: e in etypes, proposed_etypes),
default=None)
def supported_aes_rc4_etypes(self, kdc_exchange_dict):
creds = kdc_exchange_dict['creds']
supported_etypes = self.get_default_enctypes(creds)
rc4_support = kdc_exchange_dict['rc4_support']
aes_etypes = set()
if kcrypto.Enctype.AES256 in supported_etypes:
aes_etypes.add(kcrypto.Enctype.AES256)
@ -4030,8 +4016,36 @@ class RawKerberosTest(TestCase):
if rc4_support and kcrypto.Enctype.RC4 in supported_etypes:
rc4_etypes.add(kcrypto.Enctype.RC4)
expected_aes = expected_etype(aes_etypes, proposed_etypes)
expected_rc4 = expected_etype(rc4_etypes, proposed_etypes)
return aes_etypes, rc4_etypes
def greatest_aes_rc4_etypes(self, kdc_exchange_dict):
req_body = kdc_exchange_dict['req_body']
proposed_etypes = req_body['etype']
aes_etypes, rc4_etypes = self.supported_aes_rc4_etypes(kdc_exchange_dict)
expected_aes = self.greatest_common_etype(aes_etypes, proposed_etypes)
expected_rc4 = self.greatest_common_etype(rc4_etypes, proposed_etypes)
return expected_aes, expected_rc4
def check_rep_padata(self,
kdc_exchange_dict,
callback_dict,
rep_padata,
error_code):
rep_msg_type = kdc_exchange_dict['rep_msg_type']
sent_fast = self.sent_fast(kdc_exchange_dict)
sent_enc_challenge = self.sent_enc_challenge(kdc_exchange_dict)
if rep_msg_type == KRB_TGS_REP:
self.assertTrue(sent_fast)
rc4_support = kdc_exchange_dict['rc4_support']
expected_aes, expected_rc4 = self.greatest_aes_rc4_etypes(
kdc_exchange_dict)
expect_etype_info2 = ()
expect_etype_info = False