misc fixes

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/marc-3des@10780 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/include/krb5.hin b/src/include/krb5.hin
index 42aef123706376e4a4ca15274e172c62fdfbb41b..75c4c7fba990aa761cd35b98f7d13919dbeea990 100644 (file)
--- a/src/include/krb5.hin
+++ b/src/include/krb5.hin
@@ -421,17 +421,11 @@ KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
     KRB5_PROTOTYPE((krb5_context context, krb5_cksumtype cksumtype,
                    size_t *length));
 
-KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
-    krb5_c_num_keyed_checksum_types
-    KRB5_PROTOTYPE((krb5_context context, krb5_enctype enctype, 
-                   unsigned int *count));
-
 KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
     krb5_c_keyed_checksum_types
     KRB5_PROTOTYPE((krb5_context context, krb5_enctype enctype, 
                    unsigned int count, krb5_cksumtype *cksumtypes));
 
-
 #define KRB5_KEYUSAGE_AS_REQ_PA_ENC_TS         1
 #define KRB5_KEYUSAGE_KDC_REP_TICKET           2
 #define KRB5_KEYUSAGE_AS_REP_ENCPART           3
@@ -458,7 +452,7 @@ KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 
 #define KRB5_KEYUSAGE_GSS_TOK_MIC              22
 #define KRB5_KEYUSAGE_GSS_TOK_WRAP_INTEG       23
-#define KRB5_KEYUSAGE_GSS_TOK_WRAP_PRIVINTEG   24
+#define KRB5_KEYUSAGE_GSS_TOK_WRAP_PRIV                24
 
 
 krb5_boolean KRB5_CALLCONV valid_enctype
@@ -1740,6 +1734,8 @@ KRB5_DLLIMP void KRB5_CALLCONV krb5_free_cred_enc_part
        KRB5_PROTOTYPE((krb5_context, krb5_cred_enc_part FAR *));
 KRB5_DLLIMP void KRB5_CALLCONV krb5_free_checksum
        KRB5_PROTOTYPE((krb5_context, krb5_checksum FAR *));
+KRB5_DLLIMP void KRB5_CALLCONV krb5_free_checksum_contents
+       KRB5_PROTOTYPE((krb5_context, krb5_checksum FAR *));
 KRB5_DLLIMP void KRB5_CALLCONV krb5_free_keyblock
        KRB5_PROTOTYPE((krb5_context, krb5_keyblock FAR *));
 KRB5_DLLIMP void KRB5_CALLCONV krb5_free_keyblock_contents
@@ -1760,6 +1756,8 @@ KRB5_DLLIMP void KRB5_CALLCONV krb5_free_data_contents
        KRB5_PROTOTYPE((krb5_context, krb5_data FAR *));
 KRB5_DLLIMP void KRB5_CALLCONV krb5_free_unparsed_name
        KRB5_PROTOTYPE((krb5_context, char FAR *));
+KRB5_DLLIMP void KRB5_CALLCONV krb5_free_cksumtypes
+       KRB5_PROTOTYPE((krb5_context, krb5_cksumtype FAR *));
 
 /* From krb5/os but needed but by the outside world */
 KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_us_timeofday