diff options
| author |   tedu <tedu@openbsd.org> | 2014-07-10 09:15:51 +0000 |
|---|---|---|
| committer | tedu <tedu@openbsd.org> | 2014-07-10 09:15:51 +0000 |
| commit | 64dd15ffd42aaec7ef9b37e3b063d0b86e5f527d (patch) | |
| tree | b0295bc8b97fb1f7c1d011a57fbbd4c59544114a /lib/libssl | |
| parent | Don't document the guts of struct syslog_data. This man page only needs (diff) | |
| download | wireguard-openbsd-64dd15ffd42aaec7ef9b37e3b063d0b86e5f527d.tar.xz wireguard-openbsd-64dd15ffd42aaec7ef9b37e3b063d0b86e5f527d.zip | |
forgot to decompress here too
Diffstat (limited to 'lib/libssl')
| -rw-r--r-- | lib/libssl/src/apps/openssl.c | 6 | ||||
| -rw-r--r-- | lib/libssl/src/apps/s_client.c | 13 |
2 files changed, 2 insertions, 17 deletions
diff --git a/lib/libssl/src/apps/openssl.c b/lib/libssl/src/apps/openssl.c index ad070a1b5e9..9ebeaebbda1 100644 --- a/lib/libssl/src/apps/openssl.c +++ b/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/lib/libssl/src/apps/s_client.c b/lib/libssl/src/apps/s_client.c index b0225c93247..89e14693f1a 100644 --- a/lib/libssl/src/apps/s_client.c +++ b/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 { |