Added support for ENCTYPE_DES3_CBC_RAW (gssapi)

des_int.h: added support for CKSUMTYPE_RSA_MD5_DES3

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

diff --git a/src/lib/crypto/des/ChangeLog b/src/lib/crypto/des/ChangeLog
index cbfdcf37ee86d95bd5ba20fde8491018b8eb06ba..f8e3e918669394744bd1a6c6432dfe9f8d4c054c 100644 (file)
--- a/src/lib/crypto/des/ChangeLog
+++ b/src/lib/crypto/des/ChangeLog
@@ -1,3 +1,9 @@
+Thu Mar 28 10:49:31 1996  Richard Basch  <basch@lehman.com>
+
+       * init_rkey.c, d3_str2ky.c, d3_procky.c: Support ENCTYPE_DES3_CBC_RAW
+
+       * des_int.h: Support CKSUMTYPE_DES3_CBC_MD5
+
 Wed Mar 20 22:33:40 1996  Theodore Y. Ts'o  <tytso@dcl>
 
        * u_nfold.c (mit_des_n_fold): 

diff --git a/src/lib/crypto/des/d3_procky.c b/src/lib/crypto/des/d3_procky.c
index 1e50dd9fdbfde0901ced0408537c30707076f2ff..431b007b23c1ce285edea5a0fc0034f9bea20138 100644 (file)
--- a/src/lib/crypto/des/d3_procky.c
+++ b/src/lib/crypto/des/d3_procky.c
@@ -30,7 +30,8 @@ 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_MD5) &&
+       (keyblock->enctype != ENCTYPE_DES3_CBC_RAW))
        return KRB5_PROG_ETYPE_NOSUPP;
 
     if (keyblock->length != sizeof (mit_des3_cblock))

diff --git a/src/lib/crypto/des/d3_str2ky.c b/src/lib/crypto/des/d3_str2ky.c
index c2a27901b3ed60dd6c1cdacf65f748517275ab7b..9507157abef8fe004c5d54426b0e4005fb9e3dcb 100644 (file)
--- a/src/lib/crypto/des/d3_str2ky.c
+++ b/src/lib/crypto/des/d3_str2ky.c
@@ -51,7 +51,8 @@ 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_MD5) ||
+       (enctype == ENCTYPE_DES3_CBC_RAW))
        keyblock->length = sizeof(mit_des3_cblock);
     else
        return (KRB5_PROG_ETYPE_NOSUPP);

diff --git a/src/lib/crypto/des/des_int.h b/src/lib/crypto/des/des_int.h
index 0d626fa786be5bf5825252e8fe88f79fefd56a77..04332f706a43f2c8cc2609e415dd16bd74e21b25 100644 (file)
--- a/src/lib/crypto/des/des_int.h
+++ b/src/lib/crypto/des/des_int.h
@@ -75,7 +75,8 @@ 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_checksum_entry     krb5_des_cbc_cksumtable_entry;
+extern krb5_cs_table_entry krb5_des3_raw_cst_entry;
+extern krb5_checksum_entry krb5_des_cbc_cksumtable_entry;
 
 /*
  * Check if k5-int.h has been included before us.  If so, then check to see

diff --git a/src/lib/crypto/des/init_rkey.c b/src/lib/crypto/des/init_rkey.c
index dce9d85ee5d16eba6c4e1eb600b84e99efc6596f..883271e82478f63bd5f84bc8a15e9a503a216938 100644 (file)
--- a/src/lib/crypto/des/init_rkey.c
+++ b/src/lib/crypto/des/init_rkey.c
@@ -41,8 +41,9 @@ mit_des_init_random_key (seedblock, seed)
     if ((seedblock->enctype != ENCTYPE_DES_CBC_CRC) &&
        (seedblock->enctype != ENCTYPE_DES_CBC_MD4) && 
        (seedblock->enctype != ENCTYPE_DES_CBC_MD5) && 
+       (seedblock->enctype != ENCTYPE_DES_CBC_RAW) &&
        (seedblock->enctype != ENCTYPE_DES3_CBC_MD5) && 
-       (seedblock->enctype != ENCTYPE_DES_CBC_RAW))
+       (seedblock->enctype != ENCTYPE_DES3_CBC_RAW))
        return KRB5_BAD_ENCTYPE;
     if ( !(p_seed = (mit_des_random_key_seed *) 
           malloc(sizeof(mit_des_random_key_seed))) )