diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/tests/verify/ChangeLog | 4 | ||||
| -rw-r--r-- | src/tests/verify/kdb5_verify.c | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/tests/verify/ChangeLog b/src/tests/verify/ChangeLog index 32c40e151..079c52edd 100644 --- a/src/tests/verify/ChangeLog +++ b/src/tests/verify/ChangeLog @@ -1,3 +1,7 @@ +Thu Nov 09 17:05:57 1995 Chris Provenzano (proven@mit.edu) + + * kdb5_verify.c : Remove krb5_enctype from krb5_string_to_key() args. + Wed Sep 06 14:20:57 1995 Chris Provenzano (proven@mit.edu) * kdb5_verify.c : s/keytype/enctype/g, s/KEYTYPE/ENCTYPE/g diff --git a/src/tests/verify/kdb5_verify.c b/src/tests/verify/kdb5_verify.c index 2c7967f17..4fe279595 100644 --- a/src/tests/verify/kdb5_verify.c +++ b/src/tests/verify/kdb5_verify.c @@ -255,12 +255,10 @@ check_princ(context, str_princ) goto out; } - retval = krb5_string_to_key(context, &master_encblock, master_keyblock.enctype, - &pwd_key, - &pwd, - &salt); - if (retval) { - com_err(progname, retval, "while converting password to key for '%s'", princ_name); + if (retval = krb5_string_to_key(context, &master_encblock, + &pwd_key, &pwd, &salt)) { + com_err(progname, retval, "while converting password to key for '%s'", + princ_name); goto out; } @@ -390,10 +388,8 @@ set_dbname_help(context, pname, dbname) com_err(pname, retval, "while calculated master key salt"); return(1); } - retval = krb5_string_to_key(context, &master_encblock, - master_keyblock.enctype, &master_keyblock, - &pwd, &scratch); - if (retval) { + if (retval = krb5_string_to_key(context, &master_encblock, + &master_keyblock, &pwd, &scratch)) { com_err(pname, retval, "while transforming master key from password"); return(1); |