From 575922660257014f7e5087db7690f732261cfc5d Mon Sep 17 00:00:00 2001 From: Theodore Tso Date: Tue, 8 Nov 1994 22:54:25 +0000 Subject: [PATCH] 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 --- src/tests/hammer/ChangeLog | 5 +++++ src/tests/hammer/kdc5_hammer.c | 9 ++++----- 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_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: -- 2.26.2