diff options
| author | Joseph Sutton <josephsutton@catalyst.net.nz> | 2022-11-22 11:32:34 +1300 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2022-12-14 11:39:17 +0000 |
| commit | 82f3c2876a80fa58425db3ee0ab15900680fe0ba (patch) | |
| tree | 7144b738e0eb950598e88b2abb971ce796906975 /source4 | |
| parent | 71e538e7e03b0624a8f094c506cde7a3e604bf3e (diff) | |
| download | samba-82f3c2876a80fa58425db3ee0ab15900680fe0ba.tar.gz | |
CVE-2022-37966 kdc: Assume trust objects support AES by default
As part of matching the behaviour of Windows, assume that trust objects
support AES256, but not RC4, if not specified otherwise.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15219
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15237
Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
(cherry picked from commit 4bb50c868c8ed14372cb7d27e53cdaba265fc33d)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/kdc/db-glue.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source4/kdc/db-glue.c b/source4/kdc/db-glue.c index e8a293633ce..d1ba6b77840 100644 --- a/source4/kdc/db-glue.c +++ b/source4/kdc/db-glue.c @@ -1597,9 +1597,10 @@ static krb5_error_code samba_kdc_trust_message2entry(krb5_context context, ZERO_STRUCTP(entry); if (dsdb_functional_level(kdc_db_ctx->samdb) >= DS_DOMAIN_FUNCTION_2008) { + /* If not told otherwise, Windows now assumes that trusts support AES. */ supported_enctypes = ldb_msg_find_attr_as_uint(msg, "msDS-SupportedEncryptionTypes", - supported_enctypes); + ENC_HMAC_SHA1_96_AES256); } status = dsdb_trust_parse_tdo_info(mem_ctx, msg, &tdo); |