Commit 4c37da80 authored by Richard Levitte's avatar Richard Levitte
Browse files

Merge in recent changes from 0.9.6-stable

parent 38179837

CHANGES

+14 −0
Original line number Diff line number Diff line
@@ -4,6 +4,20 @@ 


 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]

  

  *) MIPS assembler BIGNUM division bug fix. 

     [Andy Polyakov]



  *) Fix PKCS#7 decode routines so they correctly update the length

     after reading an EOC for the EXPLICIT tag.

     [Steve Henson]

NEWS

+24 −0
Original line number Diff line number Diff line
@@ -5,6 +5,30 @@ 
  This file gives a brief overview of the major changes between each OpenSSL

  release. For more details please read the CHANGES file.



  Major changes between OpenSSL 0.9.6 and OpenSSL 0.9.6a:



      o Security fix: change behavior of OpenSSL to avoid using

        environment variables when running as root.

      o Security fix: check the result of RSA-CRT to reduce the

        possibility of deducing the private key from an incorrectly

        calculated signature.

      o Security fix: prevent Bleichenbacher's DSA attack.

      o Security fix: Zero the premaster secret after deriving the

        master secret in DH ciphersuites.

      o Compatibility fix: the function des_encrypt() renamed to

        des_encrypt1() to avoid clashes with some Unixen libc.

      o Bug fixes for Win32, HP/UX and Irix.

      o Bug fixes in BIGNUM, SSL, PKCS#7, PKCS#12, X.509, CONF and

        memory checking routines.

      o Bug fixes for RSA operations in threaded enviroments.

      o Bug fixes in misc. openssl applications.

      o Remove a few potential memory leaks.

      o Add tighter checks of BIGNUM routines.

      o Shared library support has been reworked for generality.

      o More documentation.

      o New function BN_rand_range()

      o Add "-rand" option to openssl s_client and s_server.



  Major changes between OpenSSL 0.9.5a and OpenSSL 0.9.6:



      o Some documentation for BIO and SSL libraries.

crypto/des/cbc_cksm.c

+1 −1
Original line number Diff line number Diff line
@@ -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];

crypto/des/cfb64enc.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

crypto/des/cfb_enc.c

+2 −2
Original line number Diff line number Diff line
@@ -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