diff options
| author | Theodore Tso <tytso@mit.edu> | 1998-12-05 05:17:49 +0000 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 1998-12-05 05:17:49 +0000 |
| commit | 928cc973cd9d83c22d49e3688d333acfe562bd00 (patch) | |
| tree | 7649abf23d247d5fdae566ad69650558d71a6cf6 /src/include | |
| parent | acdd404b3d9e8621bba9f0ef6c02ecfed63e865e (diff) | |
| download | krb5-928cc973cd9d83c22d49e3688d333acfe562bd00.tar.gz krb5-928cc973cd9d83c22d49e3688d333acfe562bd00.tar.xz krb5-928cc973cd9d83c22d49e3688d333acfe562bd00.zip | |
krb5.hin: Move krb4 function prototypes to krb54proto.h
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11065 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/ChangeLog | 4 | ||||
| -rw-r--r-- | src/include/krb5.hin | 29 | ||||
| -rw-r--r-- | src/include/krb54proto.h | 18 |
3 files changed, 23 insertions, 28 deletions
diff --git a/src/include/ChangeLog b/src/include/ChangeLog index 85dd28ffb..80fc6c49d 100644 --- a/src/include/ChangeLog +++ b/src/include/ChangeLog @@ -1,3 +1,7 @@ +1998-12-05 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * krb5.hin: Move krb4 function prototypes to krb54proto.h + 1998-12-04 Theodore Ts'o <tytso@rsts-11.mit.edu> * krb5.hin: Add function prototypes for the new realm iterator diff --git a/src/include/krb5.hin b/src/include/krb5.hin index 2d846138d..9e5b22c90 100644 --- a/src/include/krb5.hin +++ b/src/include/krb5.hin @@ -2397,32 +2397,5 @@ KRB5_DLLIMP void KRB5_CALLCONV krb5_realm_iterator_free KRB5_DLLIMP void KRB5_CALLCONV krb5_free_realm_string PROTOTYPE((krb5_context context, char *str)); -/* - * Kerberos V4 compatibility functions - */ -#ifndef __alpha -#define KRB5_K4_U32 unsigned long -#else -#define KRB5_K4_U32 unsigned int -#endif -typedef struct ktext *KTEXT; -typedef unsigned char des_cblock[8]; /* crypto-block size */ - -extern krb5_error_code krb54_get_service_keyblock - PROTOTYPE((char FAR *service, char FAR *instance, char FAR *realm, - int kvno, char FAR *file, - krb5_keyblock FAR * keyblock)); -extern int decomp_tkt_krb5 - PROTOTYPE((KTEXT tkt, unsigned char *flags, char *pname, - char *pinstance, char *prealm, KRB5_K4_U32 *paddress, - des_cblock session, int *life, KRB5_K4_U32 *time_sec, - char *sname, char *sinstance, krb5_keyblock *k5key)); -extern int krb_set_key_krb5 - PROTOTYPE ((krb5_context ctx, krb5_keyblock *key)); -void krb_clear_key_krb5 - PROTOTYPE ((krb5_context ctx)); - -#undef KRB5_K4_U32 - - #endif /* KRB5_GENERAL__ */ + diff --git a/src/include/krb54proto.h b/src/include/krb54proto.h new file mode 100644 index 000000000..8ba96faa6 --- /dev/null +++ b/src/include/krb54proto.h @@ -0,0 +1,18 @@ +/* + * Kerberos V 5/4 prototypes + */ + +extern krb5_error_code krb54_get_service_keyblock + PROTOTYPE((char FAR *service, char FAR *instance, char FAR *realm, + int kvno, char FAR *file, + krb5_keyblock FAR * keyblock)); +extern int decomp_tkt_krb5 + PROTOTYPE((KTEXT tkt, unsigned char *flags, char *pname, + char *pinstance, char *prealm, KRB5_K4_U32 *paddress, + des_cblock session, int *life, KRB5_K4_U32 *time_sec, + char *sname, char *sinstance, krb5_keyblock *k5key)); +extern int krb_set_key_krb5 + PROTOTYPE ((krb5_context ctx, krb5_keyblock *key)); +void krb_clear_key_krb5 + PROTOTYPE ((krb5_context ctx)); + |
