summaryrefslogtreecommitdiffstats
path: root/lib/libssl/ssl_lib.c
diff options
context:
space:
mode:
authorjsing <jsing@openbsd.org>2014-07-10 11:58:08 +0000
committerjsing <jsing@openbsd.org>2014-07-10 11:58:08 +0000
commit99906d1eeeedc42ecfaf35f2c6d15bb10d993f70 (patch)
tree43bc9f92bc8b689fc37fdc75ffa11bd33b2b3bc4 /lib/libssl/ssl_lib.c
parentClear CPUF_PARK flag to avoid re-parking on resume. (diff)
downloadwireguard-openbsd-99906d1eeeedc42ecfaf35f2c6d15bb10d993f70.tar.xz
wireguard-openbsd-99906d1eeeedc42ecfaf35f2c6d15bb10d993f70.zip
Remove more compression tendrils.
ok tedu@
Diffstat (limited to 'lib/libssl/ssl_lib.c')
-rw-r--r--lib/libssl/ssl_lib.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/libssl/ssl_lib.c b/lib/libssl/ssl_lib.c
index 765012e861e..5473690e095 100644
--- a/lib/libssl/ssl_lib.c
+++ b/lib/libssl/ssl_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_lib.c,v 1.72 2014/07/10 08:51:15 tedu Exp $ */
+/* $OpenBSD: ssl_lib.c,v 1.73 2014/07/10 11:58:08 jsing Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -1896,8 +1896,6 @@ SSL_CTX_free(SSL_CTX *a)
sk_X509_NAME_pop_free(a->client_CA, X509_NAME_free);
if (a->extra_certs != NULL)
sk_X509_pop_free(a->extra_certs, X509_free);
- /* Don't free, since it removes a global database */
- a->comp_methods = NULL;
#ifndef OPENSSL_NO_SRTP
if (a->srtp_profiles)
@@ -3060,6 +3058,4 @@ SSL_cache_hit(SSL *s)
}
IMPLEMENT_STACK_OF(SSL_CIPHER)
-IMPLEMENT_STACK_OF(SSL_COMP)
-IMPLEMENT_OBJ_BSEARCH_GLOBAL_CMP_FN(SSL_CIPHER, SSL_CIPHER,
- ssl_cipher_id);
+IMPLEMENT_OBJ_BSEARCH_GLOBAL_CMP_FN(SSL_CIPHER, SSL_CIPHER, ssl_cipher_id);