Commit c2e4f17c authored by Richard Levitte's avatar Richard Levitte
Browse files

Due to an increasing number of clashes between modern OpenSSL and 

libdes (which is still used out there) or other des implementations,
the OpenSSL DES functions are renamed to begin with DES_ instead of
des_.  Compatibility routines are provided and declared by including
openssl/des_old.h.  Those declarations are the same as were in des.h
when the OpenSSL project started, which is exactly how libdes looked
at that time, and hopefully still looks today.

The compatibility functions will be removed in some future release, at
the latest in version 1.0.
parent 979689aa

CHANGES

+13 −0
Original line number Diff line number Diff line
@@ -12,6 +12,19 @@ 
         *) applies to 0.9.6a/0.9.6b/0.9.6c and 0.9.7

         +) applies to 0.9.7 only



  +) Change all functions with names starting with des_ to be starting

     with DES_ instead.  This because there are increasing clashes with

     libdes and other des libraries that are currently used by other

     projects.  The old libdes interface is provided, as well as crypt(),

     if openssl/des_old.h is included.  Note that crypt() is no longer

     declared in openssl/des.h.



     NOTE: This is a major break of an old API into a new one.  Software

     authors are encouraged to switch to the DES_ style functions.  Some

     time in the future, des_old.h and the libdes compatibility functions

     will be completely removed.

     [Richard Levitte]



  *) Fix SSL handshake functions and SSL_clear() such that SSL_clear()

     never resets s->method to s->ctx->method when called from within

     one of the SSL handshake functions.

apps/Makefile.ssl

+42 −41
Original line number Diff line number Diff line
@@ -468,18 +468,19 @@ openssl.o: openssl.c progs.h s_apps.h 
passwd.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h

passwd.o: ../include/openssl/bn.h ../include/openssl/buffer.h

passwd.o: ../include/openssl/conf.h ../include/openssl/crypto.h

passwd.o: ../include/openssl/des.h ../include/openssl/dh.h

passwd.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h

passwd.o: ../include/openssl/err.h ../include/openssl/evp.h

passwd.o: ../include/openssl/lhash.h ../include/openssl/md5.h

passwd.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h

passwd.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h

passwd.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h

passwd.o: ../include/openssl/rand.h ../include/openssl/rsa.h

passwd.o: ../include/openssl/safestack.h ../include/openssl/sha.h

passwd.o: ../include/openssl/stack.h ../include/openssl/symhacks.h

passwd.o: ../include/openssl/txt_db.h ../include/openssl/x509.h

passwd.o: ../include/openssl/x509_vfy.h apps.h passwd.c

passwd.o: ../include/openssl/des.h ../include/openssl/des_old.h

passwd.o: ../include/openssl/dh.h ../include/openssl/dsa.h

passwd.o: ../include/openssl/e_os2.h ../include/openssl/err.h

passwd.o: ../include/openssl/evp.h ../include/openssl/lhash.h

passwd.o: ../include/openssl/md5.h ../include/openssl/obj_mac.h

passwd.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h

passwd.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h

passwd.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h

passwd.o: ../include/openssl/rsa.h ../include/openssl/safestack.h

passwd.o: ../include/openssl/sha.h ../include/openssl/stack.h

passwd.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h

passwd.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h

passwd.o: passwd.c

pkcs12.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h

pkcs12.o: ../include/openssl/bn.h ../include/openssl/buffer.h

pkcs12.o: ../include/openssl/conf.h ../include/openssl/crypto.h
@@ -710,23 +711,23 @@ speed.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h 
speed.o: ../include/openssl/blowfish.h ../include/openssl/bn.h

speed.o: ../include/openssl/buffer.h ../include/openssl/cast.h

speed.o: ../include/openssl/conf.h ../include/openssl/crypto.h

speed.o: ../include/openssl/des.h ../include/openssl/dh.h

speed.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h

speed.o: ../include/openssl/err.h ../include/openssl/evp.h

speed.o: ../include/openssl/hmac.h ../include/openssl/idea.h

speed.o: ../include/openssl/lhash.h ../include/openssl/md2.h

speed.o: ../include/openssl/md4.h ../include/openssl/md5.h

speed.o: ../include/openssl/mdc2.h ../include/openssl/obj_mac.h

speed.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h

speed.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h

speed.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h

speed.o: ../include/openssl/rc2.h ../include/openssl/rc4.h

speed.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h

speed.o: ../include/openssl/rsa.h ../include/openssl/safestack.h

speed.o: ../include/openssl/sha.h ../include/openssl/stack.h

speed.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h

speed.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h speed.c

speed.o: testdsa.h testrsa.h

speed.o: ../include/openssl/des.h ../include/openssl/des_old.h

speed.o: ../include/openssl/dh.h ../include/openssl/dsa.h

speed.o: ../include/openssl/e_os2.h ../include/openssl/err.h

speed.o: ../include/openssl/evp.h ../include/openssl/hmac.h

speed.o: ../include/openssl/idea.h ../include/openssl/lhash.h

speed.o: ../include/openssl/md2.h ../include/openssl/md4.h

speed.o: ../include/openssl/md5.h ../include/openssl/mdc2.h

speed.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h

speed.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h

speed.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h

speed.o: ../include/openssl/rand.h ../include/openssl/rc2.h

speed.o: ../include/openssl/rc4.h ../include/openssl/rc5.h

speed.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h

speed.o: ../include/openssl/safestack.h ../include/openssl/sha.h

