summaryrefslogtreecommitdiffstats
path: root/src/tests/hammer
diff options
context:
space:
mode:
authorTheodore Tso <tytso@mit.edu>1994-11-08 22:54:25 +0000
committerTheodore Tso <tytso@mit.edu>1994-11-08 22:54:25 +0000
commit575922660257014f7e5087db7690f732261cfc5d (patch)
tree7e0cb3de7e09f61764a0bb870ce1156c623bef34 /src/tests/hammer
parent8c71a1d287774a82495a07f66e141537986d4d29 (diff)
downloadkrb5-575922660257014f7e5087db7690f732261cfc5d.tar.gz
krb5-575922660257014f7e5087db7690f732261cfc5d.tar.xz
krb5-575922660257014f7e5087db7690f732261cfc5d.zip
Use the published interface to call krb5_string_to_key()
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4648 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/tests/hammer')
-rw-r--r--src/tests/hammer/ChangeLog5
-rw-r--r--src/tests/hammer/kdc5_hammer.c9
2 files changed, 9 insertions, 5 deletions
diff --git a/src/tests/hammer/ChangeLog b/src/tests/hammer/ChangeLog
index 5b4e86eba..be5d863b1 100644
--- a/src/tests/hammer/ChangeLog
+++ b/src/tests/hammer/ChangeLog
@@ -1,3 +1,8 @@
+Tue Nov 8 17:53:40 1994 Theodore Y. Ts'o (tytso@dcl)
+
+ * kdc5_hammer.c (get_server_key): Use the published interface to
+ call krb5_string_to_key().
+
Sun Oct 23 01:44:37 1994 (tytso@rsx-11)
* kdc5_hammer.c (main): Allow kdc_hammer to be called on an
diff --git a/src/tests/hammer/kdc5_hammer.c b/src/tests/hammer/kdc5_hammer.c
index 2dbd7fd02..0fcf4d099 100644
--- a/src/tests/hammer/kdc5_hammer.c
+++ b/src/tests/hammer/kdc5_hammer.c
@@ -263,6 +263,7 @@ OLDDECLARG(krb5_kvno,vno)
OLDDECLARG(krb5_keyblock **,key)
#include <krb5/narrow.h>
{
+ krb5_encrypt_block eblock;
krb5_data pwd, salt;
char *princ_str, *at;
krb5_error_code code;
@@ -294,11 +295,9 @@ OLDDECLARG(krb5_keyblock **,key)
com_err(prog, code, "while allocating key for server %s", princ_str);
goto errout;
}
- if (code = (*krb5_keytype_array[keytype]->system->
- string_to_key)(keytype,
- *key,
- &pwd,
- &salt))
+ krb5_use_keytype(&eblock, keytype);
+ code = krb5_string_to_key(&eblock, keytype, *key, &pwd, &salt);
+ if (code)
goto errout;
out: