diff options
| author | Chris Provenzano <proven@mit.edu> | 1995-09-06 03:24:09 +0000 |
|---|---|---|
| committer | Chris Provenzano <proven@mit.edu> | 1995-09-06 03:24:09 +0000 |
| commit | 392ee00fb85a036d54db7eb67314a18c33992f2e (patch) | |
| tree | 2daf408d33328b6e381a1345f5819918832a6225 /src | |
| parent | 786ee05faae7d2de13c88789cbfce4e77bc8733c (diff) | |
| download | krb5-392ee00fb85a036d54db7eb67314a18c33992f2e.tar.gz krb5-392ee00fb85a036d54db7eb67314a18c33992f2e.tar.xz krb5-392ee00fb85a036d54db7eb67314a18c33992f2e.zip | |
* adm_proto.h : Remove krb5_enctype references, and replace with
krb5_keytype where appropriate.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6668 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/krb5/ChangeLog | 5 | ||||
| -rw-r--r-- | src/include/krb5/adm.h | 7 | ||||
| -rw-r--r-- | src/include/krb5/adm_proto.h | 4 |
3 files changed, 7 insertions, 9 deletions
diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog index 729dcc222..2ad8a0995 100644 --- a/src/include/krb5/ChangeLog +++ b/src/include/krb5/ChangeLog @@ -1,4 +1,9 @@ +Tue Sep 05 22:10:34 1995 Chris Provenzano (proven@mit.edu) + + * adm_proto.h : Remove krb5_enctype references, and replace with + krb5_keytype where appropriate. + Thu Aug 31 11:38:58 EDT 1995 Paul Park (pjpark@mit.edu) * configure.in - Add checks for stddef.h and xom.h for use by GSSAPI-V2 diff --git a/src/include/krb5/adm.h b/src/include/krb5/adm.h index c7da15621..b2aa6b580 100644 --- a/src/include/krb5/adm.h +++ b/src/include/krb5/adm.h @@ -162,9 +162,8 @@ #define KRB5_ADM_KT_TIMESTAMP 1 #define KRB5_ADM_KT_VNO 2 #define KRB5_ADM_KT_KEY_KEYTYPE 3 -#define KRB5_ADM_KT_KEY_ETYPE 4 -#define KRB5_ADM_KT_KEY_KEY 5 -#define KRB5_ADM_KT_NCOMPS 6 +#define KRB5_ADM_KT_KEY_KEY 4 +#define KRB5_ADM_KT_NCOMPS 5 typedef struct __krb5_key_salt_tuple { krb5_keytype ks_keytype; @@ -183,7 +182,6 @@ typedef struct __krb5_realm_params { krb5_int32 realm_kdc_sport; krb5_int32 realm_kadmind_port; krb5_keytype realm_keytype; - krb5_enctype realm_enctype; krb5_deltat realm_max_life; krb5_deltat realm_max_rlife; krb5_timestamp realm_expiration; @@ -193,7 +191,6 @@ typedef struct __krb5_realm_params { unsigned int realm_kdc_sport_valid:1; unsigned int realm_kadmind_port_valid:1; unsigned int realm_keytype_valid:1; - unsigned int realm_enctype_valid:1; unsigned int realm_max_life_valid:1; unsigned int realm_max_rlife_valid:1; unsigned int realm_expiration_valid:1; diff --git a/src/include/krb5/adm_proto.h b/src/include/krb5/adm_proto.h index 842ae5281..ff97b370a 100644 --- a/src/include/krb5/adm_proto.h +++ b/src/include/krb5/adm_proto.h @@ -171,8 +171,6 @@ krb5_string_to_keytype KRB5_PROTOTYPE((char *, krb5_keytype *)); krb5_error_code krb5_string_to_salttype KRB5_PROTOTYPE((char *, krb5_int32 *)); krb5_error_code -krb5_string_to_enctype KRB5_PROTOTYPE((char *, krb5_enctype *)); -krb5_error_code krb5_string_to_cksumtype KRB5_PROTOTYPE((char *, krb5_cksumtype *)); krb5_error_code krb5_string_to_flags KRB5_PROTOTYPE((char *, @@ -188,8 +186,6 @@ krb5_keytype_to_string KRB5_PROTOTYPE((krb5_keytype, char *, size_t)); krb5_error_code krb5_salttype_to_string KRB5_PROTOTYPE((krb5_int32, char *, size_t)); krb5_error_code -krb5_enctype_to_string KRB5_PROTOTYPE((krb5_enctype, char *, size_t)); -krb5_error_code krb5_cksumtype_to_string KRB5_PROTOTYPE((krb5_cksumtype, char *, size_t)); krb5_error_code krb5_flags_to_string KRB5_PROTOTYPE((krb5_flags, |