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

Use krb5_decode_Enc{AS,TGS}RepPart.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@4363 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1998-01-31 16:31:51 +00:00
parent 206ecd6430
commit 440bf6aeb6
2 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/krb5/get_cred.c
View File

@@ -280,18 +280,19 @@ decrypt_tkt_with_subkey (krb5_context context,
if (ret) if (ret)
return ret; return ret;
ret = decode_EncASRepPart(data.data, ret = krb5_decode_EncASRepPart(context,
data.length, data.data,
&dec_rep->enc_part,
&size);
if (ret)
ret = decode_EncTGSRepPart(data.data,
data.length, data.length,
&dec_rep->enc_part, &dec_rep->enc_part,
&size); &size);
if (ret)
ret = krb5_decode_EncTGSRepPart(context,
data.data,
data.length,
&dec_rep->enc_part,
&size);
krb5_data_free (&data); krb5_data_free (&data);
if (ret) return ret; return ret;
return 0;
} }
static krb5_error_code static krb5_error_code

19
lib/krb5/get_in_tkt.c
View File

@@ -97,15 +97,17 @@ decrypt_tkt (krb5_context context,
if (ret) if (ret)
return ret; return ret;
ret = decode_EncASRepPart(data.data, ret = krb5_decode_EncASRepPart(context,
data.length, data.data,
&dec_rep->enc_part,
&size);
if (ret)
ret = decode_EncTGSRepPart(data.data,
data.length, data.length,
&dec_rep->enc_part, &dec_rep->enc_part,
&size); &size);
if (ret)
ret = krb5_decode_EncTGSRepPart(context,
data.data,
data.length,
&dec_rep->enc_part,
&size);
krb5_data_free (&data); krb5_data_free (&data);
if (ret) return ret; if (ret) return ret;
return 0; return 0;
@@ -185,9 +187,12 @@ _krb5_extract_ticket(krb5_context context,
if (ret) if (ret)
goto out; goto out;
ret = krb5_convert_etype(context, &rep->enc_part.key.keytype); #if 0
/* XXX should this decode be here, or in the decrypt_proc? */
ret = krb5_decode_keyblock(context, &rep->enc_part.key, 1);
if(ret) if(ret)
goto out; goto out;
#endif
/* compare nonces */ /* compare nonces */