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
commitc23c17a8d7546df897654c4205d421de98c0598b (patch)
tree0cabff330c5e2f29c1b5a7b7d51a151cd0c475d8
parent6db1a9a9648980de2257bb8034838323cd6b84ef (diff)
downloadsamba-c23c17a8d7546df897654c4205d421de98c0598b.tar.gz
CVE-2022-37966 s3:libnet: 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 1a36c348d7a984bed8d0f3de5bf9bebd1cb3c47a)
-rw-r--r--source3/libnet/libnet_join.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index 4c67e9af5c4..79cbe29d594 100644
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -2518,12 +2518,8 @@ WERROR libnet_init_JoinCtx(TALLOC_CTX *mem_ctx,
ctx->in.desired_encryption_types = ENC_CRC32 |
ENC_RSA_MD5 |
ENC_RC4_HMAC_MD5;
-#ifdef HAVE_ENCTYPE_AES128_CTS_HMAC_SHA1_96
ctx->in.desired_encryption_types |= ENC_HMAC_SHA1_96_AES128;
-#endif
-#ifdef HAVE_ENCTYPE_AES256_CTS_HMAC_SHA1_96
ctx->in.desired_encryption_types |= ENC_HMAC_SHA1_96_AES256;
-#endif
*r = ctx;