Commit 69410cf5 authored by Richard Levitte's avatar Richard Levitte
Browse files

Recent changes from 0.9.6-stable.

parent 8e4b4e10

STATUS

+1 −1
Original line number Diff line number Diff line 


  OpenSSL STATUS                           Last modified at

  ______________                           $Date: 2003/09/30 12:10:06 $

  ______________                           $Date: 2003/10/02 18:09:27 $



  DEVELOPMENT STATE

crypto/des/cfb_enc.c

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ 
 * [including the GNU Public Licence.]

 */



#include "e_os.h"

#include "des_locl.h"



/* The input and output are loaded in multiples of 8 bits.

crypto/opensslv.h

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
 *  major minor fix final patch/beta)

 */

#define OPENSSL_VERSION_NUMBER	0x009060c0L

#define OPENSSL_VERSION_TEXT	"OpenSSL 0.9.6l-dev [engine] 30 Sep 2003"

#define OPENSSL_VERSION_TEXT	"OpenSSL 0.9.6l-dev [engine] xx XXX XXXX"

#define OPENSSL_VERSION_PTEXT	" part of " OPENSSL_VERSION_TEXT

ssl/ssl_ciph.c

+2 −2
Original line number Diff line number Diff line
@@ -1063,9 +1063,9 @@ int SSL_COMP_add_compression_method(int id, COMP_METHOD *cm) 
	if ((sk == NULL) || !sk_SSL_COMP_push(sk,comp))

		{

		SSLerr(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD,ERR_R_MALLOC_FAILURE);

		return(0);

		return(1);

		}

	else

		return(1);

		return(0);

	}