summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2022-11-23 15:19:48 +0100
committerStefan Metzmacher <metze@samba.org>2022-12-14 00:48:49 +0100
commitece27efe594372748c625b7c60c7461b9f39cd67 (patch)
tree2ec17ccb0283d340701e5ec6511fb0696e2beb92
parentc23c17a8d7546df897654c4205d421de98c0598b (diff)
downloadsamba-ece27efe594372748c625b7c60c7461b9f39cd67.tar.gz
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)
-rw-r--r--source3/utils/net_ads.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 0764b4d53cb..ee0d9c97f04 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -3791,12 +3791,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);