From 074dd6140b628614c71e89d51539c87a67ba9a17 Mon Sep 17 00:00:00 2001
From: miod <>
Date: Wed, 18 Jun 2014 04:47:32 +0000
Subject: In SSL_COMP_add_compression_method(), make sure error cases actually
 return `error' rather than `success'.

ok deraadt@
---
 src/lib/libssl/src/ssl/ssl_ciph.c | 4 ++--
 src/lib/libssl/ssl_ciph.c         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/lib/libssl/src/ssl/ssl_ciph.c b/src/lib/libssl/src/ssl/ssl_ciph.c
index a89c8253c8..d491a0cab6 100644
--- a/src/lib/libssl/src/ssl/ssl_ciph.c
+++ b/src/lib/libssl/src/ssl/ssl_ciph.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_ciph.c,v 1.53 2014/06/13 13:28:53 jsing Exp $ */
+/* $OpenBSD: ssl_ciph.c,v 1.54 2014/06/18 04:47:32 miod Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -2029,7 +2029,7 @@ SSL_COMP_add_compression_method(int id, COMP_METHOD *cm)
 	if (id < 193 || id > 255) {
 		SSLerr(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD,
 		    SSL_R_COMPRESSION_ID_NOT_WITHIN_PRIVATE_RANGE);
-		return 0;
+		return 1;
 	}
 
 	comp = malloc(sizeof(SSL_COMP));
diff --git a/src/lib/libssl/ssl_ciph.c b/src/lib/libssl/ssl_ciph.c
index a89c8253c8..d491a0cab6 100644
--- a/src/lib/libssl/ssl_ciph.c
+++ b/src/lib/libssl/ssl_ciph.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_ciph.c,v 1.53 2014/06/13 13:28:53 jsing Exp $ */
+/* $OpenBSD: ssl_ciph.c,v 1.54 2014/06/18 04:47:32 miod Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -2029,7 +2029,7 @@ SSL_COMP_add_compression_method(int id, COMP_METHOD *cm)
 	if (id < 193 || id > 255) {
 		SSLerr(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD,
 		    SSL_R_COMPRESSION_ID_NOT_WITHIN_PRIVATE_RANGE);
-		return 0;
+		return 1;
 	}
 
 	comp = malloc(sizeof(SSL_COMP));
-- 
cgit v1.2.3-55-g6feb