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

diff --git a/src/tests/create/ChangeLog b/src/tests/create/ChangeLog
index b7a251db3acaedff9cdc04fb7dfcca06d7b830dc..050a4202e93ba1642385cca4970af180fe9ef41e 100644 (file)
--- 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 1b44a14aa50693251ddee0ede0601bb53415faaa..89f38090818421efee479ba9342a830596167e6c 100644 (file)
--- 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 9bb37c72687d4d09c19d6b4bb8794629e7b5beca..0dfb6fa70a9cc01f2910bf0a82c96c0a1016fb94 100644 (file)
--- 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 6da1dee47ac102cb62c16e2c8de920425198cab6..0b66ab336f75870a562d808d99eadecb65a883e8 100644 (file)
--- 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,