From: Greg Hudson Date: Thu, 29 Oct 2009 15:02:23 +0000 (+0000) Subject: Rename some lingering krb5_derive_key references X-Git-Tag: krb5-1.8-alpha1~249 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f2b39ea88130c6e969f31d4209b13082ea34512d;p=krb5.git Rename some lingering krb5_derive_key references git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23086 dc483132-0cff-0310-8789-dd5450dbe970 --- diff --git a/src/lib/crypto/crypto_tests/vectors.c b/src/lib/crypto/crypto_tests/vectors.c index e4a46be85..67235443c 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 0cf3f6f10..4f2692ab2 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 67cbf1397..288072abd 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);