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

add generation of session key here

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@24939 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2009-03-25 15:36:26 +00:00
parent 26c1af7c93
commit eb32e1f0ff
1 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
kdc/pkinit.c
View File

@@ -1160,9 +1160,11 @@ _kdc_pk_mk_pa_reply(krb5_context context,
krb5_kdc_configuration *config, krb5_kdc_configuration *config,
pk_client_params *client_params, pk_client_params *client_params,
const hdb_entry_ex *client, const hdb_entry_ex *client,
krb5_enctype sessionetype,
const KDC_REQ *req, const KDC_REQ *req,
const krb5_data *req_buffer, const krb5_data *req_buffer,
krb5_keyblock **reply_key, krb5_keyblock **reply_key,
krb5_keyblock *sessionkey,
METHOD_DATA *md) METHOD_DATA *md)
{ {
krb5_error_code ret; krb5_error_code ret;
@@ -1238,6 +1240,13 @@ _kdc_pk_mk_pa_reply(krb5_context context,
if (rep.u.encKeyPack.length != size) if (rep.u.encKeyPack.length != size)
krb5_abortx(context, "Internal ASN.1 encoder error"); krb5_abortx(context, "Internal ASN.1 encoder error");
ret = krb5_generate_random_keyblock(context, sessionetype,
sessionkey);
if (ret) {
free_PA_PK_AS_REP(&rep);
goto out;
}
} else { } else {
ContentInfo info; ContentInfo info;
@@ -1275,6 +1284,13 @@ _kdc_pk_mk_pa_reply(krb5_context context,
if (rep.u.encKeyPack.length != size) if (rep.u.encKeyPack.length != size)
krb5_abortx(context, "Internal ASN.1 encoder error"); krb5_abortx(context, "Internal ASN.1 encoder error");
/* XXX */
ret = krb5_generate_random_keyblock(context, sessionetype,
sessionkey);
if (ret) {
free_PA_PK_AS_REP(&rep);
goto out;
}
} }
ASN1_MALLOC_ENCODE(PA_PK_AS_REP, buf, len, &rep, &size, ret); ASN1_MALLOC_ENCODE(PA_PK_AS_REP, buf, len, &rep, &size, ret);
@@ -1346,6 +1362,11 @@ _kdc_pk_mk_pa_reply(krb5_context context,
if (len != size) if (len != size)
krb5_abortx(context, "Internal ASN.1 encoder error"); krb5_abortx(context, "Internal ASN.1 encoder error");
ret = krb5_generate_random_keyblock(context, sessionetype,
sessionkey);
if (ret)
goto out;
} else } else
krb5_abortx(context, "PK-INIT internal error"); krb5_abortx(context, "PK-INIT internal error");