* configure.in: Remove kdb4 library usage

	* dumpv4.c (handle_one_key): Remove the temporary --with-kdb4
		support.

The kdb4 library was only used for decrypting the master key. Last July,
the kdb4 code was conditionalized and the relevant lines were put into
this source tree....

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

diff --git a/src/admin/edit/ChangeLog b/src/admin/edit/ChangeLog
index 59914b172e1021d14583bc444d9efbd1c696af27..717817b8d8dba3d7ee8944a4905ac0b5fac2016a 100644 (file)
--- a/src/admin/edit/ChangeLog
+++ b/src/admin/edit/ChangeLog
@@ -1,3 +1,10 @@
+Sat Jun  8 09:54:38 1996  Ezra Peisach  <epeisach@kangaroo.mit.edu>
+
+       * configure.in: Remove kdb4 library usage.
+
+       * dumpv4.c (handle_one_key): Remove the temporary --with-kdb4
+               support. 
+
 Thu May  2 22:16:01 1996  Ken Raeburn  <raeburn@cygnus.com>
 
        * ss_wrapper.c (main): Make sci_idx a global.  This makes certain

diff --git a/src/admin/edit/configure.in b/src/admin/edit/configure.in
index ecf5dae89a78c93e32f3b05e31464aefbe352c24..be4c128fd14cefc8d4422085d9dc08e30565ceed 100644 (file)
--- a/src/admin/edit/configure.in
+++ b/src/admin/edit/configure.in
@@ -8,7 +8,6 @@ AC_HAVE_FUNCS(getcwd)
 SS_RULES
 USE_KADM_LIBRARY
 USE_KDB5_LIBRARY
-WITH_KDB4(USE_KDB4_LIBRARY,AC_DEFINE(KDB4_DISABLE))
 USE_KRB4_LIBRARY
 USE_SS_LIBRARY
 KRB5_LIBRARIES

diff --git a/src/admin/edit/dumpv4.c b/src/admin/edit/dumpv4.c
index 83b87b3f037ce3a8ee2d40eb3eabb29e4c31c3f8..7943e1bc2df1a7f1db9c79d8da474910302ce720 100644 (file)
--- a/src/admin/edit/dumpv4.c
+++ b/src/admin/edit/dumpv4.c
@@ -296,18 +296,12 @@ void dump_v4db(argc, argv)
 
          fprintf(f,"K M 255 1 1 0 ");
          
-#ifndef        KDB4_DISABLE
-         kdb_encrypt_key (arg.v4_master_key, v4key, 
-                          arg.v4_master_key, arg.v4_master_key_schedule, 
-                          ENCRYPT);
-#else  /* KDB4_DISABLE */
          pcbc_encrypt((C_Block *) arg.v4_master_key,
                       (C_Block *) v4key,
                       (long) sizeof(C_Block),
                       arg.v4_master_key_schedule,
                       (C_Block *) arg.v4_master_key,
                       ENCRYPT);
-#endif /* KDB4_DISABLE */
 
          for (i=0; i<8; i++) {
            fprintf(f, "%02x", ((unsigned char*)v4key)[i]);
@@ -385,18 +379,12 @@ handle_one_key(arg, v5master, v5key, v4key)
     /* v4v5key.length = sizeof(v4key); */
 
     memcpy(v4key, v5plainkey.contents, sizeof(des_cblock));
-#ifndef        KDB4_DISABLE
-    kdb_encrypt_key (v4key, v4key, 
-                    arg->v4_master_key, arg->v4_master_key_schedule, 
-                    ENCRYPT);
-#else  /* KDB4_DISABLE */
     pcbc_encrypt((C_Block *) v4key,
                 (C_Block *) v4key,
                 (long) sizeof(C_Block),
                 arg->v4_master_key_schedule,
                 (C_Block *) arg->v4_master_key,
                 ENCRYPT);
-#endif /* KDB4_DISABLE */
     return 0;
 }