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

Make sure we don't sent both ENC-TS and PK-INIT pa data, no need to

Browse Source 
expose our password protecting our PKCS12 key.


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@19776 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2007-01-09 10:44:59 +00:00
parent 2230b87e17
commit 69c37b6cc7
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/krb5/init_creds_pw.c
View File

@@ -1092,23 +1092,31 @@ process_pa_data_to_md(krb5_context context,
(*out_md)->len = 0; (*out_md)->len = 0;
(*out_md)->val = NULL; (*out_md)->val = NULL;
if (in_md->len != 0) { /*
* Make sure we don't sent both ENC-TS and PK-INIT pa data, no
* need to expose our password protecting our PKCS12 key.
*/
if (ctx->pk_init_ctx) {
ret = pa_data_to_md_pkinit(context, a, creds->client, ctx, *out_md);
if (ret)
return ret;
} else if (in_md->len != 0) {
struct pa_info_data paid, *ppaid; struct pa_info_data paid, *ppaid;
memset(&paid, 0, sizeof(paid)); memset(&paid, 0, sizeof(paid));
paid.etype = ENCTYPE_NULL; paid.etype = ENCTYPE_NULL;
ppaid = process_pa_info(context, creds->client, a, &paid, in_md); ppaid = process_pa_info(context, creds->client, a, &paid, in_md);
pa_data_to_md_ts_enc(context, a, creds->client, ctx, ppaid, *out_md); pa_data_to_md_ts_enc(context, a, creds->client, ctx, ppaid, *out_md);
if (ppaid) if (ppaid)
free_paid(context, ppaid); free_paid(context, ppaid);
} }
pa_data_add_pac_request(context, ctx, *out_md); pa_data_add_pac_request(context, ctx, *out_md);
ret = pa_data_to_md_pkinit(context, a, creds->client, ctx, *out_md);
if (ret)
return ret;
if ((*out_md)->len == 0) { if ((*out_md)->len == 0) {
free(*out_md); free(*out_md);