diff options
| author | Richard Basch <probe@mit.edu> | 1996-05-10 07:18:21 +0000 |
|---|---|---|
| committer | Richard Basch <probe@mit.edu> | 1996-05-10 07:18:21 +0000 |
| commit | 66738f9b53f5ae3684c91c2174ff599a9f805dc1 (patch) | |
| tree | c00ce240b042db25616c1601b5d2fbb160645b06 /src | |
| parent | 2e2b512c6fb5b54d43d0cf59f42ae172df574aa2 (diff) | |
| download | krb5-66738f9b53f5ae3684c91c2174ff599a9f805dc1.tar.gz krb5-66738f9b53f5ae3684c91c2174ff599a9f805dc1.tar.xz krb5-66738f9b53f5ae3684c91c2174ff599a9f805dc1.zip | |
Replace des3-md5 with des3-sha
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@7967 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/crypto/des/ChangeLog | 5 | ||||
| -rw-r--r-- | src/lib/crypto/des/d3_procky.c | 2 | ||||
| -rw-r--r-- | src/lib/crypto/des/d3_str2ky.c | 2 | ||||
| -rw-r--r-- | src/lib/crypto/des/des_int.h | 2 | ||||
| -rw-r--r-- | src/lib/crypto/des/init_rkey.c | 2 |
5 files changed, 9 insertions, 4 deletions
diff --git a/src/lib/crypto/des/ChangeLog b/src/lib/crypto/des/ChangeLog index 70063be98..50c2d0115 100644 --- 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 431b007b2..9c969a823 100644 --- 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 9507157ab..ed9f5183d 100644 --- 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 db1a6b9b3..6f97449f5 100644 --- 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 2cb85215f..923ddd550 100644 --- 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; |