Replaced des3-md5 with des3-sha (also added sha cksumtype)

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

diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index 636d362bce542db6b48c57afbf62c8e7deb9c25b..3bf0ecf67bf30c117d1f459820272c9ae5be448b 100644 (file)
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,7 @@
+Fri May 10 01:26:24 1996  Richard Basch  <basch@lehman.com>
+
+       * k5-int.h krb5.hin: Replaced 3des-md5 with 3des-sha.
+
 Tue May  7 17:19:17 1996  Richard Basch  <basch@lehman.com>
 
        * k5-int.h: We are providing 3DES routines in libcrypto, too...
@@ -9,8 +13,8 @@ Thu May  2 18:41:00 1996  Richard Basch  <basch@lehman.com>
 
 Fri May  3 00:26:47 1996  Mark Eichin  <eichin@cygnus.com>
 
-       * krb5.hin (krb5_get_credentials_validate): declaration for new
-       function.
+       * krb5.hin
+       (krb5_get_credentials_validate): declaration for new function.
        (krb5_get_cred_from_kdc_validate): ditto.
 
 Thu May  2 22:52:14 1996  Mark Eichin  <eichin@cygnus.com>

diff --git a/src/include/k5-int.h b/src/include/k5-int.h
index 741287609dae02b340ed9703cbcff7e7d175342d..7c2b11c08674058d22b295110d5d64042786f4a7 100644 (file)
--- a/src/include/k5-int.h
+++ b/src/include/k5-int.h
@@ -95,11 +95,12 @@
 #define PROVIDE_DES_CBC_CRC
 #define PROVIDE_DES_CBC_RAW
 #define PROVIDE_DES_CBC_CKSUM
-#define PROVIDE_DES3_CBC_MD5
+#define PROVIDE_DES3_CBC_SHA
 #define PROVIDE_DES3_CBC_RAW
 #define PROVIDE_CRC32
 #define PROVIDE_RSA_MD4
 #define PROVIDE_RSA_MD5
+#define PROVIDE_NIST_SHA
 
 #ifndef _SIZE_T_DEFINED
 typedef unsigned int size_t;

diff --git a/src/include/krb5.hin b/src/include/krb5.hin
index 98125226f32561418a5ea47c9471854adaaf915a..64c7c352a4cd7392adfd6ab5e913a4f1ebde3fd7 100644 (file)
--- a/src/include/krb5.hin
+++ b/src/include/krb5.hin
@@ -412,7 +412,7 @@ typedef struct _krb5_checksum_entry {
 #define        ENCTYPE_DES_CBC_MD4     0x0002  /* DES cbc mode with RSA-MD4 */
 #define        ENCTYPE_DES_CBC_MD5     0x0003  /* DES cbc mode with RSA-MD5 */
 #define        ENCTYPE_DES_CBC_RAW     0x0004  /* DES cbc mode raw */
-#define        ENCTYPE_DES3_CBC_MD5    0x0005  /* DES-3 cbc mode with RSA-MD5 */
+#define        ENCTYPE_DES3_CBC_SHA    0x0005  /* DES-3 cbc mode with NIST-SHA */
 #define        ENCTYPE_DES3_CBC_RAW    0x0006  /* DES-3 cbc mode raw */
 #define ENCTYPE_UNKNOWN                0x01ff
 
@@ -424,7 +424,8 @@ typedef struct _krb5_checksum_entry {
 /* rsa-md4-des-k */
 #define        CKSUMTYPE_RSA_MD5       0x0007
 #define        CKSUMTYPE_RSA_MD5_DES   0x0008
-#define CKSUMTYPE_RSA_MD5_DES3 0x0009
+#define CKSUMTYPE_NIST_SHA     0x0009
+#define CKSUMTYPE_NIST_SHA_DES3        0x000a
 
 #ifndef krb5_roundup
 /* round x up to nearest multiple of y */