From 3ba759f62e575eb3db2603666c641b7ad9f38bb4 Mon Sep 17 00:00:00 2001 From: Chris Provenzano Date: Wed, 6 Sep 1995 03:30:34 +0000 Subject: [PATCH] * md5crypto.c : Replace KEYTYPE_DES_CBC_MD5 for KEYTYPE_DES * t_cksum.c : Remove krb5_enctype references, and replace with krb5_keytype where appropriate. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6678 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/crypto/md5/ChangeLog | 8 ++++++++ src/lib/crypto/md5/md5crypto.c | 8 ++++---- src/lib/crypto/md5/t_cksum.c | 4 ++-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/lib/crypto/md5/ChangeLog b/src/lib/crypto/md5/ChangeLog index 68868023c..9bda63854 100644 --- a/src/lib/crypto/md5/ChangeLog +++ b/src/lib/crypto/md5/ChangeLog @@ -1,3 +1,11 @@ + +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 * .Sanitize: Update file list diff --git a/src/lib/crypto/md5/md5crypto.c b/src/lib/crypto/md5/md5crypto.c index 1254fd82f..3f97a61b4 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.keytype = KEYTYPE_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.keytype = KEYTYPE_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.keytype = KEYTYPE_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.keytype = KEYTYPE_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..683ef57ad 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_keytype(kcontext, &encblock, DEFAULT_KDC_KEYTYPE); if (kret = mit_des_string_to_key(&encblock, - KEYTYPE_DES, + DEFAULT_KDC_KEYTYPE, &keyblock, &pwdata, (krb5_data *) NULL)) { -- 2.26.2