Reintegrate the keytype->enctype changes

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

5 files changed, 28 insertions, 10 deletions

diff --git a/src/lib/crypto/md4/ChangeLog b/src/lib/crypto/md4/ChangeLog
index ddabf8381..9fdbe6905 100644
--- a/src/lib/crypto/md4/ChangeLog
+++ b/src/lib/crypto/md4/ChangeLog
@@ -1,3 +1,10 @@
+Wed Sep 06 14:20:57 1995   Chris Provenzano (proven@mit.edu)
+
+        * md4crypto.c : s/keytype/enctype/g, s/KEYTYPE/ENCTYPE/g
+
+Tue Sep 05 22:10:34 1995   Chris Provenzano (proven@mit.edu)
+
+        * md4crypto.c : Replace KEYTYPE_DES_CBC_MD4 for KEYTYPE_DES.
 
 Thu Jul 27 15:22:17 EDT 1995	Paul Park	(pjpark@mit.edu)
 	* rsa-md4.h - Don't include k5-config.h.  No longer present or needed.
diff --git a/src/lib/crypto/md4/md4crypto.c b/src/lib/crypto/md4/md4crypto.c
index 248f17683..5b349a024 100644
--- a/src/lib/crypto/md4/md4crypto.c
+++ b/src/lib/crypto/md4/md4crypto.c
@@ -91,7 +91,7 @@ krb5_checksum FAR *outcksum;
 
     keyblock.length = seed_length;
     keyblock.contents = (krb5_octet *)seed;
-    keyblock.keytype = KEYTYPE_DES;
+    keyblock.enctype = ENCTYPE_DES_CBC_MD4;
 
     if ((retval = mit_des_process_key(&eblock, &keyblock)))
 	return retval;
@@ -162,7 +162,7 @@ krb5_checksum FAR *outcksum;
 
     keyblock.length = sizeof(mit_des_cblock);
     keyblock.contents = (krb5_octet *) tmpkey;
-    keyblock.keytype = KEYTYPE_DES;
+    keyblock.enctype = ENCTYPE_DES_CBC_MD4;
 
     if ((retval = mit_des_process_key(&eblock, &keyblock)))
 	return retval;
@@ -229,7 +229,7 @@ size_t seed_length;
 	    /* Use the key "as-is" */
 	    keyblock.length = seed_length;
 	    keyblock.contents = (krb5_octet *) seed;
-	    keyblock.keytype = KEYTYPE_DES;
+	    keyblock.enctype = ENCTYPE_DES_CBC_MD4;
 
 	    if ((retval = mit_des_process_key(&eblock, &keyblock)))
 		return retval;
@@ -272,7 +272,7 @@ size_t seed_length;
 
 	    keyblock.length = sizeof(mit_des_cblock);
 	    keyblock.contents = (krb5_octet *) tmpkey;
-	    keyblock.keytype = KEYTYPE_DES;
+	    keyblock.enctype = ENCTYPE_DES_CBC_MD4;
 
 	    if ((retval = mit_des_process_key(&eblock, &keyblock)))
 		return retval;
diff --git a/src/lib/crypto/md5/ChangeLog b/src/lib/crypto/md5/ChangeLog
index 68868023c..383ac7c89 100644
--- a/src/lib/crypto/md5/ChangeLog
+++ b/src/lib/crypto/md5/ChangeLog
@@ -1,3 +1,14 @@
+Wed Sep 06 14:20:57 1995   Chris Provenzano (proven@mit.edu)
+
+        * md5crypto.c, t_cksum.c : s/keytype/enctype/g, s/KEYTYPE/ENCTYPE/g
+
+Tue Sep 05 22:10:34 1995   Chris Provenzano (proven@mit.edu)
+
+        * md5crypto.c : Replace KEYTYPE_DES_CBC_MD5 for KEYTYPE_DES.
+
+	* t_cksum.c : Remove krb5_enctype references, and replace with
+                krb5_keytype where appropriate.
+
 Thu Aug 24 18:40:48 1995  Theodore Y. Ts'o  <tytso@dcl>
 
 	* .Sanitize: Update file list
diff --git a/src/lib/crypto/md5/md5crypto.c b/src/lib/crypto/md5/md5crypto.c
index 1254fd82f..0c2c49c0d 100644
--- a/src/lib/crypto/md5/md5crypto.c
+++ b/src/lib/crypto/md5/md5crypto.c
@@ -61,7 +61,7 @@ krb5_checksum FAR *outcksum;
 
     keyblock.length = seed_length;
     keyblock.contents = (krb5_octet *)seed;
-    keyblock.keytype = KEYTYPE_DES;
+    keyblock.enctype = ENCTYPE_DES_CBC_MD5;
 
     if ((retval = mit_des_process_key(&eblock, &keyblock)))
 	return retval;
@@ -129,7 +129,7 @@ krb5_checksum FAR *outcksum;
 
     keyblock.length = sizeof(mit_des_cblock);
     keyblock.contents = (krb5_octet *) tmpkey;
-    keyblock.keytype = KEYTYPE_DES;
+    keyblock.enctype = ENCTYPE_DES_CBC_MD5;
 
     if ((retval = mit_des_process_key(&eblock, &keyblock)))
 	return retval;
@@ -196,7 +196,7 @@ size_t seed_length;
 	    /* Use the key "as-is" */
 	    keyblock.length = seed_length;
 	    keyblock.contents = (krb5_octet *) seed;
-	    keyblock.keytype = KEYTYPE_DES;
+	    keyblock.enctype = ENCTYPE_DES_CBC_MD5;
 
 	    if ((retval = mit_des_process_key(&eblock, &keyblock)))
 		return retval;
@@ -239,7 +239,7 @@ size_t seed_length;
 
 	    keyblock.length = sizeof(mit_des_cblock);
 	    keyblock.contents = (krb5_octet *) tmpkey;
-	    keyblock.keytype = KEYTYPE_DES;
+	    keyblock.enctype = ENCTYPE_DES_CBC_MD5;
 
 	    if ((retval = mit_des_process_key(&eblock, &keyblock)))
 		return retval;
diff --git a/src/lib/crypto/md5/t_cksum.c b/src/lib/crypto/md5/t_cksum.c
index 6b0814440..dabf92545 100644
--- a/src/lib/crypto/md5/t_cksum.c
+++ b/src/lib/crypto/md5/t_cksum.c
@@ -104,9 +104,9 @@ main(int argc, char *argv[])
   pwd = "test password";
   pwdata.length = strlen(pwd);
   pwdata.data = pwd;
-  krb5_use_cstype(kcontext, &encblock, DEFAULT_KDC_ETYPE);
+  krb5_use_enctype(kcontext, &encblock, DEFAULT_KDC_ENCTYPE);
   if (kret = mit_des_string_to_key(&encblock,
-				   KEYTYPE_DES,
+				   DEFAULT_KDC_ENCTYPE,
 				   &keyblock,
 				   &pwdata,
 				   (krb5_data *) NULL)) {