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 00:48:48 +0100 |
| commit | a7e2f5d32e59758ca714e292e3aa0e51821a9d43 (patch) | |
| tree | 1ef5e68429815bb06db1c22546d7990f9204c861 | |
| parent | 1e32bfc0fdd5394268eb86f60de521722f783a50 (diff) | |
| download | samba-a7e2f5d32e59758ca714e292e3aa0e51821a9d43.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)
[jsutton@samba.org Added knownfail removals]
| -rw-r--r-- | selftest/knownfail_heimdal_kdc | 6 | ||||
| -rw-r--r-- | source4/kdc/db-glue.c | 3 |
2 files changed, 2 insertions, 7 deletions
diff --git a/selftest/knownfail_heimdal_kdc b/selftest/knownfail_heimdal_kdc index 07fe0907477..d6834a64418 100644 --- a/selftest/knownfail_heimdal_kdc +++ b/selftest/knownfail_heimdal_kdc @@ -110,9 +110,3 @@ ^samba.tests.krb5.kdc_tgs_tests.samba.tests.krb5.kdc_tgs_tests.KdcTgsTests.test_fast_service_ticket ^samba.tests.krb5.kdc_tgs_tests.samba.tests.krb5.kdc_tgs_tests.KdcTgsTests.test_fast_sid_mismatch_existing ^samba.tests.krb5.kdc_tgs_tests.samba.tests.krb5.kdc_tgs_tests.KdcTgsTests.test_fast_sid_mismatch_nonexisting -# -# LSA tests -# -^samba4.rpc.lsa.trusted.domains with .lsa.TrustedDomains.ad_dc_default -^samba4.rpc.lsa.trusted.domains with bigendian.lsa.TrustedDomains.ad_dc_default -^samba4.rpc.lsa.trusted.domains with validate.lsa.TrustedDomains.ad_dc_default diff --git a/source4/kdc/db-glue.c b/source4/kdc/db-glue.c index 57a0c020d0c..ce6353c7e2d 100644 --- a/source4/kdc/db-glue.c +++ b/source4/kdc/db-glue.c @@ -1420,9 +1420,10 @@ static krb5_error_code samba_kdc_trust_message2entry(krb5_context context, NTSTATUS status; 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); |