From 69410cf5eb395eacb0401931c3c982d683d4bc0d Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Thu, 2 Oct 2003 18:09:29 +0000
Subject: [PATCH] Recent changes from 0.9.6-stable.

---
 STATUS               | 2 +-
 crypto/des/cfb_enc.c | 1 +
 crypto/opensslv.h    | 2 +-
 ssl/ssl_ciph.c       | 4 ++--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/STATUS b/STATUS
index 4ad6e616fa..228718997e 100644
--- a/STATUS
+++ b/STATUS
@@ -1,6 +1,6 @@
 
   OpenSSL STATUS                           Last modified at
-  ______________                           $Date: 2003/09/30 12:10:06 $
+  ______________                           $Date: 2003/10/02 18:09:27 $
 
   DEVELOPMENT STATE
 
diff --git a/crypto/des/cfb_enc.c b/crypto/des/cfb_enc.c
index ec4fd4ea67..74f6b9d04f 100644
--- a/crypto/des/cfb_enc.c
+++ b/crypto/des/cfb_enc.c
@@ -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.
diff --git a/crypto/opensslv.h b/crypto/opensslv.h
index 41186883af..0e3aabc678 100644
--- a/crypto/opensslv.h
+++ b/crypto/opensslv.h
@@ -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
 
 
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index f63163f26c..121056697a 100644
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -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);
 	}
 
-- 
2.25.1