diff options
| author | levitte <levitte> | 2003-10-02 18:09:27 +0000 |
|---|---|---|
| committer | levitte <levitte> | 2003-10-02 18:09:27 +0000 |
| commit | 05c13711212ae4c35f3fae596fe6e35456bcd9a1 (patch) | |
| tree | 11aaacc49a97f3a8d4601b17adf224f1d31d37b3 | |
| parent | 6cc4573502e9263bd1ef65b291ab80e7dcd67ef8 (diff) | |
| download | openssl-05c13711212ae4c35f3fae596fe6e35456bcd9a1.tar.gz | |
Recent changes from 0.9.6-stable.
| -rw-r--r-- | STATUS | 2 | ||||
| -rw-r--r-- | crypto/des/cfb_enc.c | 1 | ||||
| -rw-r--r-- | crypto/opensslv.h | 2 | ||||
| -rw-r--r-- | ssl/ssl_ciph.c | 4 |
4 files changed, 5 insertions, 4 deletions
@@ -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 ec4fd4ea6..74f6b9d04 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 41186883a..0e3aabc67 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 f63163f26..121056697 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); } |