sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-22 22:04:08 +03:00
Code

CVE-2022-37966 s4:kdc: apply restrictions of "kdc supported enctypes"

Browse Source 
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 cca3c024fc514bee79bb60a686e470605cc98d6f)
This commit is contained in:
Stefan Metzmacher 2022-11-30 09:39:19 +01:00
parent 17db57685f
commit dd4832f10a
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source4/kdc/db-glue.c
View File

@ -1079,7 +1079,11 @@ static krb5_error_code samba_kdc_message2entry(krb5_context context,
* but effectively restricted by kdc_enctypes * but effectively restricted by kdc_enctypes
*/ */
uint32_t domain_enctypes = ENC_RC4_HMAC_MD5 | ENC_RSA_MD5 | ENC_CRC32; uint32_t domain_enctypes = ENC_RC4_HMAC_MD5 | ENC_RSA_MD5 | ENC_CRC32;
uint32_t kdc_enctypes = ENC_ALL_TYPES; uint32_t config_kdc_enctypes = lpcfg_kdc_supported_enctypes(lp_ctx);
uint32_t kdc_enctypes =
config_kdc_enctypes != 0 ?
config_kdc_enctypes :
ENC_ALL_TYPES;
const char *samAccountName = ldb_msg_find_attr_as_string(msg, "samAccountName", NULL); const char *samAccountName = ldb_msg_find_attr_as_string(msg, "samAccountName", NULL);
ZERO_STRUCTP(entry); ZERO_STRUCTP(entry);
@ -1665,7 +1669,11 @@ static krb5_error_code samba_kdc_trust_message2entry(krb5_context context,
uint32_t supported_enctypes = ENC_RC4_HMAC_MD5; uint32_t supported_enctypes = ENC_RC4_HMAC_MD5;
uint32_t pa_supported_enctypes; uint32_t pa_supported_enctypes;
uint32_t supported_session_etypes; uint32_t supported_session_etypes;
uint32_t kdc_enctypes = ENC_ALL_TYPES; uint32_t config_kdc_enctypes = lpcfg_kdc_supported_enctypes(lp_ctx);
uint32_t kdc_enctypes =
config_kdc_enctypes != 0 ?
config_kdc_enctypes :
ENC_ALL_TYPES;
struct lsa_TrustDomainInfoInfoEx *tdo = NULL; struct lsa_TrustDomainInfoInfoEx *tdo = NULL;
NTSTATUS status; NTSTATUS status;