svn rev #23112: trunk/src/ include/ lib/crypto/krb/

[ghudson@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=23112
Commit By: ghudson
Log Message:
Move the implementations of four deprecated crypto functions to
old_api_glue.c.  Move the prototypes of seven deprecated crypto
functions to old_api_glue.c instead of k5-int.h, since we don't use
those functions internally.



Changed Files:
U   trunk/src/include/k5-int.h
U   trunk/src/lib/crypto/krb/coll_proof_cksum.c
U   trunk/src/lib/crypto/krb/keyed_cksum.c
U   trunk/src/lib/crypto/krb/old_api_glue.c
U   trunk/src/lib/crypto/krb/valid_cksumtype.c
U   trunk/src/lib/crypto/krb/valid_enctype.c
Modified: trunk/src/include/k5-int.h
===================================================================
--- trunk/src/include/k5-int.h	2009-11-01 02:46:36 UTC (rev 23111)
+++ trunk/src/include/k5-int.h	2009-11-01 02:47:58 UTC (rev 23112)
@@ -2574,29 +2574,6 @@
 		char *,
 		size_t);
 
-/* Use the above four instead.  */
-krb5_boolean KRB5_CALLCONV valid_enctype
-	(krb5_enctype ktype);
-krb5_boolean KRB5_CALLCONV valid_cksumtype
-	(krb5_cksumtype ctype);
-krb5_boolean KRB5_CALLCONV is_coll_proof_cksum
-	(krb5_cksumtype ctype);
-krb5_boolean KRB5_CALLCONV is_keyed_cksum
-	(krb5_cksumtype ctype);
-
-krb5_error_code KRB5_CALLCONV krb5_random_confounder
-	(size_t, krb5_pointer);
-
-krb5_error_code krb5_encrypt_data
-	(krb5_context context, krb5_keyblock *key,
-		krb5_pointer ivec, krb5_data *data,
-		krb5_enc_data *enc_data);
-
-krb5_error_code krb5_decrypt_data
-	(krb5_context context, krb5_keyblock *key,
-		krb5_pointer ivec, krb5_enc_data *data,
-		krb5_data *enc_data);
-
 krb5_error_code
 krb5int_aes_encrypt(krb5_key key, const krb5_data *ivec,
 		    const krb5_data *input, krb5_data *output);

Modified: trunk/src/lib/crypto/krb/coll_proof_cksum.c
===================================================================
--- trunk/src/lib/crypto/krb/coll_proof_cksum.c	2009-11-01 02:46:36 UTC (rev 23111)
+++ trunk/src/lib/crypto/krb/coll_proof_cksum.c	2009-11-01 02:47:58 UTC (rev 23112)
@@ -42,9 +42,3 @@
        old code would have done */
     return FALSE;
 }
-
-krb5_boolean KRB5_CALLCONV
-is_coll_proof_cksum(krb5_cksumtype ctype)
-{
-    return krb5_c_is_coll_proof_cksum(ctype);
-}

Modified: trunk/src/lib/crypto/krb/keyed_cksum.c
===================================================================
--- trunk/src/lib/crypto/krb/keyed_cksum.c	2009-11-01 02:46:36 UTC (rev 23111)
+++ trunk/src/lib/crypto/krb/keyed_cksum.c	2009-11-01 02:47:58 UTC (rev 23112)
@@ -44,9 +44,3 @@
     /* Invalid ctype.  This is misleading, but better than dumping core. */
     return FALSE;
 }
-
-krb5_boolean KRB5_CALLCONV
-is_keyed_cksum(krb5_cksumtype ctype)
-{
-    return krb5_c_is_keyed_cksum(ctype);
-}

Modified: trunk/src/lib/crypto/krb/old_api_glue.c
===================================================================
--- trunk/src/lib/crypto/krb/old_api_glue.c	2009-11-01 02:46:36 UTC (rev 23111)
+++ trunk/src/lib/crypto/krb/old_api_glue.c	2009-11-01 02:47:58 UTC (rev 23112)
@@ -26,6 +26,24 @@
 
 #include "k5-int.h"
 
+/*
+ * The following functions were removed from the API in krb5 1.3 but
+ * still need to be exported for ABI compatibility.  The other
+ * functions defined in this file are still in the API (and thus
+ * prototyped in krb5.hin) but are deprecated.
+ */
+krb5_boolean KRB5_CALLCONV valid_enctype(krb5_enctype ktype);
+krb5_boolean KRB5_CALLCONV valid_cksumtype(krb5_cksumtype ctype);
+krb5_boolean KRB5_CALLCONV is_coll_proof_cksum(krb5_cksumtype ctype);
+krb5_boolean KRB5_CALLCONV is_keyed_cksum(krb5_cksumtype ctype);
+krb5_error_code KRB5_CALLCONV krb5_random_confounder(size_t, krb5_pointer);
+krb5_error_code krb5_encrypt_data(krb5_context context, krb5_keyblock *key,
+				  krb5_pointer ivec, krb5_data *data,
+				  krb5_enc_data *enc_data);
+krb5_error_code krb5_decrypt_data(krb5_context context, krb5_keyblock *key,
+				  krb5_pointer ivec, krb5_enc_data *data,
+				  krb5_data *enc_data);
+
 krb5_error_code KRB5_CALLCONV
 krb5_encrypt(krb5_context context, krb5_const_pointer inptr,
 	     krb5_pointer outptr, size_t size, krb5_encrypt_block *eblock,
@@ -341,3 +359,27 @@
 
     return 0;
 }
+
+krb5_boolean KRB5_CALLCONV
+valid_cksumtype(krb5_cksumtype ctype)
+{
+    return krb5_c_valid_cksumtype(ctype);
+}
+
+krb5_boolean KRB5_CALLCONV
+is_keyed_cksum(krb5_cksumtype ctype)
+{
+    return krb5_c_is_keyed_cksum(ctype);
+}
+
+krb5_boolean KRB5_CALLCONV
+is_coll_proof_cksum(krb5_cksumtype ctype)
+{
+    return krb5_c_is_coll_proof_cksum(ctype);
+}
+
+krb5_boolean KRB5_CALLCONV
+valid_enctype(krb5_enctype etype)
+{
+    return krb5_c_valid_enctype(etype);
+}

Modified: trunk/src/lib/crypto/krb/valid_cksumtype.c
===================================================================
--- trunk/src/lib/crypto/krb/valid_cksumtype.c	2009-11-01 02:46:36 UTC (rev 23111)
+++ trunk/src/lib/crypto/krb/valid_cksumtype.c	2009-11-01 02:47:58 UTC (rev 23112)
@@ -39,9 +39,3 @@
 
     return FALSE;
 }
-
-krb5_boolean KRB5_CALLCONV
-valid_cksumtype(krb5_cksumtype ctype)
-{
-    return krb5_c_valid_cksumtype(ctype);
-}

Modified: trunk/src/lib/crypto/krb/valid_enctype.c
===================================================================
--- trunk/src/lib/crypto/krb/valid_enctype.c	2009-11-01 02:46:36 UTC (rev 23111)
+++ trunk/src/lib/crypto/krb/valid_enctype.c	2009-11-01 02:47:58 UTC (rev 23112)
@@ -34,12 +34,6 @@
 }
 
 krb5_boolean KRB5_CALLCONV
-valid_enctype(krb5_enctype etype)
-{
-    return krb5_c_valid_enctype(etype);
-}
-
-krb5_boolean KRB5_CALLCONV
 krb5int_c_weak_enctype(krb5_enctype etype)
 {
     const struct krb5_keytypes *ktp;