diff options
| author | Tor Egge <Tor.Egge@broadpark.no> | 2018-09-05 21:05:53 +0200 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@broadpark.no> | 2018-09-05 21:11:32 +0200 |
| commit | 7bc3e156ffae020c3d38535cbd3aaf318a66bcbb (patch) | |
| tree | fe9b9826199e385ad481f66547a6488b54b94222 /vespalib | |
| parent | be4c7dafa47211904cda7e565161566815cd89a8 (diff) | |
Ignore deprecated declaration diagnostic when using openssl 1.1.0h.
Diffstat (limited to 'vespalib')
| -rw-r--r-- | vespalib/src/vespa/vespalib/net/tls/impl/openssl_tls_context_impl.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/vespalib/src/vespa/vespalib/net/tls/impl/openssl_tls_context_impl.cpp b/vespalib/src/vespa/vespalib/net/tls/impl/openssl_tls_context_impl.cpp index cff8c2621bc..561c3af0e98 100644 --- a/vespalib/src/vespa/vespalib/net/tls/impl/openssl_tls_context_impl.cpp +++ b/vespalib/src/vespa/vespalib/net/tls/impl/openssl_tls_context_impl.cpp @@ -75,9 +75,9 @@ OpenSslLibraryResources::~OpenSslLibraryResources() { ::CRYPTO_set_locking_callback(nullptr); } #endif - ::ERR_free_strings(); - ::EVP_cleanup(); - ::CRYPTO_cleanup_all_ex_data(); + ERR_free_strings(); + EVP_cleanup(); + CRYPTO_cleanup_all_ex_data(); } // TODO make global init instead..? @@ -137,7 +137,10 @@ X509Ptr read_untrusted_x509_from_bio(::BIO& bio) { ::SSL_CTX* new_tls1_2_ctx_with_auto_init() { ensure_openssl_initialized_once(); +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" return ::SSL_CTX_new(::TLSv1_2_method()); +#pragma GCC diagnostic pop } } // anon ns |