aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@mit.edu>2003-03-05 04:00:09 +0000
committerKen Raeburn <raeburn@mit.edu>2003-03-05 04:00:09 +0000
commit32828edef9de2f5b41492467439160a3888ae083 (patch)
treee12c9f191d8c8728757fb44e9d660d5881d2c2e0
parent358083bde516dafb4806d38861ab1f532d687274 (diff)
downloadkrb5-32828edef9de2f5b41492467439160a3888ae083.zip
krb5-32828edef9de2f5b41492467439160a3888ae083.tar.gz
krb5-32828edef9de2f5b41492467439160a3888ae083.tar.bz2
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
-rw-r--r--src/lib/crypto/ChangeLog3
-rw-r--r--src/lib/crypto/string_to_key.c10
2 files changed, 12 insertions, 1 deletions
diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog
index fae236d..46db9b4 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 cccfd1c..c9434e0 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;