* kdb5_mkdums.c : Remove krb5_enctype references, and replace with

                krb5_keytype where appropriate

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6689 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/tests/create/ChangeLog b/src/tests/create/ChangeLog
index 050a4202e93ba1642385cca4970af180fe9ef41e..d8393863b45cc6108d1df7c03900bb062fe1fa35 100644 (file)
--- a/src/tests/create/ChangeLog
+++ b/src/tests/create/ChangeLog
@@ -1,3 +1,7 @@
+Tue Sep 05 22:10:34 1995   Chris Provenzano (proven@mit.edu)
+
+        * kdb5_mkdums.c : Remove krb5_enctype references, and replace with
+                krb5_keytype where appropriate
 
 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-

diff --git a/src/tests/create/kdb5_mkdums.c b/src/tests/create/kdb5_mkdums.c
index 89f38090818421efee479ba9342a830596167e6c..a09fef5f4e9db2b47d26fb71e518c506768588ac 100644 (file)
--- a/src/tests/create/kdb5_mkdums.c
+++ b/src/tests/create/kdb5_mkdums.c
@@ -57,7 +57,7 @@ int status;
     fprintf(stderr,
            "usage: %s -p prefix -n num_to_create [-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);
 }
@@ -102,7 +102,6 @@ char *argv[];
     krb5_error_code retval;
     char *dbname = 0;
     int keytypedone = 0;
-    krb5_enctype etype = 0xffff;
     register krb5_cryptosystem_entry *csentry;
     extern krb5_kt_ops krb5_ktf_writable_ops;
     int num_to_create;
@@ -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;
@@ -181,16 +177,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(test_context, &master_encblock, etype);
+    krb5_use_keytype(test_context, &master_encblock, master_keyblock.keytype);
     csentry = master_encblock.crypto_entry;
 
     if (!dbname)