aboutsummaryrefslogtreecommitdiff
path: root/src/lib/crypto
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2009-10-29 15:02:23 +0000
committerGreg Hudson <ghudson@mit.edu>2009-10-29 15:02:23 +0000
commitf2b39ea88130c6e969f31d4209b13082ea34512d (patch)
tree44b48ec2b1615bcdc856e7c326b9d6f1aefe39c6 /src/lib/crypto
parent7bcf2b03b10d7bab75e5e0f7adc2b8c9283f34d1 (diff)
downloadkrb5-f2b39ea88130c6e969f31d4209b13082ea34512d.zip
krb5-f2b39ea88130c6e969f31d4209b13082ea34512d.tar.gz
krb5-f2b39ea88130c6e969f31d4209b13082ea34512d.tar.bz2
Rename some lingering krb5_derive_key references
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23086 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/crypto')
-rw-r--r--src/lib/crypto/crypto_tests/vectors.c2
-rw-r--r--src/lib/crypto/krb/combine_keys.c2
-rw-r--r--src/lib/crypto/krb/dk/dk.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/crypto/crypto_tests/vectors.c b/src/lib/crypto/crypto_tests/vectors.c
index e4a46be..6723544 100644
--- a/src/lib/crypto/crypto_tests/vectors.c
+++ b/src/lib/crypto/crypto_tests/vectors.c
@@ -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;
}
diff --git a/src/lib/crypto/krb/combine_keys.c b/src/lib/crypto/krb/combine_keys.c
index 0cf3f6f..4f2692a 100644
--- a/src/lib/crypto/krb/combine_keys.c
+++ b/src/lib/crypto/krb/combine_keys.c
@@ -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")
*
diff --git a/src/lib/crypto/krb/dk/dk.h b/src/lib/crypto/krb/dk/dk.h
index 67cbf13..288072a 100644
--- a/src/lib/crypto/krb/dk/dk.h
+++ b/src/lib/crypto/krb/dk/dk.h
@@ -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);