diff options
| author | Chris Provenzano <proven@mit.edu> | 1995-09-06 03:47:59 +0000 |
|---|---|---|
| committer | Chris Provenzano <proven@mit.edu> | 1995-09-06 03:47:59 +0000 |
| commit | 6718a3ee9c286e2a314f65a17c83602d900b77a7 (patch) | |
| tree | eb2aa5cb726de6d5a44573a403d61bb5245f6d6e /src/tests | |
| parent | 2b538ea7285c1644c813662c94fe1b65a18c914e (diff) | |
| download | krb5-6718a3ee9c286e2a314f65a17c83602d900b77a7.tar.gz krb5-6718a3ee9c286e2a314f65a17c83602d900b77a7.tar.xz krb5-6718a3ee9c286e2a314f65a17c83602d900b77a7.zip | |
* kdb5_verify.c : Remove krb5_enctype references, and replace with
krb5_keytype where appropriate
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6691 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/tests')
| -rw-r--r-- | src/tests/verify/ChangeLog | 4 | ||||
| -rw-r--r-- | src/tests/verify/kdb5_verify.c | 17 |
2 files changed, 6 insertions, 15 deletions
diff --git a/src/tests/verify/ChangeLog b/src/tests/verify/ChangeLog index 0dfb6fa70..567d7120d 100644 --- a/src/tests/verify/ChangeLog +++ b/src/tests/verify/ChangeLog @@ -1,3 +1,7 @@ +Tue Sep 05 22:10:34 1995 Chris Provenzano (proven@mit.edu) + + * kdb5_verify.c : Remove krb5_enctype references, and replace with + krb5_keytype where appropriate Thu Jul 27 15:31:18 EDT 1995 Paul Park (pjpark@mit.edu) * kdb5_verify.c - Restore old logic to find the etype now that crypto- diff --git a/src/tests/verify/kdb5_verify.c b/src/tests/verify/kdb5_verify.c index 0b66ab336..7e9bcbb43 100644 --- a/src/tests/verify/kdb5_verify.c +++ b/src/tests/verify/kdb5_verify.c @@ -56,7 +56,7 @@ int status; fprintf(stderr, "usage: %s -p prefix -n num_to_check [-d dbpathname] [-r realmname]\n", who); - fprintf(stderr, "\t [-D depth] [-k keytype] [-e etype] [-M mkeyname]\n"); + fprintf(stderr, "\t [-D depth] [-k keytype] [-M mkeyname]\n"); exit(status); } @@ -103,7 +103,6 @@ char *argv[]; krb5_error_code retval; char *dbname = 0; int keytypedone = 0; - krb5_enctype etype = 0xffff; register krb5_cryptosystem_entry *csentry; int num_to_check; char principal_string[BUFSIZ]; @@ -150,9 +149,6 @@ char *argv[]; case 'M': /* master key name in DB */ mkey_name = optarg; break; - case 'e': - etype = atoi(optarg); - break; case 'm': manual_mkey = TRUE; break; @@ -174,16 +170,7 @@ char *argv[]; exit(1); } - if (etype == 0xffff) - etype = krb5_keytype_array[master_keyblock.keytype]-> - system->proto_enctype; - - if (!valid_etype(etype)) { - com_err(progname, KRB5_PROG_ETYPE_NOSUPP, - "while setting up etype %d", etype); - exit(1); - } - krb5_use_cstype(context, &master_encblock, etype); + krb5_use_keytype(context, &master_encblock, master_keyblock.keytype); csentry = master_encblock.crypto_entry; if (!dbname) |