Add support for the new cryptosystem DES/MD5

Add support for new files des-crc.c, des-md5.c, and raw-des.c

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

diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog
index 5ca7a7db2081c851860c689daf44fbe1ae0f6fba..755d23023157f5552734f45e98c2d6ae7f65183d 100644 (file)
--- a/src/lib/crypto/ChangeLog
+++ b/src/lib/crypto/ChangeLog
@@ -1,3 +1,10 @@
+Fri Oct 14 00:37:08 1994  Theodore Y. Ts'o  (tytso@dcl)
+
+       * cryptoconf.c: Add support for the new cryptosystem DES/MD5.
+
+       * Makefile.in: Add support for new files des-crc.c, des-md5.c, and
+               raw-des.c
+
 Thu Oct  6 20:07:41 1994  Theodore Y. Ts'o  (tytso@dcl)
 
        * configure.in: Add recursive "make check" target.

diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in
index 4aba7663190251e3b88c6639b98d254a06498c2d..02116375ff7b3cfa23cbb41ad5f6dad71086a3d4 100644 (file)
--- a/src/lib/crypto/Makefile.in
+++ b/src/lib/crypto/Makefile.in
@@ -3,8 +3,15 @@ LDFLAGS = -g
 
 TST=if test -n "`cat DONE`" ; then
 
-OBJS=  cryptoconf.o
-SRCS=  $(srcdir)/cryptoconf.c
+OBJS=  cryptoconf.o \
+       des-crc.o \
+       des-md5.o \
+       raw-des.o
+
+SRCS=  $(srcdir)/cryptoconf.c \
+       $(srcdir)/des-crc.c \
+       $(srcdir)/des-md5.c \
+       $(srcdir)/raw-des.c 
 
 all::
 
@@ -20,3 +27,6 @@ libcrypto.a: des/DONE md4/DONE md5/DONE crc32/DONE os/DONE $(OBJS)
 install:: libcrypto.a
        $(INSTALL_DATA) libcrypto.a $(DESTDIR)$(KRB5_LIBDIR)/libcrypto.a
        $(RANLIB) $(DESTDIR)$(KRB5_LIBDIR)/libcrypto.a
+
+clean::
+       $(RM) libcrypto.a

diff --git a/src/lib/crypto/cryptoconf.c b/src/lib/crypto/cryptoconf.c
index 3af3f31f2fd0d8451bdbd075d7360b5cc1bbcbf7..a59cc31715e9af2eb1f9b4844bd4fc81d747f853 100644 (file)
--- a/src/lib/crypto/cryptoconf.c
+++ b/src/lib/crypto/cryptoconf.c
@@ -73,11 +73,21 @@
 #include <krb5/mit-des.h>
 #define _DES_DONE__
 #endif
-#define DES_CBC_CRC_CSENTRY &krb5_des_cst_entry
+#define DES_CBC_CRC_CSENTRY &krb5_des_crc_cst_entry
 #else
 #define DES_CBC_CRC_CSENTRY 0
 #endif
 
+#ifdef PROVIDE_DES_CBC_MD5
+#ifndef _DES_DONE__
+#include <krb5/mit-des.h>
+#define _DES_DONE__
+#endif
+#define DES_CBC_MD5_CSENTRY &krb5_des_md5_cst_entry
+#else
+#define DES_CBC_MD5_CSENTRY 0
+#endif
+    
 #ifdef PROVIDE_RAW_DES_CBC
 #ifndef _DES_DONE__
 #include <krb5/mit-des.h>
@@ -98,7 +108,7 @@ krb5_cs_table_entry *krb5_csarray[] = {
     0,                         /* ETYPE_NULL */
     DES_CBC_CRC_CSENTRY,       /* ETYPE_DES_CBC_CRC */
     0,                         /* ETYPE_DES_CBC_MD4 */
-    0,                         /* ETYPE_DES_CBC_MD5 */
+    DES_CBC_MD5_CSENTRY,       /* ETYPE_DES_CBC_MD5 */
     RAW_DES_CBC_CSENTRY,       /* ETYPE_RAW_DES_CBC */
 };