35 lines
1.4 KiB
Diff
35 lines
1.4 KiB
Diff
From 3cd0542db2b5baefe8877fcb9bab8fa74978322c Mon Sep 17 00:00:00 2001
|
|
From: Stefan Metzmacher <metze@samba.org>
|
|
Date: Tue, 29 Nov 2022 20:27:14 +0100
|
|
Subject: [PATCH 44/54] CVE-2022-37966 python:tests/krb5: ignore empty
|
|
supplementalCredentials attributes
|
|
|
|
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 f434a30ee7c40aac4a223fcabac9ddd160a155a5)
|
|
|
|
Conflict: NA
|
|
Reference: https://attachments.samba.org/attachment.cgi?id=17695
|
|
---
|
|
python/samba/tests/krb5/kdc_base_test.py | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/python/samba/tests/krb5/kdc_base_test.py b/python/samba/tests/krb5/kdc_base_test.py
|
|
index beefd1654494..3ed81fb19d20 100644
|
|
--- a/python/samba/tests/krb5/kdc_base_test.py
|
|
+++ b/python/samba/tests/krb5/kdc_base_test.py
|
|
@@ -594,6 +594,8 @@ class KDCBaseTest(RawKerberosTest):
|
|
for attr in attributes:
|
|
if attr.attid == drsuapi.DRSUAPI_ATTID_supplementalCredentials:
|
|
net_ctx.replicate_decrypt(bind, attr, rid)
|
|
+ if attr.value_ctr.num_values == 0:
|
|
+ continue
|
|
attr_val = attr.value_ctr.values[0].blob
|
|
|
|
spl = ndr_unpack(drsblobs.supplementalCredentialsBlob,
|
|
--
|
|
2.34.1
|