From 9dd70b312ab6c49d2807366733b9dfe11c0915cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Thu, 7 Apr 2005 20:15:18 +0000 Subject: [PATCH] (process_pa_data_to_key): also check for KRB5_PADATA_PK_AS_REP_19, From: Douglas Engert git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@14757 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/krb5/init_creds_pw.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/lib/krb5/init_creds_pw.c b/lib/krb5/init_creds_pw.c index 1afa3ecd2..7b6a1fc55 100644 --- a/lib/krb5/init_creds_pw.c +++ b/lib/krb5/init_creds_pw.c @@ -1115,7 +1115,7 @@ process_pa_data_to_key(krb5_context context, krb5_error_code ret; krb5_enctype etype; PA_DATA *pa; - int index = 0; + int index; memset(&paid, 0, sizeof(paid)); @@ -1135,11 +1135,20 @@ process_pa_data_to_key(krb5_context context, } pa = NULL; - if (rep->kdc_rep.padata) + if (rep->kdc_rep.padata) { + index = 0; pa = krb5_find_padata(rep->kdc_rep.padata->val, rep->kdc_rep.padata->len, KRB5_PADATA_PK_AS_REP, &index); + if (pa == NULL) { + index = 0; + pa = krb5_find_padata(rep->kdc_rep.padata->val, + rep->kdc_rep.padata->len, + KRB5_PADATA_PK_AS_REP_19, + &index); + } + } if (pa && ctx->pk_init_ctx) { #ifdef PKINIT ret = _krb5_pk_rd_pa_reply(context,