[1569] in Kerberos-V5-bugs

home help back first fref pref prev next nref lref last post

[beta5] Tests fail if DEFAULT_KDC_ETYPE is ETYPE_DES_CBC_MD5

daemon@ATHENA.MIT.EDU (Michael Shields)
Tue Jul 25 09:42:00 1995

From: shields@tembel.org (Michael Shields)
To: krb5-bugs@MIT.EDU
Date: Tue, 25 Jul 1995 13:30:50 +0000 (GMT)

Tests will fail if DEFAULT_KDC_ETYPE is #defined to ETYPE_DES_CBC_MD5,
because some tests will try to decrpyt the master database using
ETYPE_DES_CBC_CRC.  This fixes that.

Index: src/tests/create/ChangeLog
===================================================================
RCS file: /usr/src/master/security/kerberos/src/tests/create/ChangeLog,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 ChangeLog
--- ChangeLog	1995/07/18 06:24:16	1.1.1.1
+++ ChangeLog	1995/07/25 13:28:12
@@ -1,3 +1,13 @@
+Tue Jul 25 13:24:02 1995  Michael Shields  <shields@tembel.org>
+
+	* kdb5_mkdums.c (main): Indent arguments, to keep Emacs happy.
+
+	* kdb5_mkdums.c (main): Use DEFAULT_KDC_ETYPE, not
+	krb5_keytype_array[master_keyblock.keytype]->system->proto_enctype,
+	as the default etype.  This what kdb5_create, kdb5_edit, &c. use;
+	if we're inconsistent, and the DEFAULT_KDC_ETYPE is
+	ETYPE_DES_CBC_MD5, the checks will fail.
+
 Fri Mar 31 17:05:49 1995  Theodore Y. Ts'o  (tytso@dcl)
 
 	* kdb5_mkdums.c (add_princ): Zero out the entry before inserting it.
Index: src/tests/create/kdb5_mkdums.c
===================================================================
RCS file: /usr/src/master/security/kerberos/src/tests/create/kdb5_mkdums.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 kdb5_mkdums.c
--- kdb5_mkdums.c	1995/07/18 06:24:16	1.1.1.1
+++ kdb5_mkdums.c	1995/07/25 13:28:12
@@ -92,8 +92,8 @@
 
 void
 main(argc, argv)
-int argc;
-char *argv[];
+    int argc;
+    char *argv[];
 {
     extern char *optarg;	
     int optchar, i, n;
@@ -182,7 +182,7 @@
     }
 
     if (etype == 0xffff)
-	etype = krb5_keytype_array[master_keyblock.keytype]->system->proto_enctype;
+	etype = DEFAULT_KDC_ETYPE;
 
     if (!valid_etype(etype)) {
 	com_err(progname, KRB5_PROG_ETYPE_NOSUPP,
Index: src/tests/hammer/ChangeLog
===================================================================
RCS file: /usr/src/master/security/kerberos/src/tests/hammer/ChangeLog,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 ChangeLog
--- ChangeLog	1995/07/18 06:24:18	1.1.1.1
+++ ChangeLog	1995/07/25 13:28:12
@@ -1,3 +1,11 @@
+Tue Jul 25 13:26:43 1995  Michael Shields  <shields@tembel.org>
+
+	* kdb5_mkdums.c (main): Use DEFAULT_KDC_ETYPE, not
+ 	krb5_keytype_array[master_keyblock.keytype]->system->proto_enctype,
+ 	as the default etype.  This what kdb5_create, kdb5_edit, &c. use;
+ 	if we're inconsistent, and the DEFAULT_KDC_ETYPE is
+ 	ETYPE_DES_CBC_MD5, the checks will fail.
+
 Thu Apr 20 13:06:53 1995  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
 	* kdc_hammer.c (usage()): Removed -M as not used.
Index: src/tests/hammer/kdc5_hammer.c
===================================================================
RCS file: /usr/src/master/security/kerberos/src/tests/hammer/kdc5_hammer.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 kdc5_hammer.c
--- kdc5_hammer.c	1995/07/18 06:24:18	1.1.1.1
+++ kdc5_hammer.c	1995/07/25 13:20:54
@@ -197,7 +197,7 @@
     }
 
     if (etype == 0xffff)
-	etype = krb5_keytype_array[keytype]->system->proto_enctype;
+	etype = DEFAULT_KDC_ETYPE;
 
     if (!valid_etype(etype)) {
 	com_err(prog, KRB5_PROG_ETYPE_NOSUPP,
Index: src/tests/verify/ChangeLog
===================================================================
RCS file: /usr/src/master/security/kerberos/src/tests/verify/ChangeLog,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 ChangeLog
--- ChangeLog	1995/07/18 06:24:18	1.1.1.1
+++ ChangeLog	1995/07/25 13:28:12
@@ -1,3 +1,13 @@
+Tue Jul 25 13:27:37 1995  Michael Shields  <shields@tembel.org>
+
+	* kdb5_mkdums.c (main): Indent arguments, to keep Emacs happy.
+
+	* kdb5_mkdums.c (main): Use DEFAULT_KDC_ETYPE, not
+	krb5_keytype_array[master_keyblock.keytype]->system->proto_enctype,
+	as the default etype.  This what kdb5_create, kdb5_edit, &c. use;
+	if we're inconsistent, and the DEFAULT_KDC_ETYPE is
+	ETYPE_DES_CBC_MD5, the checks will fail.
+
 Thu Mar  2 12:34:50 1995  Theodore Y. Ts'o  <tytso@dcl>
 
 	* Makefile.in (ISODELIB): Remove reference to $(ISODELIB).
Index: src/tests/verify/kdb5_verify.c
===================================================================
RCS file: /usr/src/master/security/kerberos/src/tests/verify/kdb5_verify.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 kdb5_verify.c
--- kdb5_verify.c	1995/07/18 06:24:19	1.1.1.1
+++ kdb5_verify.c	1995/07/25 13:28:12
@@ -92,8 +92,8 @@
 
 void
 main(argc, argv)
-int argc;
-char *argv[];
+    int argc;
+    char *argv[];
 {
     extern char *optarg;	
     int optchar, i, n;
@@ -134,7 +134,7 @@
 	    strcpy(principal_string, optarg);
 	    suffix = principal_string + strlen(principal_string);
 	    break;
-       case 'n':                        /* how many to check */
+        case 'n':                       /* how many to check */
 	    num_to_check = atoi(optarg);
 	    break;
 	case 'd':			/* set db name */
@@ -175,7 +175,7 @@
     }
 
     if (etype == 0xffff)
-	etype = krb5_keytype_array[master_keyblock.keytype]->system->proto_enctype;
+	etype = DEFAULT_KDC_ETYPE;
 
     if (!valid_etype(etype)) {
 	com_err(progname, KRB5_PROG_ETYPE_NOSUPP,
-- 
Shields.

home help back first fref pref prev next nref lref last post