svn rev #23086: trunk/src/lib/crypto/ crypto_tests/ krb/ krb/dk/

[ghudson@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=23086
Commit By: ghudson
Log Message:
Rename some lingering krb5_derive_key references.


Changed Files:
U   trunk/src/lib/crypto/crypto_tests/vectors.c
U   trunk/src/lib/crypto/krb/combine_keys.c
U   trunk/src/lib/crypto/krb/dk/dk.h
Modified: trunk/src/lib/crypto/crypto_tests/vectors.c
===================================================================
--- trunk/src/lib/crypto/crypto_tests/vectors.c	2009-10-29 14:24:47 UTC (rev 23085)
+++ trunk/src/lib/crypto/crypto_tests/vectors.c	2009-10-29 15:02:23 UTC (rev 23086)
@@ -212,7 +212,7 @@
 
 void DK (krb5_keyblock *out, krb5_keyblock *in, const krb5_data *usage) {
     krb5_error_code r;
-    r = krb5_derive_key (enc, in, out, usage);
+    r = krb5int_derive_key (enc, in, out, usage);
     CHECK;
 }
 

Modified: trunk/src/lib/crypto/krb/combine_keys.c
===================================================================
--- trunk/src/lib/crypto/krb/combine_keys.c	2009-10-29 14:24:47 UTC (rev 23085)
+++ trunk/src/lib/crypto/krb/combine_keys.c	2009-10-29 15:02:23 UTC (rev 23086)
@@ -22,7 +22,7 @@
  * DR is defined as the generate "random" data from a key
  * (defined in crypto draft)
  *
- * DK is defined as the key derivation function (krb5_derive_key())
+ * DK is defined as the key derivation function (krb5int_derive_key())
  *
  * (note: | means "concatenate")
  *

Modified: trunk/src/lib/crypto/krb/dk/dk.h
===================================================================
--- trunk/src/lib/crypto/krb/dk/dk.h	2009-10-29 14:24:47 UTC (rev 23085)
+++ trunk/src/lib/crypto/krb/dk/dk.h	2009-10-29 15:02:23 UTC (rev 23086)
@@ -82,7 +82,7 @@
 				     const krb5_data *in_constant);
 
 krb5_error_code
-krb5_derive_key(const struct krb5_enc_provider *enc,
+krb5int_derive_key(const struct krb5_enc_provider *enc,
 				krb5_key inkey,
 				krb5_key *outkey,
 				const krb5_data *in_constant);