sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00
Code

s4/heimdal/lib/krb5/pac.c: Align PAC buffers to match Windows

Browse Source 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14642

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Joseph Sutton 2021-08-11 13:27:11 +12:00 committed by Andrew Bartlett
parent 91e684f5dc
commit 28a5a586c8
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
selftest/knownfail_heimdal_kdc
View File

@ -70,6 +70,7 @@
#
# S4U tests
#
^samba.tests.krb5.s4u_tests.samba.tests.krb5.s4u_tests.S4UKerberosTests.test_bronze_bit_constrained_delegation_old_checksum
^samba.tests.krb5.s4u_tests.samba.tests.krb5.s4u_tests.S4UKerberosTests.test_bronze_bit_rbcd_old_checksum
^samba.tests.krb5.s4u_tests.samba.tests.krb5.s4u_tests.S4UKerberosTests.test_constrained_delegation_no_service_pac
^samba.tests.krb5.s4u_tests.samba.tests.krb5.s4u_tests.S4UKerberosTests.test_constrained_delegation_unkeyed_client_checksum

14
source4/heimdal/lib/krb5/pac.c
View File

@ -62,10 +62,12 @@ struct krb5_pac_data {
#define PACTYPE_SIZE 8
#define PAC_INFO_BUFFER_SIZE 16
#define PAC_LOGON_INFO 1
#define PAC_SERVER_CHECKSUM 6
#define PAC_PRIVSVR_CHECKSUM 7
#define PAC_LOGON_NAME 10
#define PAC_CONSTRAINED_DELEGATION 11
#define PAC_UPN_DNS_INFO 12
#define PAC_TICKET_CHECKSUM 16
#define CHECK(r,f,l) \
@ -1184,7 +1186,17 @@ _krb5_pac_sign(krb5_context context,
ret = krb5_enomem(context);
goto out;
}
/* XXX if not aligned, fill_zeros */
if (p->pac->buffers[i].type == PAC_LOGON_INFO
|| p->pac->buffers[i].type == PAC_UPN_DNS_INFO)
{
uint32_t rounded = (len + PAC_ALIGNMENT - 1) / PAC_ALIGNMENT
* PAC_ALIGNMENT;
uint32_t remaining = rounded - len;
CHECK(ret, fill_zeros(context, spdata, remaining), out);
len = rounded;
}
}
/* write header */