Recent changes from 0.9.6-stable.

diff --git a/STATUS b/STATUS
index 4ad6e616fae134096e1bf5451fc499268a0acc2e..228718997e1796fdd811f912465878340a84645c 100644 (file)
--- 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 ec4fd4ea67bafe04741b7db77f01390347b962db..74f6b9d04f33cf1152a410cd12f04f508af7fe52 100644 (file)
--- 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 41186883af692057509018a4a45dbba3a1e0417e..0e3aabc678f1850f1ac28ff1de24015925498a21 100644 (file)
--- 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 f63163f26c38cfd1964194803e67b0c51c4a04ee..121056697aeb31c37426e070ba5db53d5111c1b8 100644 (file)
--- 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);
        }