diff options
author | Chris Provenzano <proven@mit.edu> | 1995-01-13 21:21:42 +0000 |
---|---|---|
committer | Chris Provenzano <proven@mit.edu> | 1995-01-13 21:21:42 +0000 |
commit | 5b169bc85d0ddcf7055e694d07cbb704021e6c3c (patch) | |
tree | 6c53ff012a508b74c7decb1dffd72bbe7b2bf022 /src/lib/krb5/krb/decrypt_tk.c | |
parent | f33e326f8f7ea7dde5026482f38083275ab8679c (diff) | |
download | krb5-5b169bc85d0ddcf7055e694d07cbb704021e6c3c.zip krb5-5b169bc85d0ddcf7055e694d07cbb704021e6c3c.tar.gz krb5-5b169bc85d0ddcf7055e694d07cbb704021e6c3c.tar.bz2 |
Removed all references to DECLARG and OLDDECLARG.
Added krb5_context to all krb5_routines.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4810 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, 9 insertions, 8 deletions
diff --git a/src/lib/krb5/krb/decrypt_tk.c b/src/lib/krb5/krb/decrypt_tk.c index 41ddd30..cd93328 100644 --- a/src/lib/krb5/krb/decrypt_tk.c +++ b/src/lib/krb5/krb/decrypt_tk.c @@ -41,9 +41,10 @@ */ krb5_error_code -krb5_decrypt_tkt_part(srv_key, ticket) -const krb5_keyblock *srv_key; -register krb5_ticket *ticket; +krb5_decrypt_tkt_part(context, srv_key, ticket) + krb5_context context; + const krb5_keyblock *srv_key; + register krb5_ticket *ticket; { krb5_enc_tkt_part *dec_tkt_part; krb5_encrypt_block eblock; @@ -55,31 +56,31 @@ register krb5_ticket *ticket; /* put together an eblock for this encryption */ - krb5_use_cstype(&eblock, ticket->enc_part.etype); + krb5_use_cstype(context, &eblock, ticket->enc_part.etype); 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(&eblock, srv_key); + retval = krb5_process_key(context, &eblock, srv_key); if (retval) { free(scratch.data); return(retval); } /* call the encryption routine */ - retval = krb5_decrypt((krb5_pointer) ticket->enc_part.ciphertext.data, + retval = krb5_decrypt(context, (krb5_pointer) ticket->enc_part.ciphertext.data, (krb5_pointer) scratch.data, scratch.length, &eblock, 0); if (retval) { - (void) krb5_finish_key(&eblock); + (void) krb5_finish_key(context, &eblock); free(scratch.data); return retval; } #define clean_scratch() {memset(scratch.data, 0, scratch.length); \ free(scratch.data);} - retval = krb5_finish_key(&eblock); + retval = krb5_finish_key(context, &eblock); if (retval) { clean_scratch(); |