* Makefile.in (STLIBOBJS, OBJS, SRCS): Restore des.c

	* des.c: Restore des_ecb_encrypt and make it use the cbc
	interface.

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

diff --git a/src/lib/des425/ChangeLog b/src/lib/des425/ChangeLog
index 4eeef1028744a3cf4ea5f942a9aa374d64422796..e873b5f0bbb968b65712cb896c96541920aeade1 100644 (file)
--- a/src/lib/des425/ChangeLog
+++ b/src/lib/des425/ChangeLog
@@ -1,3 +1,10 @@
+Thu Nov 12 17:20:25 1998  Tom Yu  <tlyu@mit.edu>
+
+       * Makefile.in (STLIBOBJS, OBJS, SRCS): Restore des.c
+
+       * des.c: Restore des_ecb_encrypt and make it use the cbc
+       interface.
+
 1998-10-27  Marc Horowitz  <marc@mit.edu>
 
        * random_key.c, new_rnd_key.c: make the v4 compat random key code

diff --git a/src/lib/des425/Makefile.in b/src/lib/des425/Makefile.in
index e96e03f9991696f4e26112bb5c83adfd1d4ea56f..f19fc2bd315e5180583cc55f74b780e5a915c5ec 100644 (file)
--- a/src/lib/des425/Makefile.in
+++ b/src/lib/des425/Makefile.in
@@ -27,6 +27,7 @@ SHLIB_RDIRS=$(KRB5_LIBDIR)
 
 STOBJLISTS=OBJS.ST
 STLIBOBJS=cksum.o      \
+       des.o           \
        enc_dec.o       \
        key_parity.o    \
        key_sched.o     \
@@ -43,6 +44,7 @@ STLIBOBJS=cksum.o     \
 
 
 OBJS=  cksum.$(OBJEXT)         \
+       des.$(OBJEXT)           \
        enc_dec.$(OBJEXT)       \
        key_parity.$(OBJEXT)    \
        key_sched.$(OBJEXT)     \
@@ -58,6 +60,7 @@ OBJS= cksum.$(OBJEXT)         \
        k4_glue.$(OBJEXT)
 
 SRCS=  $(srcdir)/cksum.c       \
+       $(srcdir)/des.c         \
        $(srcdir)/enc_dec.c     \
        $(srcdir)/key_parity.c  \
        $(srcdir)/key_sched.c   \

diff --git a/src/lib/des425/des.c b/src/lib/des425/des.c
index 6b08899b7f8bc4f6356867aa5648cd701772c72a..b5db9dd6d6caf1e6ac91abf94c7f5ce7a5b28bca 100644 (file)
--- a/src/lib/des425/des.c
+++ b/src/lib/des425/des.c
@@ -58,10 +58,9 @@ des_ecb_encrypt(clear, cipher, schedule, encrypt)
     int encrypt;               /* 0 ==> decrypt, else encrypt */
     register mit_des_key_schedule schedule; /* r11 */
 {
-       return (mit_des_ecb_encrypt((const mit_des_cblock FAR *) clear,
-                                   (mit_des_cblock *) cipher,
-                                   schedule,
-                                   encrypt));
-}
-
+    static des_cblock iv;
 
+    return (mit_des_cbc_encrypt((const des_cblock *) clear,
+                               (des_cblock *) cipher,
+                               8, schedule, iv, encrypt));
+}