diff options
| author | Theodore Tso <tytso@mit.edu> | 1994-10-14 04:38:45 +0000 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 1994-10-14 04:38:45 +0000 |
| commit | 59fcb0c1b4b0c5c57db8d3b95da83482efe9c485 (patch) | |
| tree | a73db31bfa73cc2a568df1a5b982eb4b43860f88 /src/lib | |
| parent | 0a505ecc5c29eb46e90107b9a1d5b362ea04e03a (diff) | |
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
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/crypto/ChangeLog | 7 | ||||
| -rw-r--r-- | src/lib/crypto/Makefile.in | 14 | ||||
| -rw-r--r-- | src/lib/crypto/cryptoconf.c | 14 |
3 files changed, 31 insertions, 4 deletions
diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog index 5ca7a7db2..755d23023 100644 --- 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 4aba76631..02116375f 100644 --- 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 3af3f31f2..a59cc3171 100644 --- 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 */ }; |