pull up 3des implementation from the marc-3des branch

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

6 files changed, 21 insertions, 28 deletions

diff --git a/src/kadmin/v4server/ChangeLog b/src/kadmin/v4server/ChangeLog
index e64ee0e..b00913c 100644
--- a/src/kadmin/v4server/ChangeLog
+++ b/src/kadmin/v4server/ChangeLog
@@ -1,3 +1,18 @@
+1998-10-27  Marc Horowitz  <marc@mit.edu>
+
+	* admin_server.c, kadm_funcs.c, kadm_ser_wrap.c, kadm_server.h:
+	convert to new crypto api
+
+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.
+
 Mon Jul 20 11:20:32 1998  Ezra Peisach  <epeisach@mit.edu>
 
 	* acl_files.c: Include stdlib.h if present.
diff --git a/src/kadmin/v4server/acl_files.c b/src/kadmin/v4server/acl_files.c
index 35dd660..22a0007 100644
--- a/src/kadmin/v4server/acl_files.c
+++ b/src/kadmin/v4server/acl_files.c
@@ -332,7 +332,7 @@ char *el;
 
     hv = hashval(el) % h->size;
     while(h->tbl[hv] != NULL && strcmp(h->tbl[hv], el)) hv = (hv+1) % h->size;
-    s = malloc(strlen(el)+1);
+    s = (char *) malloc(strlen(el)+1);
     strcpy(s, el);
     h->tbl[hv] = s;
     h->entries++;
diff --git a/src/kadmin/v4server/admin_server.c b/src/kadmin/v4server/admin_server.c
index 9cd2f8f..90bf087 100644
--- 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;
@@ -479,7 +476,7 @@ void process_client(fd, who)
     }
 
     status = krb5_dbekd_decrypt_key_data(kadm_context,
-					 &server_parm.master_encblock,
+					 &server_parm.master_keyblock,
 					 kdatap,
 					 &cpw_skey,
 					 (krb5_keysalt *) NULL);
diff --git a/src/kadmin/v4server/kadm_funcs.c b/src/kadmin/v4server/kadm_funcs.c
index 1d32073..658d4b7 100644
--- a/src/kadmin/v4server/kadm_funcs.c
+++ b/src/kadmin/v4server/kadm_funcs.c
@@ -591,6 +591,8 @@ des_cblock newpw;
     sblock.data.length = 0;
     sblock.data.data = (char *) NULL;
     retval = krb5_dbekd_encrypt_key_data(kadm_context,
+					 /* XXX but I'm ifdef'd out here,
+					    so I can't really test this. */
 					 &server_parm.master_encblock,
 					 &localpw,
 					 &sblock,
diff --git a/src/kadmin/v4server/kadm_ser_wrap.c b/src/kadmin/v4server/kadm_ser_wrap.c
index 2c5c807..bca814d 100644
--- 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,
diff --git a/src/kadmin/v4server/kadm_server.h b/src/kadmin/v4server/kadm_server.h
index e7a7fed..f293273 100644
--- a/src/kadmin/v4server/kadm_server.h
+++ b/src/kadmin/v4server/kadm_server.h
@@ -35,7 +35,6 @@ typedef struct {
   char sinst[INST_SZ];
   char krbrlm[REALM_SZ];
   krb5_principal sprinc;
-  krb5_encrypt_block master_encblock;
   krb5_principal master_princ;
   krb5_keyblock master_keyblock;
   krb5_deltat max_life;