From 7cdb80e1fe6dc2b38498c5be0c40235260cc0af0 Mon Sep 17 00:00:00 2001 From: Chris Provenzano Date: Wed, 6 Sep 1995 19:07:49 +0000 Subject: [PATCH] * 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 --- src/lib/crypto/md5/ChangeLog | 3 +++ src/lib/crypto/md5/md5crypto.c | 8 ++++---- src/lib/crypto/md5/t_cksum.c | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/lib/crypto/md5/ChangeLog b/src/lib/crypto/md5/ChangeLog index 9bda63854..383ac7c89 100644 --- 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 3f97a61b4..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_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 683ef57ad..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_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)) { -- 2.26.2