Since there has been reports of clashes between OpenSSL's

des_encrypt() and des_encrypt() defined on some systems (Solaris and
Unixware and maybe others), we rename des_encrypt() to des_encrypt1().
This should have very little impact on external software unless
someone has written a mode of DES, since that's all des_encrypt() is
meant for.

diff --git a/CHANGES b/CHANGES
index 0c1f30e0b482517f591118ab1792853b291b883c..96fbadd4d8a0417bba3b6ef389732b698aaf80f4 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,11 +4,16 @@
 
  Changes between 0.9.6 and 0.9.6a  [xx XXX 2001]
 
+  *) Rename 'des_encrypt' to 'des_encrypt1'.  This avoids the clashes
+     with des_encrypt() defined on some operating systems, like Solaris
+     and UnixWare.
+     [Richard Levitte]
+
   *) Check the result of RSA-CRT (see D. Boneh, R. DeMillo, R. Lipton:
      On the Importance of Eliminating Errors in Cryptographic
-        Computations, J. Cryptology 14 (2001) 2, 101-119,
-        http://theory.stanford.edu/~dabo/papers/faults.ps.gz).
-        [Ulf Moeller]
+     Computations, J. Cryptology 14 (2001) 2, 101-119,
+     http://theory.stanford.edu/~dabo/papers/faults.ps.gz).
+     [Ulf Moeller]
   
   *) MIPS assembler BIGNUM division bug fix. 
      [Andy Polyakov]

