From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 23 Nov 2022 14:19:48 +0000 (+0100)
Subject: CVE-2022-37966 s3:net_ads: remove unused ifdef HAVE_ENCTYPE_AES*
X-Git-Tag: samba-4.16.8~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c7af9838fecf1bb900029876496a8a7517bd3a9;p=thirdparty%2Fsamba.git

CVE-2022-37966 s3:net_ads: remove unused ifdef HAVE_ENCTYPE_AES*

aes encryption types are always supported.

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 f3fe1f2ce64ed36be5b001fb4fea92428e73e4e3)
---

diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index cc0d4a0d966..8225a89a323 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -3494,12 +3494,8 @@ static int net_ads_enctypes_set(struct net_context *c, int argc, const char **ar
 	}
 
 	etype_list = ENC_CRC32 | ENC_RSA_MD5 | ENC_RC4_HMAC_MD5;
-#ifdef HAVE_ENCTYPE_AES128_CTS_HMAC_SHA1_96
 	etype_list |= ENC_HMAC_SHA1_96_AES128;
-#endif
-#ifdef HAVE_ENCTYPE_AES256_CTS_HMAC_SHA1_96
 	etype_list |= ENC_HMAC_SHA1_96_AES256;
-#endif
 
 	if (argv[1] != NULL) {
 		sscanf(argv[1], "%i", &etype_list);