diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2003-07-17 12:31:31 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2003-07-17 12:31:31 +0000 |
| commit | 3a507eb5f473854153d48197b3cd6c3d81534d48 (patch) | |
| tree | a85d6457838595f98a4ddee2de5b2804c054933d /src | |
| parent | 8adf21085bd25784a9a6d2c36df4f9efa83b450c (diff) | |
| download | krb5-3a507eb5f473854153d48197b3cd6c3d81534d48.tar.gz krb5-3a507eb5f473854153d48197b3cd6c3d81534d48.tar.xz krb5-3a507eb5f473854153d48197b3cd6c3d81534d48.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/des425/ChangeLog | 6 | ||||
| -rw-r--r-- | src/lib/des425/des.c | 1 | ||||
| -rw-r--r-- | src/lib/des425/enc_dec.c | 1 | ||||
| -rw-r--r-- | src/lib/des425/mac_des_glue.c | 1 |
4 files changed, 9 insertions, 0 deletions
diff --git a/src/lib/des425/ChangeLog b/src/lib/des425/ChangeLog index 9ab878a94..d4ebd99fd 100644 --- 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 27245bb36..745b4bed5 100644 --- 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 69e4a57cb..b75a63e20 100644 --- 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 130ced4bc..b7f3a6af8 100644 --- 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 |