Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/openssl/openssl.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/ssl
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2003-10-02 14:55:25 +0400
committerRichard Levitte <levitte@openssl.org>2003-10-02 14:55:25 +0400
commit95a64aa4b8a0bfbfa15a65fe325ee09ad3e033ee (patch)
tree5a539b459673c07e6010efb20f424e1e877d7560 /ssl
parent80be2f484f40c400df739fc8bd804247a2253ddf (diff)
Recent changes from 0.9.7-stable
Diffstat (limited to 'ssl')
-rw-r--r--ssl/ssl_ciph.c4
-rw-r--r--ssl/ssltest.c9
2 files changed, 10 insertions, 3 deletions
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index 888b667fa1..585c70e4b3 100644
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -1129,11 +1129,11 @@ int SSL_COMP_add_compression_method(int id, COMP_METHOD *cm)
{
MemCheck_on();
SSLerr(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD,ERR_R_MALLOC_FAILURE);
- return(0);
+ return(1);
}
else
{
MemCheck_on();
- return(1);
+ return(0);
}
}
diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index 0800d243da..c7f33d9a7f 100644
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -596,7 +596,14 @@ bad:
if (cm != NULL)
{
if (cm->type != NID_undef)
- SSL_COMP_add_compression_method(comp, cm);
+ {
+ if (SSL_COMP_add_compression_method(comp, cm) != 0)
+ {
+ fprintf(stderr,
+ "Failed to add compression method\n");
+ ERR_print_errors_fp(stderr);
+ }
+ }
else
{
fprintf(stderr,