diff options
author | Chris Provenzano <proven@mit.edu> | 1995-09-06 03:45:51 +0000 |
---|---|---|
committer | Chris Provenzano <proven@mit.edu> | 1995-09-06 03:45:51 +0000 |
commit | 460c476e013f620348beda6f72606ab357ae93d5 (patch) | |
tree | e1f717cc985b72f5d6d68bad516cd8380b6fd26d /src/lib/krb5/krb/decrypt_tk.c | |
parent | d0639362a83f6c8edda937b79596fd50e7aa0b5f (diff) | |
download | krb5-460c476e013f620348beda6f72606ab357ae93d5.tar.gz krb5-460c476e013f620348beda6f72606ab357ae93d5.tar.xz krb5-460c476e013f620348beda6f72606ab357ae93d5.zip |
* decode_kdc.c, decrypt_tk.c, encode_kdc.c, encrypt_tk.c, gc_frm_kdc.c
* gc_via_tkt.c, get_in_tkt.c, in_tkt_ktb.c, in_tkt_pwd.c, in_tkt_sky.c
* init_ctx.c, kdc_rep_dc.c, mk_cred.c, mk_priv.c, mk_rep.c
* mk_req_ext.c, rd_cred.c, rd_priv.c, rd_rep.c, rd_req_dec.c,
* send_tgs.c, ser_ctx.c, ser_eblk.c, ser_key.c, t_ser.c:
Remove krb5_enctype references, and replace with
krb5_keytype where appropriate
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6687 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/krb5/krb/decrypt_tk.c')
-rw-r--r-- | src/lib/krb5/krb/decrypt_tk.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/lib/krb5/krb/decrypt_tk.c b/src/lib/krb5/krb/decrypt_tk.c index 3777ffa6b..25ad3dcb7 100644 --- a/src/lib/krb5/krb/decrypt_tk.c +++ b/src/lib/krb5/krb/decrypt_tk.c @@ -46,29 +46,27 @@ krb5_decrypt_tkt_part(context, srv_key, ticket) krb5_data scratch; krb5_error_code retval; - if (!valid_etype(ticket->enc_part.etype)) + if (!valid_keytype(ticket->enc_part.keytype)) return KRB5_PROG_ETYPE_NOSUPP; /* put together an eblock for this encryption */ - - krb5_use_cstype(context, &eblock, ticket->enc_part.etype); + krb5_use_keytype(context, &eblock, ticket->enc_part.keytype); scratch.length = ticket->enc_part.ciphertext.length; if (!(scratch.data = malloc(ticket->enc_part.ciphertext.length))) return(ENOMEM); /* do any necessary key pre-processing */ - retval = krb5_process_key(context, &eblock, srv_key); - if (retval) { + if (retval = krb5_process_key(context, &eblock, srv_key)) { free(scratch.data); return(retval); } /* call the encryption routine */ - retval = krb5_decrypt(context, (krb5_pointer) ticket->enc_part.ciphertext.data, - (krb5_pointer) scratch.data, - scratch.length, &eblock, 0); - if (retval) { + if (retval = krb5_decrypt(context, + (krb5_pointer) ticket->enc_part.ciphertext.data, + (krb5_pointer) scratch.data, scratch.length, + &eblock, 0)) { (void) krb5_finish_key(context, &eblock); free(scratch.data); return retval; @@ -87,6 +85,5 @@ free(scratch.data);} ticket->enc_part2 = dec_tkt_part; } clean_scratch(); - ticket->enc_part2->session->etype = ticket->enc_part.etype; return retval; } |