diff --git a/crypto/des/cbc_cksm.c b/crypto/des/cbc_cksm.c
index 1e543cb2a19db7919bb495ccea4d81a744d4ca75..b857df09852a8260e7be1b8411b8cbabdb4de87e 100644 (file)
--- a/crypto/des/cbc_cksm.c
+++ b/crypto/des/cbc_cksm.c
@@ -82,7 +82,7 @@ DES_LONG des_cbc_cksum(const unsigned char *in, des_cblock *output,
                        
                tin0^=tout0; tin[0]=tin0;
                tin1^=tout1; tin[1]=tin1;
-               des_encrypt((DES_LONG *)tin,schedule,DES_ENCRYPT);
+               des_encrypt1((DES_LONG *)tin,schedule,DES_ENCRYPT);
                /* fix 15/10/91 eay - thanks to keithr@sco.COM */
                tout0=tin[0];
                tout1=tin[1];

diff --git a/crypto/des/cfb64enc.c b/crypto/des/cfb64enc.c
index 389a232cb36b026db38c193d79ada8d4b6f5297b..105530dfa3bae2061e16fbb1a9905b7362665158 100644 (file)
--- a/crypto/des/cfb64enc.c
+++ b/crypto/des/cfb64enc.c
@@ -82,7 +82,7 @@ void des_cfb64_encrypt(const unsigned char *in, unsigned char *out,
                                {
                                c2l(iv,v0); ti[0]=v0;
                                c2l(iv,v1); ti[1]=v1;
-                               des_encrypt(ti,schedule,DES_ENCRYPT);
+                               des_encrypt1(ti,schedule,DES_ENCRYPT);
                                iv = &(*ivec)[0];
                                v0=ti[0]; l2c(v0,iv);
                                v0=ti[1]; l2c(v0,iv);
@@ -102,7 +102,7 @@ void des_cfb64_encrypt(const unsigned char *in, unsigned char *out,
                                {
                                c2l(iv,v0); ti[0]=v0;
                                c2l(iv,v1); ti[1]=v1;
-                               des_encrypt(ti,schedule,DES_ENCRYPT);
+                               des_encrypt1(ti,schedule,DES_ENCRYPT);
                                iv = &(*ivec)[0];
                                v0=ti[0]; l2c(v0,iv);
                                v0=ti[1]; l2c(v0,iv);

diff --git a/crypto/des/cfb_enc.c b/crypto/des/cfb_enc.c
index cca34dd7c5ecd4caa3df8de16fe7a8cd9a18cca7..ec4fd4ea67bafe04741b7db77f01390347b962db 100644 (file)
--- a/crypto/des/cfb_enc.c
+++ b/crypto/des/cfb_enc.c
@@ -100,7 +100,7 @@ void des_cfb_encrypt(const unsigned char *in, unsigned char *out, int numbits,
                        l-=n;
                        ti[0]=v0;
                        ti[1]=v1;
-                       des_encrypt((DES_LONG *)ti,schedule,DES_ENCRYPT);
+                       des_encrypt1((DES_LONG *)ti,schedule,DES_ENCRYPT);
                        c2ln(in,d0,d1,n);
                        in+=n;
                        d0=(d0^ti[0])&mask0;
@@ -132,7 +132,7 @@ void des_cfb_encrypt(const unsigned char *in, unsigned char *out, int numbits,
                        l-=n;
                        ti[0]=v0;
                        ti[1]=v1;
-                       des_encrypt((DES_LONG *)ti,schedule,DES_ENCRYPT);
+                       des_encrypt1((DES_LONG *)ti,schedule,DES_ENCRYPT);
                        c2ln(in,d0,d1,n);
                        in+=n;
                        /* 30-08-94 - eay - changed because l>>32 and

diff --git a/crypto/des/des.h b/crypto/des/des.h
index 2db9748cb410fc5c4b4ca3ba906b8df753104580..6b8a7ee11b1d875dbb48341d370d295db3d4be68 100644 (file)
--- a/crypto/des/des.h
+++ b/crypto/des/des.h
@@ -147,14 +147,14 @@ void des_ecb_encrypt(const_des_cblock *input,des_cblock *output,
        Data is a pointer to 2 unsigned long's and ks is the
        des_key_schedule to use.  enc, is non zero specifies encryption,
        zero if decryption. */
-void des_encrypt(DES_LONG *data,des_key_schedule ks, int enc);
+void des_encrypt1(DES_LONG *data,des_key_schedule ks, int enc);
 
-/*     This functions is the same as des_encrypt() except that the DES
+/*     This functions is the same as des_encrypt1() except that the DES
        initial permutation (IP) and final permutation (FP) have been left
-       out.  As for des_encrypt(), you should not use this function.
+       out.  As for des_encrypt1(), you should not use this function.
        It is used by the routines in the library that implement triple DES.
        IP() des_encrypt2() des_encrypt2() des_encrypt2() FP() is the same
-       as des_encrypt() des_encrypt() des_encrypt() except faster :-). */
+       as des_encrypt1() des_encrypt1() des_encrypt1() except faster :-). */
 void des_encrypt2(DES_LONG *data,des_key_schedule ks, int enc);
 
 void des_encrypt3(DES_LONG *data, des_key_schedule ks1,

diff --git a/crypto/des/des_enc.c b/crypto/des/des_enc.c
index 8311e106281c29dc599112f78da1147098cf1f91..0bd9fa39bcd49d94d07883225fad07a4f6f2f3d7 100644 (file)
--- a/crypto/des/des_enc.c
+++ b/crypto/des/des_enc.c
@@ -58,7 +58,7 @@
 
 #include "des_locl.h"
 
-void des_encrypt(DES_LONG *data, des_key_schedule ks, int enc)
+void des_encrypt1(DES_LONG *data, des_key_schedule ks, int enc)
        {
        register DES_LONG l,r,t,u;
 #ifdef DES_PTR

diff --git a/crypto/des/des_opts.c b/crypto/des/des_opts.c
index b2ca7ac31d6c08d3176c05724bfe7c1740851394..82b3f29b9b75e2b7587a0af37d0a5ae7c89ef865 100644 (file)
--- a/crypto/des/des_opts.c
+++ b/crypto/des/des_opts.c
@@ -453,7 +453,7 @@ int main(int argc, char **argv)
                count*=2;
                Time_F(START);
                for (i=count; i; i--)
-                       des_encrypt(data,&(sch[0]),DES_ENCRYPT);
+                       des_encrypt1(data,&(sch[0]),DES_ENCRYPT);
                d=Time_F(STOP);
                } while (d < 3.0);
        ca=count;

diff --git a/crypto/des/ecb_enc.c b/crypto/des/ecb_enc.c
index b261a8aad9408b27d0e8cef87ac6202421e61d6b..d481327ef3b38a279d92c512b6d2c5c8a56e3c3f 100644 (file)
--- a/crypto/des/ecb_enc.c
+++ b/crypto/des/ecb_enc.c
@@ -114,7 +114,7 @@ void des_ecb_encrypt(const_des_cblock *input, des_cblock *output,
 
        c2l(in,l); ll[0]=l;
        c2l(in,l); ll[1]=l;
-       des_encrypt(ll,ks,enc);
+       des_encrypt1(ll,ks,enc);
        l=ll[0]; l2c(l,out);
        l=ll[1]; l2c(l,out);
        l=ll[0]=ll[1]=0;

diff --git a/crypto/des/ede_cbcm_enc.c b/crypto/des/ede_cbcm_enc.c
index c53062481ddd5441080f7d5589209b89024b872f..b98f7e17af1d640d67d3f7dddeeb676f8b755a08 100644 (file)
--- a/crypto/des/ede_cbcm_enc.c
+++ b/crypto/des/ede_cbcm_enc.c
@@ -95,7 +95,7 @@ void des_ede3_cbcm_encrypt(const unsigned char *in, unsigned char *out,
            {
            tin[0]=m0;
            tin[1]=m1;
-           des_encrypt(tin,ks3,1);
+           des_encrypt1(tin,ks3,1);
            m0=tin[0];
            m1=tin[1];
 
@@ -113,13 +113,13 @@ void des_ede3_cbcm_encrypt(const unsigned char *in, unsigned char *out,
 
            tin[0]=tin0;
            tin[1]=tin1;
-           des_encrypt(tin,ks1,1);
+           des_encrypt1(tin,ks1,1);
            tin[0]^=m0;
            tin[1]^=m1;
-           des_encrypt(tin,ks2,0);
+           des_encrypt1(tin,ks2,0);
            tin[0]^=m0;
            tin[1]^=m1;
-           des_encrypt(tin,ks1,1);
+           des_encrypt1(tin,ks1,1);
            tout0=tin[0];
            tout1=tin[1];
 
@@ -146,7 +146,7 @@ void des_ede3_cbcm_encrypt(const unsigned char *in, unsigned char *out,
            {
            tin[0]=m0;
            tin[1]=m1;
-           des_encrypt(tin,ks3,1);
+           des_encrypt1(tin,ks3,1);
            m0=tin[0];
            m1=tin[1];
 
@@ -158,13 +158,13 @@ void des_ede3_cbcm_encrypt(const unsigned char *in, unsigned char *out,
 
            tin[0]=tin0;
            tin[1]=tin1;
-           des_encrypt(tin,ks1,0);
+           des_encrypt1(tin,ks1,0);
            tin[0]^=m0;
            tin[1]^=m1;
-           des_encrypt(tin,ks2,1);
+           des_encrypt1(tin,ks2,1);
            tin[0]^=m0;
            tin[1]^=m1;
-           des_encrypt(tin,ks1,0);
+           des_encrypt1(tin,ks1,0);
            tout0=tin[0];
            tout1=tin[1];
 

diff --git a/crypto/des/ncbc_enc.c b/crypto/des/ncbc_enc.c
index 3b681691a9b797399e8a85128b7616031833ca5a..b8db07b199d6017933e8506ec4a56b7fd38c1a21 100644 (file)
--- a/crypto/des/ncbc_enc.c
+++ b/crypto/des/ncbc_enc.c
@@ -89,7 +89,7 @@ void des_ncbc_encrypt(const unsigned char *in, unsigned char *out, long length,
                        c2l(in,tin1);
                        tin0^=tout0; tin[0]=tin0;
                        tin1^=tout1; tin[1]=tin1;
-                       des_encrypt((DES_LONG *)tin,schedule,DES_ENCRYPT);
+                       des_encrypt1((DES_LONG *)tin,schedule,DES_ENCRYPT);
                        tout0=tin[0]; l2c(tout0,out);
                        tout1=tin[1]; l2c(tout1,out);
                        }
@@ -98,7 +98,7 @@ void des_ncbc_encrypt(const unsigned char *in, unsigned char *out, long length,
                        c2ln(in,tin0,tin1,l+8);
                        tin0^=tout0; tin[0]=tin0;
                        tin1^=tout1; tin[1]=tin1;
-                       des_encrypt((DES_LONG *)tin,schedule,DES_ENCRYPT);
+                       des_encrypt1((DES_LONG *)tin,schedule,DES_ENCRYPT);
                        tout0=tin[0]; l2c(tout0,out);
                        tout1=tin[1]; l2c(tout1,out);
                        }
@@ -116,7 +116,7 @@ void des_ncbc_encrypt(const unsigned char *in, unsigned char *out, long length,
                        {
                        c2l(in,tin0); tin[0]=tin0;
                        c2l(in,tin1); tin[1]=tin1;
-                       des_encrypt((DES_LONG *)tin,schedule,DES_DECRYPT);
+                       des_encrypt1((DES_LONG *)tin,schedule,DES_DECRYPT);
                        tout0=tin[0]^xor0;
                        tout1=tin[1]^xor1;
                        l2c(tout0,out);
@@ -128,7 +128,7 @@ void des_ncbc_encrypt(const unsigned char *in, unsigned char *out, long length,
                        {
                        c2l(in,tin0); tin[0]=tin0;
                        c2l(in,tin1); tin[1]=tin1;
-                       des_encrypt((DES_LONG *)tin,schedule,DES_DECRYPT);
+                       des_encrypt1((DES_LONG *)tin,schedule,DES_DECRYPT);
                        tout0=tin[0]^xor0;
                        tout1=tin[1]^xor1;
                        l2cn(tout0,tout1,out,l+8);

diff --git a/crypto/des/ofb64enc.c b/crypto/des/ofb64enc.c
index 64953959cab0dc87305a562d83ab0e0680f16755..1a1d1f1ac47076eb7947c2dc32e2f3cccf48a594 100644 (file)
--- a/crypto/des/ofb64enc.c
+++ b/crypto/des/ofb64enc.c
@@ -87,7 +87,7 @@ void des_ofb64_encrypt(register const unsigned char *in,
                {
                if (n == 0)
                        {
-                       des_encrypt(ti,schedule,DES_ENCRYPT);
+                       des_encrypt1(ti,schedule,DES_ENCRYPT);
                        dp=d;
                        t=ti[0]; l2c(t,dp);
                        t=ti[1]; l2c(t,dp);

diff --git a/crypto/des/ofb_enc.c b/crypto/des/ofb_enc.c
index a8f425a575a13bc2ff1cbd8a1f02da213d479359..70493e632ccf91b22b91ae30a5bb0537c000a73e 100644 (file)
--- a/crypto/des/ofb_enc.c
+++ b/crypto/des/ofb_enc.c
@@ -101,7 +101,7 @@ void des_ofb_encrypt(const unsigned char *in, unsigned char *out, int numbits,
                {
                ti[0]=v0;
                ti[1]=v1;
-               des_encrypt((DES_LONG *)ti,schedule,DES_ENCRYPT);
+               des_encrypt1((DES_LONG *)ti,schedule,DES_ENCRYPT);
                vv0=ti[0];
                vv1=ti[1];
                c2ln(in,d0,d1,n);

diff --git a/crypto/des/pcbc_enc.c b/crypto/des/pcbc_enc.c
index dd69a26d4aabb111fe560b5738f59d226d97ef63..5b987f074d316d6ef871df87b2f4bafe48e74bea 100644 (file)
--- a/crypto/des/pcbc_enc.c
+++ b/crypto/des/pcbc_enc.c
@@ -85,7 +85,7 @@ void des_pcbc_encrypt(const unsigned char *input, unsigned char *output,
                                c2ln(in,sin0,sin1,length);
                        tin[0]=sin0^xor0;
                        tin[1]=sin1^xor1;
-                       des_encrypt((DES_LONG *)tin,schedule,DES_ENCRYPT);
+                       des_encrypt1((DES_LONG *)tin,schedule,DES_ENCRYPT);
                        tout0=tin[0];
                        tout1=tin[1];
                        xor0=sin0^tout0;
@@ -103,7 +103,7 @@ void des_pcbc_encrypt(const unsigned char *input, unsigned char *output,
                        c2l(in,sin1);
                        tin[0]=sin0;
                        tin[1]=sin1;
-                       des_encrypt((DES_LONG *)tin,schedule,DES_DECRYPT);
+                       des_encrypt1((DES_LONG *)tin,schedule,DES_DECRYPT);
                        tout0=tin[0]^xor0;
                        tout1=tin[1]^xor1;
                        if (length >= 8)

diff --git a/crypto/des/speed.c b/crypto/des/speed.c
index 814b86f4aee517cb4177bdce8d350f050d5d0d38..1223edf2907973dbc3e19ca83fea39665e16c0c5 100644 (file)
--- a/crypto/des/speed.c
+++ b/crypto/des/speed.c
@@ -204,7 +204,7 @@ int main(int argc, char **argv)
                count*=2;
                Time_F(START);
                for (i=count; i; i--)
-                       des_encrypt(data,&(sch[0]),DES_ENCRYPT);
+                       des_encrypt1(data,&(sch[0]),DES_ENCRYPT);
                d=Time_F(STOP);
                } while (d < 3.0);
        ca=count;
@@ -241,7 +241,7 @@ int main(int argc, char **argv)
                {
                DES_LONG data[2];
 
-               des_encrypt(data,&(sch[0]),DES_ENCRYPT);
+               des_encrypt1(data,&(sch[0]),DES_ENCRYPT);
                }
        d=Time_F(STOP);
        printf("%ld des_encrypt's in %.2f second\n",count,d);

diff --git a/crypto/des/xcbc_enc.c b/crypto/des/xcbc_enc.c
index 51e17e6b8a64c38ac8471f73bcf367ec91cd603f..ccfede13aca6e1725786e516bd701943a2aad5b4 100644 (file)
--- a/crypto/des/xcbc_enc.c
+++ b/crypto/des/xcbc_enc.c
@@ -138,7 +138,7 @@ void des_xcbc_encrypt(const unsigned char *in, unsigned char *out,
                        c2l(in,tin1);
                        tin0^=tout0^inW0; tin[0]=tin0;
                        tin1^=tout1^inW1; tin[1]=tin1;
-                       des_encrypt(tin,schedule,DES_ENCRYPT);
+                       des_encrypt1(tin,schedule,DES_ENCRYPT);
                        tout0=tin[0]^outW0; l2c(tout0,out);
                        tout1=tin[1]^outW1; l2c(tout1,out);
                        }
@@ -147,7 +147,7 @@ void des_xcbc_encrypt(const unsigned char *in, unsigned char *out,
                        c2ln(in,tin0,tin1,l+8);
                        tin0^=tout0^inW0; tin[0]=tin0;
                        tin1^=tout1^inW1; tin[1]=tin1;
-                       des_encrypt(tin,schedule,DES_ENCRYPT);
+                       des_encrypt1(tin,schedule,DES_ENCRYPT);
                        tout0=tin[0]^outW0; l2c(tout0,out);
                        tout1=tin[1]^outW1; l2c(tout1,out);
                        }
@@ -163,7 +163,7 @@ void des_xcbc_encrypt(const unsigned char *in, unsigned char *out,
                        {
                        c2l(in,tin0); tin[0]=tin0^outW0;
                        c2l(in,tin1); tin[1]=tin1^outW1;
-                       des_encrypt(tin,schedule,DES_DECRYPT);
+                       des_encrypt1(tin,schedule,DES_DECRYPT);
                        tout0=tin[0]^xor0^inW0;
                        tout1=tin[1]^xor1^inW1;
                        l2c(tout0,out);
@@ -175,7 +175,7 @@ void des_xcbc_encrypt(const unsigned char *in, unsigned char *out,
                        {
                        c2l(in,tin0); tin[0]=tin0^outW0;
                        c2l(in,tin1); tin[1]=tin1^outW1;
-                       des_encrypt(tin,schedule,DES_DECRYPT);
+                       des_encrypt1(tin,schedule,DES_DECRYPT);
                        tout0=tin[0]^xor0^inW0;
                        tout1=tin[1]^xor1^inW1;
                        l2cn(tout0,tout1,out,l+8);