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

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

2 files changed, 13 insertions, 27 deletions

diff --git a/src/tests/create/ChangeLog b/src/tests/create/ChangeLog
index 64e0b2801..ecb782e71 100644
--- a/src/tests/create/ChangeLog
+++ b/src/tests/create/ChangeLog
@@ -1,3 +1,7 @@
+1998-10-27  Marc Horowitz  <marc@mit.edu>
+
+	* kdb5_mkdums.c: update to new crypto api
+
 1998-05-06  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
 	* kdb5_mkdums.c (argv): POSIX states that getopt returns -1
diff --git a/src/tests/create/kdb5_mkdums.c b/src/tests/create/kdb5_mkdums.c
index 18ee9e8ac..4f9376670 100644
--- a/src/tests/create/kdb5_mkdums.c
+++ b/src/tests/create/kdb5_mkdums.c
@@ -65,7 +65,6 @@ int status;
 krb5_keyblock master_keyblock;
 krb5_principal master_princ;
 krb5_db_entry master_entry;
-krb5_encrypt_block master_encblock;
 krb5_pointer master_random;
 krb5_context test_context;
 
@@ -175,8 +174,6 @@ char *argv[];
 	exit(1);
     }
 
-    krb5_use_enctype(test_context, &master_encblock, master_keyblock.enctype);
-
     if (!dbname)
 	dbname = DEFAULT_KDB_FILE;	/* XXX? */
 
@@ -207,9 +204,6 @@ char *argv[];
       }
     }
 
-    krb5_finish_random_key(test_context, &master_encblock, &master_random);
-    krb5_finish_key(test_context, &master_encblock);
-
     retval = krb5_db_fini(test_context);
     memset((char *)master_keyblock.contents, 0, master_keyblock.length);
     if (retval && retval != KRB5_KDB_DBNOTINITED) {
@@ -280,8 +274,8 @@ add_princ(context, str_newprinc)
 
     	pwd.length = strlen(princ_name);
     	pwd.data = princ_name;  /* must be able to regenerate */
-    	if ((retval = krb5_string_to_key(context, &master_encblock, 
-				        &key, &pwd, &salt))) {
+    	if ((retval = krb5_c_string_to_key(context, master_keyblock.enctype, 
+					   &pwd, &salt, &key))) {
 	    com_err(progname,retval,"while converting password to key for '%s'",
 		    princ_name);
 	    krb5_free_data_contents(context, &salt);
@@ -296,7 +290,7 @@ add_princ(context, str_newprinc)
 	    goto error;
         }
 
-        if ((retval = krb5_dbekd_encrypt_key_data(context,&master_encblock, 
+        if ((retval = krb5_dbekd_encrypt_key_data(context,&master_keyblock, 
 						  &key, NULL, 1, 
 						  newentry.key_data))) {
     	    com_err(progname, retval, "while encrypting key for '%s'", 
@@ -357,8 +351,10 @@ char *dbname;
 	    com_err(pname, retval, "while calculated master key salt");
 	    return(1);
 	}
-	if ((retval = krb5_string_to_key(test_context, &master_encblock, 
-				    &master_keyblock, &pwd, &scratch))) {
+	if ((retval = krb5_c_string_to_key(test_context,
+					   master_keyblock.enctype,
+					   &pwd, &scratch,
+					   &master_keyblock))) {
 	    com_err(pname, retval,
 		    "while transforming master key from password");
 	    return(1);
@@ -366,7 +362,7 @@ char *dbname;
 	free(scratch.data);
     } else {
 	if ((retval = krb5_db_fetch_mkey(test_context, master_princ, 
-					&master_encblock, manual_mkey, 
+					master_keyblock.enctype, manual_mkey, 
 					FALSE, 0, NULL, &master_keyblock))) {
 	    com_err(pname, retval, "while reading master key");
 	    return(1);
@@ -377,7 +373,7 @@ char *dbname;
 	return(1);
     }
     if ((retval = krb5_db_verify_master_key(test_context, master_princ, 
-					   &master_keyblock, &master_encblock))){
+					   &master_keyblock))){
 	com_err(pname, retval, "while verifying master key");
 	(void) krb5_db_fini(test_context);
 	return(1);
@@ -399,20 +395,6 @@ char *dbname;
 	return(1);
     }
 
-    if ((retval = krb5_process_key(test_context,
-				  &master_encblock, &master_keyblock))) {
-	com_err(pname, retval, "while processing master key");
-	(void) krb5_db_fini(test_context);
-	return(1);
-    }
-    if ((retval = krb5_init_random_key(test_context,
-				      &master_encblock, &master_keyblock,
-				      &master_random))) {
-	com_err(pname, retval, "while initializing random key generator");
-	krb5_finish_key(test_context, &master_encblock);
-	(void) krb5_db_fini(test_context);
-	return(1);
-    }
     mblock.max_life = master_entry.max_life;
     mblock.max_rlife = master_entry.max_renewable_life;
     mblock.expiration = master_entry.expiration;