string_to_key.c (krb5_c_string_to_key_with_params): Declare before use

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15231 dc483132-0cff-0310-8789-dd5450dbe970

2 files changed, 12 insertions, 1 deletions

diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog
index fae236d265..46db9b4ec1 100644
--- a/src/lib/crypto/ChangeLog
+++ b/src/lib/crypto/ChangeLog
@@ -8,8 +8,9 @@
 	Deleted.
 	* string_to_key.c (krb5_c_string_to_key_with_params): Renamed from
 	krb5_c_string_to_key, takes new params argument and passes it
-	through.
+	through.  Declare before use.
 	(krb5_c_string_to_key): New function, passes null params.
+
 	* t_pkcs5.c (test_pbkdf2_rfc3211): Update calls to
 	krb5int_pbkdf2_hmac_sha1 for new API.
 	* vectors.c (test_mit_des_s2k): Update krb5_des_string_to_key call
diff --git a/src/lib/crypto/string_to_key.c b/src/lib/crypto/string_to_key.c
index cccfd1c1a3..c9434e08da 100644
--- a/src/lib/crypto/string_to_key.c
+++ b/src/lib/crypto/string_to_key.c
@@ -27,6 +27,16 @@
 #include "k5-int.h"
 #include "etypes.h"
 
+/* Eventually this declaration should move to krb5.h.  */
+krb5_error_code KRB5_CALLCONV
+krb5_c_string_to_key_with_params(krb5_context context,
+				 krb5_enctype enctype,
+				 const krb5_data *string,
+				 const krb5_data *salt,
+				 const krb5_data *params,
+				 krb5_keyblock *key);
+
+
 krb5_error_code KRB5_CALLCONV
 krb5_c_string_to_key(context, enctype, string, salt, key)
      krb5_context context;