diff options
| author | Sam Varshavchik | 2016-09-20 21:37:26 -0400 |
|---|---|---|
| committer | Sam Varshavchik | 2016-09-20 21:37:26 -0400 |
| commit | 5f7973cc9898685380e7256169e1d5eb8e5757e7 (patch) | |
| tree | 9c063edb9076d45513fb875e81280e577b68e889 | |
| parent | 61669a2a45059cf24a4f1cf920ebf24503fea2e2 (diff) | |
| download | courier-libs-5f7973cc9898685380e7256169e1d5eb8e5757e7.tar.bz2 | |
OpenSSL: remove old deinitialization functions
| -rw-r--r-- | tcpd/configure.ac | 1 | ||||
| -rw-r--r-- | tcpd/libcouriertls.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/tcpd/configure.ac b/tcpd/configure.ac index 447ba72..e3c25b1 100644 --- a/tcpd/configure.ac +++ b/tcpd/configure.ac @@ -286,6 +286,7 @@ AC_MSG_RESULT($spipe) AC_CHECK_HEADER(openssl/ssl.h,have_ssl_h=yes,have_ssl_h=no) AC_CHECK_LIB(ssl, SSL_load_error_strings, have_ssl=yes, have_ssl=no, -lcrypto) +AC_CHECK_LIB(ssl, OPENSSL_cleanup,have_ssl=yes) if test "$have_ssl" = "yes" then diff --git a/tcpd/libcouriertls.c b/tcpd/libcouriertls.c index 81ef3e2..0c091ba 100644 --- a/tcpd/libcouriertls.c +++ b/tcpd/libcouriertls.c @@ -608,8 +608,10 @@ SSL_CTX *tls_create_int(int isserver, const struct tls_info *info, if (first) { first=0; +#if OPENSSL_API_COMPAT < 0x10100000L SSL_load_error_strings(); SSLeay_add_ssl_algorithms(); +#endif while (RAND_status() != 1) { |