diff options
Diffstat (limited to 'src/lib/libssl/ssl_lib.c')
-rw-r--r-- | src/lib/libssl/ssl_lib.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c index 765012e861..5473690e09 100644 --- a/src/lib/libssl/ssl_lib.c +++ b/src/lib/libssl/ssl_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_lib.c,v 1.72 2014/07/10 08:51:15 tedu Exp $ */ | 1 | /* $OpenBSD: ssl_lib.c,v 1.73 2014/07/10 11:58:08 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -1896,8 +1896,6 @@ SSL_CTX_free(SSL_CTX *a) | |||
1896 | sk_X509_NAME_pop_free(a->client_CA, X509_NAME_free); | 1896 | sk_X509_NAME_pop_free(a->client_CA, X509_NAME_free); |
1897 | if (a->extra_certs != NULL) | 1897 | if (a->extra_certs != NULL) |
1898 | sk_X509_pop_free(a->extra_certs, X509_free); | 1898 | sk_X509_pop_free(a->extra_certs, X509_free); |
1899 | /* Don't free, since it removes a global database */ | ||
1900 | a->comp_methods = NULL; | ||
1901 | 1899 | ||
1902 | #ifndef OPENSSL_NO_SRTP | 1900 | #ifndef OPENSSL_NO_SRTP |
1903 | if (a->srtp_profiles) | 1901 | if (a->srtp_profiles) |
@@ -3060,6 +3058,4 @@ SSL_cache_hit(SSL *s) | |||
3060 | } | 3058 | } |
3061 | 3059 | ||
3062 | IMPLEMENT_STACK_OF(SSL_CIPHER) | 3060 | IMPLEMENT_STACK_OF(SSL_CIPHER) |
3063 | IMPLEMENT_STACK_OF(SSL_COMP) | 3061 | IMPLEMENT_OBJ_BSEARCH_GLOBAL_CMP_FN(SSL_CIPHER, SSL_CIPHER, ssl_cipher_id); |
3064 | IMPLEMENT_OBJ_BSEARCH_GLOBAL_CMP_FN(SSL_CIPHER, SSL_CIPHER, | ||
3065 | ssl_cipher_id); | ||