* md5crypto.c, t_cksum.c : s/keytype/enctype/g, s/KEYTYPE/ENCTYPE/g

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

diff --git a/src/lib/crypto/md5/ChangeLog b/src/lib/crypto/md5/ChangeLog
index 9bda638549c73d75cde2e8a9961b6f435c2462d6..383ac7c890a93620ec013cac50c4a957ba599d67 100644 (file)
--- a/src/lib/crypto/md5/ChangeLog
+++ b/src/lib/crypto/md5/ChangeLog
@@ -1,3 +1,6 @@
+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)
 

diff --git a/src/lib/crypto/md5/md5crypto.c b/src/lib/crypto/md5/md5crypto.c
index 3f97a61b430840e422ce971b6871c65d7c752b51..0c2c49c0d4d0ba433bffdfca003b4b3942099eaa 100644 (file)
--- 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_CBC_MD5;
+    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_CBC_MD5;
+    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_CBC_MD5;
+           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_CBC_MD5;
+           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 683ef57ad940d9c65f70efbd2c1d8a6d8ca4ec10..dabf9254523849265b5d5014f0c9aaf8ffbefd56 100644 (file)
--- 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_keytype(kcontext, &encblock, DEFAULT_KDC_KEYTYPE);
+  krb5_use_enctype(kcontext, &encblock, DEFAULT_KDC_ENCTYPE);
   if (kret = mit_des_string_to_key(&encblock,
-                                  DEFAULT_KDC_KEYTYPE,
+                                  DEFAULT_KDC_ENCTYPE,
                                   &keyblock,
                                   &pwdata,
                                   (krb5_data *) NULL)) {