diff options
| author | Chris Provenzano <proven@mit.edu> | 1995-07-27 08:44:42 +0000 |
|---|---|---|
| committer | Chris Provenzano <proven@mit.edu> | 1995-07-27 08:44:42 +0000 |
| commit | 17a888de38b276e6fc5ed4420bced0465510ee19 (patch) | |
| tree | d301b5bbec4b43153559292d651ffd65f6143de3 /src/tests/verify | |
| parent | 4f0debdb553c49e68b36ee4e0ece3d2f32e4ae03 (diff) | |
| download | krb5-17a888de38b276e6fc5ed4420bced0465510ee19.tar.gz krb5-17a888de38b276e6fc5ed4420bced0465510ee19.tar.xz krb5-17a888de38b276e6fc5ed4420bced0465510ee19.zip | |
Use new kdb format
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6329 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/tests/verify')
| -rw-r--r-- | src/tests/verify/ChangeLog | 2 | ||||
| -rw-r--r-- | src/tests/verify/kdb5_verify.c | 14 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/tests/verify/ChangeLog b/src/tests/verify/ChangeLog index 5edc19280..9bb37c726 100644 --- a/src/tests/verify/ChangeLog +++ b/src/tests/verify/ChangeLog @@ -1,3 +1,5 @@ +Thu Jul 27 02:59:05 1995 Chris Provenzano (proven@mit.edu) + * kdb5_verify.c : Use new kdb format. Mon Jul 17 15:25:03 EDT 1995 Paul Park (pjpark@mit.edu) * kdb5_verify.c - Change setting of defaulted keytype to be DEFAULT_ diff --git a/src/tests/verify/kdb5_verify.c b/src/tests/verify/kdb5_verify.c index 696ad9e4d..6da1dee47 100644 --- a/src/tests/verify/kdb5_verify.c +++ b/src/tests/verify/kdb5_verify.c @@ -287,10 +287,8 @@ check_princ(context, str_princ) goto errout; } - retval = krb5_kdb_decrypt_key(context, &master_encblock, - &kdbe.key, - &db_key); - if (retval) { + if (retval = krb5_dbekd_decrypt_key_data(context, &master_encblock, + kdbe.key_data, &db_key, NULL)) { com_err(progname, retval, "while decrypting key for '%s'", princ_name); goto errout; } @@ -314,8 +312,8 @@ errout: free((char *)pwd_key.contents); free((char *)db_key.contents); - if (kdbe.kvno != 1) { - fprintf(stderr, "\tkvno did not match stored value for %s.\n", princ_name); + if (kdbe.key_data[0].key_data_kvno != 1) { + fprintf(stderr,"\tkvno did not match stored value for %s.\n", princ_name); goto errout; } @@ -344,6 +342,7 @@ errout: goto errout; } +/* if (retval = krb5_unparse_name(context, kdbe.mod_name, &str_mod_name)) com_err(progname, retval, "while unparsing mode name"); else { @@ -355,6 +354,7 @@ errout: } else free(str_mod_name); } +*/ if (kdbe.attributes != mblock.flags) { fprintf(stderr, "\tAttributes did not match stored value for %s.\n", @@ -469,7 +469,7 @@ set_dbname_help(context, pname, dbname) mblock.max_rlife = master_entry.max_renewable_life; mblock.expiration = master_entry.expiration; /* don't set flags, master has some extra restrictions */ - mblock.mkvno = master_entry.kvno; + mblock.mkvno = master_entry.key_data[0].key_data_kvno; krb5_db_free_principal(context, &master_entry, nentries); dbactive = TRUE; |