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

                krb5_keytype where appropriate

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

diff --git a/src/tests/hammer/ChangeLog b/src/tests/hammer/ChangeLog
index 001a008f397bf527e2ee95cf7590eacaa51e398d..ff035654a6c3544196ad033449a673a3080a8200 100644 (file)
--- a/src/tests/hammer/ChangeLog
+++ b/src/tests/hammer/ChangeLog
@@ -1,3 +1,7 @@
+Tue Sep 05 22:10:34 1995   Chris Provenzano (proven@mit.edu)
+
+        * kdc5_hammer.c : Remove krb5_enctype references, and replace with
+                krb5_keytype where appropriate
 
 Wed Jul 12 12:31:51 EDT 1995   Paul Park       (pjpark@mit.edu)
        * configure.in - Remove V5_USE_SHARED_LIB

diff --git a/src/tests/hammer/kdc5_hammer.c b/src/tests/hammer/kdc5_hammer.c
index 89f9b2986c84dc3e72940068453c1c4f1a1e43aa..fd69919fd02b4e9241680a695cf90680e634e34c 100644 (file)
--- a/src/tests/hammer/kdc5_hammer.c
+++ b/src/tests/hammer/kdc5_hammer.c
@@ -87,14 +87,13 @@ 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]\n");
+    fprintf(stderr, "\t [-D depth] [-k keytype]\n");
     fprintf(stderr, "\t [-P preauth type] [-R repeat_count]\n");
 
     exit(status);
 }
 
 static krb5_preauthtype * patype = NULL, patypedata[2] = { 0, -1 };
-static krb5_enctype etype = 0xffff;
 static krb5_context test_context;
 static krb5_keytype keytype;
 
@@ -177,9 +176,6 @@ main(argc, argv)
            keytype = atoi(optarg);
            keytypedone++;
            break;
-       case 'e':
-           etype = atoi(optarg);
-           break;
        case 'P':
            patypedata[0] = atoi(optarg);
            patype = patypedata;
@@ -223,15 +219,6 @@ main(argc, argv)
       exit(1);
     }
 
-    if (etype == 0xffff)
-       etype = krb5_keytype_array[keytype]->system->proto_enctype;
-
-    if (!valid_etype(etype)) {
-       com_err(prog, KRB5_PROG_ETYPE_NOSUPP,
-               "while setting up etype %d", etype);
-       exit(1);
-    }
-
     if (ccache == NULL) {
        if (code = krb5_cc_default(test_context, &ccache)) {
            com_err(prog, code, "while getting default ccache");