speed.o: ../include/openssl/stack.h ../include/openssl/symhacks.h

speed.o: ../include/openssl/txt_db.h ../include/openssl/x509.h

speed.o: ../include/openssl/x509_vfy.h apps.h speed.c testdsa.h testrsa.h

spkac.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h

spkac.o: ../include/openssl/bn.h ../include/openssl/buffer.h

spkac.o: ../include/openssl/conf.h ../include/openssl/crypto.h
@@ -760,18 +761,18 @@ version.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h 
version.o: ../include/openssl/blowfish.h ../include/openssl/bn.h

version.o: ../include/openssl/buffer.h ../include/openssl/conf.h

version.o: ../include/openssl/crypto.h ../include/openssl/des.h

version.o: ../include/openssl/dh.h ../include/openssl/dsa.h

version.o: ../include/openssl/e_os2.h ../include/openssl/evp.h

version.o: ../include/openssl/idea.h ../include/openssl/lhash.h

version.o: ../include/openssl/md2.h ../include/openssl/obj_mac.h

version.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h

version.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h

version.o: ../include/openssl/pkcs7.h ../include/openssl/rc4.h

version.o: ../include/openssl/rsa.h ../include/openssl/safestack.h

version.o: ../include/openssl/sha.h ../include/openssl/stack.h

version.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h

version.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h

version.o: version.c

version.o: ../include/openssl/des_old.h ../include/openssl/dh.h

version.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h

version.o: ../include/openssl/evp.h ../include/openssl/idea.h

version.o: ../include/openssl/lhash.h ../include/openssl/md2.h

version.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h

version.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h

version.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h

version.o: ../include/openssl/rc4.h ../include/openssl/rsa.h

version.o: ../include/openssl/safestack.h ../include/openssl/sha.h

version.o: ../include/openssl/stack.h ../include/openssl/symhacks.h

version.o: ../include/openssl/txt_db.h ../include/openssl/x509.h

version.o: ../include/openssl/x509_vfy.h apps.h version.c

x509.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h

x509.o: ../include/openssl/bn.h ../include/openssl/buffer.h

x509.o: ../include/openssl/conf.h ../include/openssl/crypto.h

apps/passwd.c

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include <openssl/evp.h>

#include <openssl/rand.h>

#ifndef OPENSSL_NO_DES

# include <openssl/des.h>

# include <openssl/des_old.h>

#endif

#ifndef NO_MD5CRYPT_1

# include <openssl/evp.h>

apps/speed.c

+10 −8
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ 
#endif



#ifndef OPENSSL_NO_DES

#include <openssl/des.h>

#include <openssl/des_old.h>

#endif

#ifndef OPENSSL_NO_MD2

#include <openssl/md2.h>
@@ -377,11 +377,13 @@ int MAIN(int argc, char **argv) 
		 0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12};

	unsigned char iv[8];

#ifndef OPENSSL_NO_DES

	des_cblock *buf_as_des_cblock = NULL;

	DES_cblock *buf_as_des_cblock = NULL;

	static des_cblock key ={0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0};

	static des_cblock key2={0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12};

	static des_cblock key3={0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12,0x34};

	des_key_schedule sch,sch2,sch3;

	DES_key_schedule sch;

	DES_key_schedule sch2;

	DES_key_schedule sch3;

#endif

#define	D_MD2		0

#define	D_MDC2		1
@@ -804,9 +806,9 @@ int MAIN(int argc, char **argv) 
#endif



#ifndef OPENSSL_NO_DES

	des_set_key_unchecked(&key,&sch);

	des_set_key_unchecked(&key2,&sch2);

	des_set_key_unchecked(&key3,&sch3);

	DES_set_key_unchecked(&key,&sch);

	DES_set_key_unchecked(&key2,&sch2);

	DES_set_key_unchecked(&key3,&sch3);

#endif

#ifndef OPENSSL_NO_IDEA

	idea_set_encrypt_key(key16,&idea_ks);
@@ -1088,7 +1090,7 @@ int MAIN(int argc, char **argv) 
			print_message(names[D_CBC_DES],c[D_CBC_DES][j],lengths[j]);

			Time_F(START,usertime);

			for (count=0,run=1; COND(c[D_CBC_DES][j]); count++)

				des_ncbc_encrypt(buf,buf,lengths[j],&sch,

				DES_ncbc_encrypt(buf,buf,lengths[j],&sch,

						 &iv,DES_ENCRYPT);

			d=Time_F(STOP,usertime);

			BIO_printf(bio_err,"%ld %s's in %.2fs\n",
@@ -1104,7 +1106,7 @@ int MAIN(int argc, char **argv) 
			print_message(names[D_EDE3_DES],c[D_EDE3_DES][j],lengths[j]);

			Time_F(START,usertime);

			for (count=0,run=1; COND(c[D_EDE3_DES][j]); count++)

				des_ede3_cbc_encrypt(buf,buf,lengths[j],

				DES_ede3_cbc_encrypt(buf,buf,lengths[j],

						     &sch,&sch2,&sch3,

						     &iv,DES_ENCRYPT);

			d=Time_F(STOP,usertime);

apps/version.c

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ 
#include <openssl/crypto.h>

#include <openssl/md2.h>

#include <openssl/rc4.h>

#include <openssl/des.h>

#include <openssl/des_old.h>

#include <openssl/idea.h>

#include <openssl/blowfish.h>