oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

When a TS-ENC key was verified, send the salt for that key in the reply

Browse Source
This commit is contained in:
Love Hornquist Astrand
2009-11-22 09:51:49 -08:00
parent d6f5c959d6
commit a895e85526
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
kdc/kerberos5.c
View File

@@ -59,6 +59,17 @@ realloc_method_data(METHOD_DATA *md)
return 0; return 0;
} }
static void
set_salt_padata(METHOD_DATA *md, Salt *salt)
{
if (salt) {
realloc_method_data(md);
md->val[md->len - 1].padata_type = salt->type;
der_copy_octet_string(&salt->salt,
&md->val[md->len - 1].padata_value);
}
}
const PA_DATA* const PA_DATA*
_kdc_find_padata(const KDC_REQ *req, int *start, int type) _kdc_find_padata(const KDC_REQ *req, int *start, int type)
{ {
@@ -910,6 +921,10 @@ _kdc_as_rep(krb5_context context,
memset(&session_key, 0, sizeof(session_key)); memset(&session_key, 0, sizeof(session_key));
krb5_data_zero(&e_data); krb5_data_zero(&e_data);
ALLOC(rep.padata);
rep.padata->len = 0;
rep.padata->val = NULL;
if (f.canonicalize) if (f.canonicalize)
flags |= HDB_F_CANON; flags |= HDB_F_CANON;
@@ -1259,6 +1274,8 @@ _kdc_as_rep(krb5_context context,
} }
et.flags.pre_authent = 1; et.flags.pre_authent = 1;
set_salt_padata(rep.padata, pa_key->salt);
reply_key = &pa_key->key; reply_key = &pa_key->key;
ret = krb5_enctype_to_string(context, pa_key->key.keytype, &str); ret = krb5_enctype_to_string(context, pa_key->key.keytype, &str);
@@ -1598,10 +1615,6 @@ _kdc_as_rep(krb5_context context,
copy_HostAddresses(et.caddr, ek.caddr); copy_HostAddresses(et.caddr, ek.caddr);
} }
ALLOC(rep.padata);
rep.padata->len = 0;
rep.padata->val = NULL;
#if PKINIT #if PKINIT
if (pkp) { if (pkp) {
e_text = "Failed to build PK-INIT reply"; e_text = "Failed to build PK-INIT reply";