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

(add_padat): encrypt pre-auth data with all enctypes

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@6411 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1999-07-04 15:42:35 +00:00
parent 1e74b92b89
commit 849381ffe0
1 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
lib/krb5/get_in_tkt.c
View File

@@ -358,9 +358,9 @@ add_padata(krb5_context context,
{ {
krb5_error_code ret; krb5_error_code ret;
PA_DATA *pa2; PA_DATA *pa2;
krb5_keyblock *key;
krb5_salt salt2; krb5_salt salt2;
krb5_enctype *ep; krb5_enctype *ep;
int i;
if(salt == NULL) { if(salt == NULL) {
/* default to standard salt */ /* default to standard salt */
@@ -373,25 +373,26 @@ add_padata(krb5_context context,
for (ep = enctypes; *ep != ETYPE_NULL; ep++) for (ep = enctypes; *ep != ETYPE_NULL; ep++)
netypes++; netypes++;
} }
while (netypes--) { pa2 = realloc (md->val, (md->len + netypes) * sizeof(*md->val));
ret = (*key_proc)(context, *enctypes, *salt, keyseed, &key); if (pa2 == NULL)
if (ret != KRB5_KT_NOTFOUND) return ENOMEM;
break; md->val = pa2;
enctypes++;
for (i = 0; i < netypes; ++i) {
krb5_keyblock *key;
ret = (*key_proc)(context, enctypes[i], *salt, keyseed, &key);
if (ret)
continue;
ret = make_pa_enc_timestamp (context, &md->val[md->len],
enctypes[i], key);
krb5_free_keyblock (context, key);
if (ret)
return ret;
++md->len;
} }
if(salt == &salt2) if(salt == &salt2)
krb5_free_salt(context, salt2); krb5_free_salt(context, salt2);
if (ret)
return ret;
pa2 = realloc(md->val, (md->len + 1) * sizeof(*md->val));
if(pa2 == NULL)
return ENOMEM;
md->val = pa2;
ret = make_pa_enc_timestamp(context, &md->val[md->len], *enctypes, key);
krb5_free_keyblock (context, key);
if(ret)
return ret;
md->len++;
return 0; return 0;
} }