From e1e4df7c391a5c85ead550f2b5905317b011f66a Mon Sep 17 00:00:00 2001
From: tedu <>
Date: Thu, 10 Jul 2014 09:15:51 +0000
Subject: forgot to decompress here too

---
 src/lib/libssl/src/apps/openssl.c  |  6 +-----
 src/lib/libssl/src/apps/s_client.c | 13 +------------
 2 files changed, 2 insertions(+), 17 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/libssl/src/apps/openssl.c b/src/lib/libssl/src/apps/openssl.c
index ad070a1b5e..9ebeaebbda 100644
--- a/src/lib/libssl/src/apps/openssl.c
+++ b/src/lib/libssl/src/apps/openssl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: openssl.c,v 1.38 2014/06/12 15:49:27 deraadt Exp $ */
+/* $OpenBSD: openssl.c,v 1.39 2014/07/10 09:15:51 tedu Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -234,10 +234,6 @@ openssl_shutdown(void)
 	ERR_remove_thread_state(NULL);
 	RAND_cleanup();
 	ERR_free_strings();
-
-#ifndef OPENSSL_NO_COMP
-	COMP_zlib_cleanup();
-#endif
 }
 
 int
diff --git a/src/lib/libssl/src/apps/s_client.c b/src/lib/libssl/src/apps/s_client.c
index b0225c9324..89e14693f1 100644
--- a/src/lib/libssl/src/apps/s_client.c
+++ b/src/lib/libssl/src/apps/s_client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s_client.c,v 1.63 2014/07/09 20:59:41 tedu Exp $ */
+/* $OpenBSD: s_client.c,v 1.64 2014/07/10 09:15:51 tedu Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1414,9 +1414,6 @@ print_stuff(BIO * bio, SSL * s, int full)
 	const SSL_CIPHER *c;
 	X509_NAME *xn;
 	int j, i;
-#ifndef OPENSSL_NO_COMP
-	const COMP_METHOD *comp, *expansion;
-#endif
 	unsigned char *exportedkeymat;
 
 	if (full) {
@@ -1511,14 +1508,6 @@ print_stuff(BIO * bio, SSL * s, int full)
 	}
 	BIO_printf(bio, "Secure Renegotiation IS%s supported\n",
 	    SSL_get_secure_renegotiation_support(s) ? "" : " NOT");
-#ifndef OPENSSL_NO_COMP
-	comp = SSL_get_current_compression(s);
-	expansion = SSL_get_current_expansion(s);
-	BIO_printf(bio, "Compression: %s\n",
-	    comp ? SSL_COMP_get_name(comp) : "NONE");
-	BIO_printf(bio, "Expansion: %s\n",
-	    expansion ? SSL_COMP_get_name(expansion) : "NONE");
-#endif
 
 #ifdef SSL_DEBUG
 	{
-- 
cgit v1.2.3-55-g6feb