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

Rename PA-KEY-INFO -> ETYPE-INFO.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@4618 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1998-03-21 00:48:46 +00:00
parent d802c7e57f
commit 5ab42022ca
5 changed files with 38 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lib/krb5/codec.c
View File

@@ -199,38 +199,38 @@ krb5_encode_EncKrbCredPart (krb5_context context,
}
krb5_error_code
krb5_decode_PA_KEY_INFO (krb5_context context,
const void *data,
size_t length,
PA_KEY_INFO *t,
size_t *len)
krb5_decode_ETYPE_INFO (krb5_context context,
const void *data,
size_t length,
ETYPE_INFO *t,
size_t *len)
{
krb5_error_code ret;
int i;
ret = decode_PA_KEY_INFO((void*)data, length, t, len);
ret = decode_ETYPE_INFO((void*)data, length, t, len);
if(ret)
return ret;
for(i = 0; i < t->len; i++) {
if((ret = krb5_decode_keytype(context, &t->val[i].keytype, 1)))
if((ret = krb5_decode_keytype(context, &t->val[i].etype, 1)))
break;
}
return ret;
}
krb5_error_code
krb5_encode_PA_KEY_INFO (krb5_context context,
void *data,
size_t length,
PA_KEY_INFO *t,
size_t *len)
krb5_encode_ETYPE_INFO (krb5_context context,
void *data,
size_t length,
ETYPE_INFO *t,
size_t *len)
{
krb5_error_code ret;
int i;
/* XXX this will break, since we need one key-info for each enctype */
/* XXX or do we? */
for(i = 0; i < t->len; i++)
if((ret = krb5_decode_keytype(context, &t->val[i].keytype, 0)))
if((ret = krb5_decode_keytype(context, &t->val[i].etype, 0)))
break;
if(ret) return ret;
return encode_PA_KEY_INFO (data, length, t, len);
return encode_ETYPE_INFO (data, length, t, len);
}

5
lib/krb5/get_in_tkt.c
View File

@@ -478,8 +478,9 @@ init_as_req (krb5_context context,
}
a->padata->val = tmp;
for(j = 0; j < preauth->val[i].info.len; j++) {
krb5_keytype keytype = preauth->val[i].info.val[j].keytype;
if(preauth->val[i].info.val[j].salttype ==
krb5_keytype keytype = preauth->val[i].info.val[j].etype;
if(preauth->val[i].info.val[j].salttype &&
*preauth->val[i].info.val[j].salttype ==
KRB5_PA_AFS3_SALT) {
if(keytype != KEYTYPE_DES) {
ret = KRB5_PROG_KEYTYPE_NOSUPP;