From 92296ff3d57b2241cdb14b5337646714f89466f6 Mon Sep 17 00:00:00 2001 From: Paul Park Date: Thu, 27 Jul 1995 19:54:43 +0000 Subject: [PATCH] Get etype from keytype via table instead of DEFAULT_KDC_ETYPE git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6355 dc483132-0cff-0310-8789-dd5450dbe970 --- src/tests/create/ChangeLog | 5 +++++ src/tests/create/kdb5_mkdums.c | 3 ++- src/tests/verify/ChangeLog | 5 +++++ src/tests/verify/kdb5_verify.c | 3 ++- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/tests/create/ChangeLog b/src/tests/create/ChangeLog index b7a251db3..050a4202e 100644 --- a/src/tests/create/ChangeLog +++ b/src/tests/create/ChangeLog @@ -1,3 +1,8 @@ + +Thu Jul 27 15:30:09 EDT 1995 Paul Park (pjpark@mit.edu) + * kdb5_mkdums.c - Restore old logic to find the etype now that crypto- + conf.c is correctly generated. + Thu Jul 27 02:59:05 1995 Chris Provenzano (proven@mit.edu) * kdb5_mkdums.c : Use new kdb format. diff --git a/src/tests/create/kdb5_mkdums.c b/src/tests/create/kdb5_mkdums.c index 1b44a14aa..89f380908 100644 --- a/src/tests/create/kdb5_mkdums.c +++ b/src/tests/create/kdb5_mkdums.c @@ -182,7 +182,8 @@ char *argv[]; } if (etype == 0xffff) - etype = DEFAULT_KDC_ETYPE; + etype = krb5_keytype_array[master_keyblock.keytype]-> + system->proto_enctype; if (!valid_etype(etype)) { com_err(progname, KRB5_PROG_ETYPE_NOSUPP, diff --git a/src/tests/verify/ChangeLog b/src/tests/verify/ChangeLog index 9bb37c726..0dfb6fa70 100644 --- a/src/tests/verify/ChangeLog +++ b/src/tests/verify/ChangeLog @@ -1,3 +1,8 @@ + +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- + conf.c is correctly generated. + Thu Jul 27 02:59:05 1995 Chris Provenzano (proven@mit.edu) * kdb5_verify.c : Use new kdb format. diff --git a/src/tests/verify/kdb5_verify.c b/src/tests/verify/kdb5_verify.c index 6da1dee47..0b66ab336 100644 --- a/src/tests/verify/kdb5_verify.c +++ b/src/tests/verify/kdb5_verify.c @@ -175,7 +175,8 @@ char *argv[]; } if (etype == 0xffff) - etype = DEFAULT_KDC_ETYPE; + etype = krb5_keytype_array[master_keyblock.keytype]-> + system->proto_enctype; if (!valid_etype(etype)) { com_err(progname, KRB5_PROG_ETYPE_NOSUPP, -- 2.26.2