changes to make kadmind4 build again

	* kadm_ser_wrap.c (kadm_ser_init): Remove references to
 	master_encblock, as it's no longer needed in the new crypto API,
 	adjusting kdb calls accordingly.  Also punt calls to use_enctype,
 	process_key, etc.

	* admin_server.c (clear_secrets): Remove references to
	master_encblock, due to new crypto API.

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/marc-3des@10767 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/kadmin/v4server/ChangeLog b/src/kadmin/v4server/ChangeLog
index 0d0ae6f371b69fec6cc528fddabde11d3427b00a..bcea1cd847316653851f9a108f238e658bc87ec3 100644 (file)
--- a/src/kadmin/v4server/ChangeLog
+++ b/src/kadmin/v4server/ChangeLog
@@ -1,3 +1,13 @@
+Fri Jul 31 18:17:16 1998  Tom Yu  <tlyu@mit.edu>
+
+       * kadm_ser_wrap.c (kadm_ser_init): Remove references to
+       master_encblock, as it's no longer needed in the new crypto API,
+       adjusting kdb calls accordingly.  Also punt calls to use_enctype,
+       process_key, etc.
+
+       * admin_server.c (clear_secrets): Remove references to
+       master_encblock, due to new crypto API.
+
 Thu Jul  9 21:52:41 1998  Tom Yu  <tlyu@mit.edu>
 
        * kadm_server.c (kadm_ser_cpw): Re-enable "old-style" password

diff --git a/src/kadmin/v4server/admin_server.c b/src/kadmin/v4server/admin_server.c
index 9cd2f8fb51e650864103859e0a2825f7cd9eb84f..c9ae24c2ae24cddac6e24837a91c72bc139d3f2c 100644 (file)
--- a/src/kadmin/v4server/admin_server.c
+++ b/src/kadmin/v4server/admin_server.c
@@ -239,9 +239,6 @@ char *argv[];
 
 static void clear_secrets()
 {
-    krb5_finish_key(kadm_context, &server_parm.master_encblock);
-    memset((char *)&server_parm.master_encblock, 0,
-          sizeof (server_parm.master_encblock));
     memset((char *)server_parm.master_keyblock.contents, 0,
           server_parm.master_keyblock.length);
     server_parm.mkvno = 0L;

diff --git a/src/kadmin/v4server/kadm_ser_wrap.c b/src/kadmin/v4server/kadm_ser_wrap.c
index 2c5c8076c2518c52cfa4b0d8c6c2437ee996f826..4653fb568882d563bac3f624a8313fb392cdfb94 100644 (file)
--- a/src/kadmin/v4server/kadm_ser_wrap.c
+++ b/src/kadmin/v4server/kadm_ser_wrap.c
@@ -83,18 +83,7 @@ kadm_ser_init(inter, realm)
     /* setting up the database */
     mkey_name = KRB5_KDB_M_NAME;
 
-#ifdef KADM5
     server_parm.master_keyblock.enctype = params->enctype;
-    krb5_use_enctype(kadm_context, &server_parm.master_encblock, 
-                    server_parm.master_keyblock.enctype);
-#else
-    if (inter == 1) {
-       server_parm.master_keyblock.enctype = ENCTYPE_DES_CBC_MD5;
-       krb5_use_enctype(kadm_context, &server_parm.master_encblock, 
-                        server_parm.master_keyblock.enctype);
-    } else
-       server_parm.master_keyblock.enctype = ENCTYPE_UNKNOWN;
-#endif
     
     retval = krb5_db_setup_mkey_name(kadm_context, mkey_name, realm,
                                     (char **) 0,
@@ -102,24 +91,15 @@ kadm_ser_init(inter, realm)
     if (retval)
        return KADM_NO_MAST;
     krb5_db_fetch_mkey(kadm_context, server_parm.master_princ,
-                      &server_parm.master_encblock,
+                      &server_parm.master_keyblock.enctype,
                       (inter == 1), FALSE,
-#ifdef KADM5
                       params->stash_file,
-#else
-                      (char *) NULL,
-#endif
                       NULL,
                       &server_parm.master_keyblock);
     if (retval)
        return KADM_NO_MAST;
     retval = krb5_db_verify_master_key(kadm_context, server_parm.master_princ,
-                                      &server_parm.master_keyblock,
-                                      &server_parm.master_encblock);
-    if (retval)
-       return KADM_NO_VERI;
-    retval = krb5_process_key(kadm_context, &server_parm.master_encblock,
-                             &server_parm.master_keyblock);
+                                      &server_parm.master_keyblock);
     if (retval)
        return KADM_NO_VERI;
     retval = krb5_db_get_principal(kadm_context, server_parm.master_princ,