diff options
| author | Theodore Tso <tytso@mit.edu> | 1994-11-21 20:33:53 +0000 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 1994-11-21 20:33:53 +0000 |
| commit | 713fb98f15b22f626aa792a60f0e00f502a04456 (patch) | |
| tree | 9210ae111762a6758d03304ccbc755b41f8f5a8e /src/include | |
| parent | 701efdf4670d556f9164a87ce44939c2cd3f050d (diff) | |
| download | krb5-713fb98f15b22f626aa792a60f0e00f502a04456.tar.gz krb5-713fb98f15b22f626aa792a60f0e00f502a04456.tar.xz krb5-713fb98f15b22f626aa792a60f0e00f502a04456.zip | |
encode_kdc.c (krb5_encode_kdc_rep): Now requires that the
caller pass in the encryption block to be used for
encrpyting the ticket. That way, this routine doesn't
need to create its own encryption block.
encrypt_tk.c (krb5_encrypt_tkt_part): Now requires that the
caller pass in the encryption block to be used for
encrpyting the ticket. That way, this routine doesn't
need to create its own encryption block.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4710 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/krb5/ChangeLog | 9 | ||||
| -rw-r--r-- | src/include/krb5/encryption.h | 3 | ||||
| -rw-r--r-- | src/include/krb5/func-proto.h | 4 |
3 files changed, 15 insertions, 1 deletions
diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog index 8709b1a37..cd5855ddd 100644 --- a/src/include/krb5/ChangeLog +++ b/src/include/krb5/ChangeLog @@ -1,3 +1,12 @@ +Mon Nov 21 14:43:14 1994 Theodore Y. Ts'o (tytso@dcl) + + * func-proto.h (krb5_encode_kdc_rep, krb5_encrypt_tkt_part): + Change to use new function prototypes. + + * encryption.h (krb5_eblock_keytype, krb5_eblock_enctype): Define + new macros for finding the key type and encryption type of + an encrypion block. + Fri Nov 18 17:53:38 1994 Theodore Y. Ts'o (tytso@dcl) * kdb.h (KRB5_KDB_SUPPORT_DESMD5): Add new attribute which defines diff --git a/src/include/krb5/encryption.h b/src/include/krb5/encryption.h index 235b38ab4..b8978d7a9 100644 --- a/src/include/krb5/encryption.h +++ b/src/include/krb5/encryption.h @@ -193,6 +193,9 @@ extern int krb5_max_cksum; /* max entry in array */ #define krb5_finish_random_key(eblock, ptr) (*(eblock)->crypto_entry->finish_random_key)(ptr) #define krb5_random_key(eblock, ptr, keyblock) (*(eblock)->crypto_entry->random_key)(eblock, ptr, keyblock) +#define krb5_eblock_keytype(eblockp) ((eblockp)->crypto_entry->proto_keytype) +#define krb5_eblock_enctype(eblockp) ((eblockp)->crypto_entry->proto_enctype) + /* * Here's the stuff for the checksum switch: */ diff --git a/src/include/krb5/func-proto.h b/src/include/krb5/func-proto.h index faf9db40c..581994e4c 100644 --- a/src/include/krb5/func-proto.h +++ b/src/include/krb5/func-proto.h @@ -37,7 +37,8 @@ krb5_error_code krb5_encode_ticket PROTOTYPE((const krb5_ticket *, krb5_data ** )); krb5_error_code krb5_encrypt_tkt_part - PROTOTYPE((const krb5_keyblock *, + PROTOTYPE((krb5_encrypt_block *, + const krb5_keyblock *, krb5_ticket * )); krb5_error_code krb5_decrypt_tkt_part PROTOTYPE((const krb5_keyblock *, @@ -307,6 +308,7 @@ void krb5_free_tkt_authent krb5_error_code krb5_encode_kdc_rep PROTOTYPE((const krb5_msgtype, const krb5_enc_kdc_rep_part *, + krb5_encrypt_block *, const krb5_keyblock *, krb5_kdc_rep *, krb5_data ** )); |