37 lines
1.6 KiB
Diff
37 lines
1.6 KiB
Diff
From e36aea06e1f00934ae13215517337732d4b65629 Mon Sep 17 00:00:00 2001
|
|
From: Stefan Metzmacher <metze@samba.org>
|
|
Date: Tue, 29 Nov 2022 20:59:52 +0100
|
|
Subject: [PATCH 46/54] CVE-2022-37966 python:tests/krb5: add better
|
|
PADATA_SUPPORTED_ETYPES assert message
|
|
|
|
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15237
|
|
|
|
Signed-off-by: Stefan Metzmacher <metze@samba.org>
|
|
Reviewed-by: Joseph Sutton <josephsutton@catalyst.net.nz>
|
|
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
|
|
(cherry picked from commit c7c576208960e336da276e251ad7a526e1b3ed45)
|
|
|
|
Conflict: NA
|
|
Reference: https://attachments.samba.org/attachment.cgi?id=17695
|
|
---
|
|
python/samba/tests/krb5/raw_testcase.py | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/python/samba/tests/krb5/raw_testcase.py b/python/samba/tests/krb5/raw_testcase.py
|
|
index d601c7bb5018..ac2ace44c992 100644
|
|
--- a/python/samba/tests/krb5/raw_testcase.py
|
|
+++ b/python/samba/tests/krb5/raw_testcase.py
|
|
@@ -3039,8 +3039,8 @@ class RawKerberosTest(TestCaseInTempDir):
|
|
self.assertEqual(
|
|
supported_etypes & ~ignore_bits,
|
|
expected_supported_etypes & ~ignore_bits,
|
|
- f'got: {supported_etypes}, '
|
|
- f'expected: {expected_supported_etypes}')
|
|
+ f'PADATA_SUPPORTED_ETYPES: got: {supported_etypes} (0x{supported_etypes:X}), '
|
|
+ f'expected: {expected_supported_etypes} (0x{expected_supported_etypes:X})')
|
|
|
|
if PADATA_PAC_OPTIONS in enc_pa_dict:
|
|
pac_options = self.der_decode(
|
|
--
|
|
2.34.1
|