summaryrefslogtreecommitdiffstats
path: root/src/mac/libraries
diff options
context:
space:
mode:
authorTheodore Tso <tytso@mit.edu>1996-12-13 19:28:16 +0000
committerTheodore Tso <tytso@mit.edu>1996-12-13 19:28:16 +0000
commite73566996463fb1947cf80ad2e11fadce3dc0b66 (patch)
tree4c75494b8a5a0e1169c37bcac34cc0aeccda7de2 /src/mac/libraries
parent20b3f46e04d4d0104dc971d22793011f20f2e51c (diff)
Merge V1_0_FREEZE_3 into the mainline. (Note this merge does *not*
include the doc subtree!!) git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9632 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/mac/libraries')
-rw-r--r--src/mac/libraries/ChangeLog6
-rw-r--r--src/mac/libraries/KerberosHeaders.h6
2 files changed, 9 insertions, 3 deletions
diff --git a/src/mac/libraries/ChangeLog b/src/mac/libraries/ChangeLog
index 1a8d737a8..4388c5e7f 100644
--- a/src/mac/libraries/ChangeLog
+++ b/src/mac/libraries/ChangeLog
@@ -1,3 +1,9 @@
+Sat Nov 23 00:18:20 1996 Theodore Ts'o <tytso@rsts-11.mit.edu>
+
+ * KerberosHeaders.h: Remove DES3 and SHA support for 1.0, since
+ what's there isn't the correct final algorithm. (They
+ will be re-added later.) [PR #231]
+
Tue Apr 30 14:53:54 1996 <tytso@rsts-11.mit.edu>
* KerberosHeaders.h: Removed PROVIDE_SNEFRU (shouldn't be there)
diff --git a/src/mac/libraries/KerberosHeaders.h b/src/mac/libraries/KerberosHeaders.h
index ac4e62da6..a25d00157 100644
--- a/src/mac/libraries/KerberosHeaders.h
+++ b/src/mac/libraries/KerberosHeaders.h
@@ -35,9 +35,9 @@ typedef unsigned int size_t;
#define PROVIDE_DES_CBC_CRC
#define PROVIDE_DES_CBC_MD5
#define PROVIDE_DES_CBC_RAW
-#define PROVIDE_DES3_CBC_MD5
-#define PROVIDE_DES3_CBC_RAW
-
+/* #define PROVIDE_DES3_CBC_MD5 */
+/* #define PROVIDE_DES3_CBC_RAW */
+/* #define PROVIDE_NIST_SHA */
#define NO_SYS_TYPES_H
#define NO_SYS_STAT_H