diff options
| author | Chris Provenzano <proven@mit.edu> | 1995-11-09 22:24:52 +0000 |
|---|---|---|
| committer | Chris Provenzano <proven@mit.edu> | 1995-11-09 22:24:52 +0000 |
| commit | 8f4c843d344e52ac60bdfc98e090dae272fe7cdc (patch) | |
| tree | fc9b3025326f1fbc4018f9e32f529c39010c9e70 /src/tests/verify/kdb5_verify.c | |
| parent | 3d6dddcaf6b603fb37b187c8d7aee7bc553d7afe (diff) | |
| download | krb5-8f4c843d344e52ac60bdfc98e090dae272fe7cdc.tar.gz krb5-8f4c843d344e52ac60bdfc98e090dae272fe7cdc.tar.xz krb5-8f4c843d344e52ac60bdfc98e090dae272fe7cdc.zip | |
* kdb5_verify.c : Remove krb5_enctype from krb5_string_to_key() args
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@7081 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/tests/verify/kdb5_verify.c')
| -rw-r--r-- | src/tests/verify/kdb5_verify.c | 16 |
1 files changed, 6 insertions, 10 deletions
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); |