Rename some lingering krb5_derive_key references
authorGreg Hudson <ghudson@mit.edu>
Thu, 29 Oct 2009 15:02:23 +0000 (15:02 +0000)
committerGreg Hudson <ghudson@mit.edu>
Thu, 29 Oct 2009 15:02:23 +0000 (15:02 +0000)
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23086 dc483132-0cff-0310-8789-dd5450dbe970

src/lib/crypto/crypto_tests/vectors.c
src/lib/crypto/krb/combine_keys.c
src/lib/crypto/krb/dk/dk.h

index e4a46be850c4fad3c308ea3e8e18ed3452ec2733..67235443c1665c212ba165f55c781993aa9a3d84 100644 (file)
@@ -212,7 +212,7 @@ extern struct krb5_enc_provider krb5int_enc_aes128, krb5int_enc_aes256;
 
 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;
 }
 
index 0cf3f6f10aefda86c1c91c3a18f8dc1c3861a0f9..4f2692ab21da23c5ed0366798af2ad643ffc297d 100644 (file)
@@ -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")
  *
index 67cbf1397de0aabf5c9fb5d03cb56f32fb5ecabc..288072abdcecaa16e0d386eff0c193ee25d10a27 100644 (file)
@@ -82,7 +82,7 @@ krb5int_derive_keyblock(const struct krb5_enc_provider *enc,
                                     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);