From 7802d1ee31d29a32f2ebb858568b80ddbdbc2ff2 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 23 Nov 2022 15:19:48 +0100 Subject: [PATCH 29/54] 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 Reviewed-by: Joseph Sutton Reviewed-by: Andrew Bartlett (cherry picked from commit 1a36c348d7a984bed8d0f3de5bf9bebd1cb3c47a) Conflict: NA Reference: https://attachments.samba.org/attachment.cgi?id=17695 --- source3/libnet/libnet_join.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c index 4529615a41a2..4c20d956943b 100644 --- a/source3/libnet/libnet_join.c +++ b/source3/libnet/libnet_join.c @@ -2535,12 +2535,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; -- 2.34.1