Skip to content

C
capnproto
Commit fcddda18 authored by Kenton Varda's avatar Kenton Varda
Browse files
Options

Avoid deprecation warning with OpenSSL 1.1.0.

parent 23db5e3f
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 0 deletions
c++/src/kj/compat/tls.c++
View file @ fcddda18
...@@ -75,6 +75,7 @@ void X509_up_ref(X509* x509) { ...@@ -75,6 +75,7 @@ void X509_up_ref(X509* x509) {
#endif #endif
#if OPENSSL_VERSION_NUMBER < 0x10100000L
class OpenSslInit { class OpenSslInit {
// Initializes the OpenSSL library. // Initializes the OpenSSL library.
public: public:
...@@ -89,6 +90,11 @@ void ensureOpenSslInitialized() { ...@@ -89,6 +90,11 @@ void ensureOpenSslInitialized() {
// Initializes the OpenSSL library the first time it is called. // Initializes the OpenSSL library the first time it is called.
static OpenSslInit init; static OpenSslInit init;
} }
#else
inline void ensureOpenSslInitialized() {
// As of 1.1.0, no initialization is needed.
}
#endif
// ======================================================================================= // =======================================================================================
// Implementation of kj::AsyncIoStream that applies TLS on top of some other AsyncIoStream. // Implementation of kj::AsyncIoStream that applies TLS on top of some other AsyncIoStream.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment