Replace des3-md5 with des3-sha

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

diff --git a/src/lib/crypto/des/ChangeLog b/src/lib/crypto/des/ChangeLog
index 70063be98d0435765b9d92e446f2a3de6465fc22..50c2d011568b0a32e4edabeb9125b0e7abe2a6a0 100644 (file)
--- a/src/lib/crypto/des/ChangeLog
+++ b/src/lib/crypto/des/ChangeLog
@@ -1,3 +1,8 @@
+Fri May 10 01:46:25 1996  Richard Basch  <basch@lehman.com>
+
+       * d3_str2ky.c d3_procky.c des_int.h init_rkey.c:
+       Replace des3-md5 with des3-sha
+
 Thu May  2 18:29:01 1996  Richard Basch  <basch@lehman.com>
 
        * d3_rndky.c new_rn_key.c: Removed (obsolete).

diff --git a/src/lib/crypto/des/d3_procky.c b/src/lib/crypto/des/d3_procky.c
index 431b007b23c1ce285edea5a0fc0034f9bea20138..9c969a823bb11443ad4169ac75067ed3de38e2da 100644 (file)
--- a/src/lib/crypto/des/d3_procky.c
+++ b/src/lib/crypto/des/d3_procky.c
@@ -30,7 +30,7 @@ mit_des3_process_key (eblock, keyblock)
 {
     struct mit_des_ks_struct       *schedule;      /* pointer to key schedules */
 
-    if ((keyblock->enctype != ENCTYPE_DES3_CBC_MD5) &&
+    if ((keyblock->enctype != ENCTYPE_DES3_CBC_SHA) &&
        (keyblock->enctype != ENCTYPE_DES3_CBC_RAW))
        return KRB5_PROG_ETYPE_NOSUPP;
 

diff --git a/src/lib/crypto/des/d3_str2ky.c b/src/lib/crypto/des/d3_str2ky.c
index 9507157abef8fe004c5d54426b0e4005fb9e3dcb..ed9f5183d2be05299681fda3813f195cb1d558b9 100644 (file)
--- a/src/lib/crypto/des/d3_str2ky.c
+++ b/src/lib/crypto/des/d3_str2ky.c
@@ -51,7 +51,7 @@ const krb5_data FAR * salt;
     mit_des3_key_schedule ks;
     krb5_enctype enctype = eblock->crypto_entry->proto_enctype;
 
-    if ((enctype == ENCTYPE_DES3_CBC_MD5) ||
+    if ((enctype == ENCTYPE_DES3_CBC_SHA) ||
        (enctype == ENCTYPE_DES3_CBC_RAW))
        keyblock->length = sizeof(mit_des3_cblock);
     else

diff --git a/src/lib/crypto/des/des_int.h b/src/lib/crypto/des/des_int.h
index db1a6b9b3d416f307ba54a470cc47b82d06addfa..6f97449f5205e305d8cab215d622c27ba6cc77c9 100644 (file)
--- a/src/lib/crypto/des/des_int.h
+++ b/src/lib/crypto/des/des_int.h
@@ -74,7 +74,7 @@ typedef struct mit_des_ran_key_seed {
 extern krb5_cs_table_entry krb5_raw_des_cst_entry;
 extern krb5_cs_table_entry krb5_des_crc_cst_entry;
 extern krb5_cs_table_entry krb5_des_md5_cst_entry;
-extern krb5_cs_table_entry krb5_des3_md5_cst_entry;
+extern krb5_cs_table_entry krb5_des3_sha_cst_entry;
 extern krb5_cs_table_entry krb5_des3_raw_cst_entry;
 extern krb5_checksum_entry krb5_des_cbc_cksumtable_entry;
 

diff --git a/src/lib/crypto/des/init_rkey.c b/src/lib/crypto/des/init_rkey.c
index 2cb85215f9dc631eb5f72dc210e57e60d572763b..923ddd5508547510855394e6c6f2d9af44845fe8 100644 (file)
--- a/src/lib/crypto/des/init_rkey.c
+++ b/src/lib/crypto/des/init_rkey.c
@@ -62,7 +62,7 @@ mit_des_init_random_key (eblock, seedblock, state)
        enctype = ENCTYPE_DES_CBC_RAW;
        break;
 
-    case ENCTYPE_DES3_CBC_MD5:
+    case ENCTYPE_DES3_CBC_SHA:
     case ENCTYPE_DES3_CBC_RAW:
        enctype = ENCTYPE_DES3_CBC_RAW;
        break;