CVE-2022-37966 s3:libnet: remove unused ifdef HAVE_ENCTYPE_AES*
authorStefan Metzmacher <metze@samba.org>
Wed, 23 Nov 2022 14:19:48 +0000 (15:19 +0100)
committerStefan Metzmacher <metze@samba.org>
Tue, 13 Dec 2022 23:48:49 +0000 (00:48 +0100)
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)

source3/libnet/libnet_join.c

index 4c67e9af5c40c760f2fdc15c816e15383f08b757..79cbe29d5940ba78ed7e4e6077620936e9b21f59 100644 (file)
@@ -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;