39 lines
1.2 KiB
Diff
39 lines
1.2 KiB
Diff
From 3bb0ab271bc536a826fc07db61e2cb4bb8edec28 Mon Sep 17 00:00:00 2001
|
|
From: Stefan Metzmacher <metze@samba.org>
|
|
Date: Wed, 23 Nov 2022 15:20:40 +0100
|
|
Subject: [PATCH 34/54] CVE-2022-37966 s3:net_ads: no longer reference des
|
|
encryption types
|
|
|
|
We no longer have support for des encryption types in the kerberos
|
|
libraries anyway.
|
|
|
|
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 4cedaa643bf95ef2628f1b631feda833bb2e7da1)
|
|
|
|
Conflict: NA
|
|
Reference: https://attachments.samba.org/attachment.cgi?id=17695
|
|
---
|
|
source3/utils/net_ads.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
|
|
index 79246a7ec0be..7e1513a14ff7 100644
|
|
--- a/source3/utils/net_ads.c
|
|
+++ b/source3/utils/net_ads.c
|
|
@@ -3687,7 +3687,8 @@ static int net_ads_enctypes_set(struct net_context *c, int argc, const char **ar
|
|
goto done;
|
|
}
|
|
|
|
- etype_list = ENC_CRC32 | ENC_RSA_MD5 | ENC_RC4_HMAC_MD5;
|
|
+ etype_list = 0;
|
|
+ etype_list |= ENC_RC4_HMAC_MD5;
|
|
etype_list |= ENC_HMAC_SHA1_96_AES128;
|
|
etype_list |= ENC_HMAC_SHA1_96_AES256;
|
|
|
|
--
|
|
2.34.1
|