Use the old DES encrypt function, not the split versions via macros

* des.c (mit_des_cbc_encrypt): Undef before use.
* enc_dec.c (mit_des_cbc_encrypt): Likewise.
* mac_des_glue.c (mit_des3_cbc_encrypt): Likewise.

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

diff --git a/src/lib/des425/ChangeLog b/src/lib/des425/ChangeLog
index 9ab878a943cf8b22a9f8a157aa8400b398bac35b..d4ebd99fd1460f45d66d5d6026f3adb56477a681 100644 (file)
--- a/src/lib/des425/ChangeLog
+++ b/src/lib/des425/ChangeLog
@@ -1,3 +1,9 @@
+2003-07-17  Ken Raeburn  <raeburn@mit.edu>
+
+       * des.c (mit_des_cbc_encrypt): Undef before use.
+       * enc_dec.c (mit_des_cbc_encrypt): Likewise.
+       * mac_des_glue.c (mit_des3_cbc_encrypt): Likewise.
+
 2003-04-23  Ken Raeburn  <raeburn@mit.edu>
 
        * quad_cksum.c, t_pcbc.c, t_quad.c, verify.c: Don't declare errno

diff --git a/src/lib/des425/des.c b/src/lib/des425/des.c
index 27245bb366245d3211f1acad363ab519e84970c4..745b4bed5f1c9c221501a6fe604e12dd7a2cb78d 100644 (file)
--- a/src/lib/des425/des.c
+++ b/src/lib/des425/des.c
@@ -28,6 +28,7 @@
 
 #include "des_int.h"
 #include "des.h"
+#undef mit_des_cbc_encrypt
 
 int KRB5_CALLCONV
 des_ecb_encrypt(clear, cipher, schedule, enc)

diff --git a/src/lib/des425/enc_dec.c b/src/lib/des425/enc_dec.c
index 69e4a57cbaecd5e33df8d881b5007a955a1c4031..b75a63e2051309022dbee97c80e329a715b1cd7b 100644 (file)
--- a/src/lib/des425/enc_dec.c
+++ b/src/lib/des425/enc_dec.c
@@ -29,6 +29,7 @@
 
 #include "des_int.h"
 #include "des.h"
+#undef mit_des_cbc_encrypt
 
 int
 des_cbc_encrypt(in,out,length,key,iv,enc)

diff --git a/src/lib/des425/mac_des_glue.c b/src/lib/des425/mac_des_glue.c
index 130ced4bc963e6913762e866371347925fc41386..b7f3a6af8172177cfbddf566721d6b931bbb7eca 100644 (file)
--- a/src/lib/des425/mac_des_glue.c
+++ b/src/lib/des425/mac_des_glue.c
@@ -1,5 +1,6 @@
 #include "des_int.h"
 #include "des.h"
+#undef mit_des3_cbc_encrypt
 
 /* These functions are exported on KfM for ABI compatibility with
  * older versions of the library.  They have been pulled from the headers