From 00db8c60aaecd2ff9b0a5d9fd10c7771a1e1a73e Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Tue, 5 Nov 2019 17:34:09 +0100 Subject: Update source files for pre-3.0 deprecation Reviewed-by: Tim Hudson (Merged from https://github.com/openssl/openssl/pull/10364) --- ssl/methods.c | 2 +- ssl/ssl_lib.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'ssl') diff --git a/ssl/methods.c b/ssl/methods.c index 0b03f80160..6118fdbaae 100644 --- a/ssl/methods.c +++ b/ssl/methods.c @@ -172,7 +172,7 @@ IMPLEMENT_dtls1_meth_func(DTLS_ANY_VERSION, 0, 0, DTLS_client_method, ssl_undefined_function, ossl_statem_connect, DTLSv1_2_enc_data) -#if !OPENSSL_API_1_1_0 +#ifndef OPENSSL_NO_DEPRECATED_1_1_0 # ifndef OPENSSL_NO_TLS1_2_METHOD const SSL_METHOD *TLSv1_2_method(void) { diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 2c901ff176..74161b0cb7 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -4243,7 +4243,7 @@ int SSL_CTX_load_verify_store(SSL_CTX *ctx, const char *CAstore) return X509_STORE_load_store(ctx->cert_store, CAstore); } -#if OPENSSL_API_LEVEL < 3 +#ifndef OPENSSL_NO_DEPRECATED_3_0 int SSL_CTX_load_verify_locations(SSL_CTX *ctx, const char *CAfile, const char *CApath) { @@ -4668,7 +4668,7 @@ int SSL_is_server(const SSL *s) return s->server; } -#if !OPENSSL_API_1_1_0 +#ifndef OPENSSL_NO_DEPRECATED_1_1_0 void SSL_set_debug(SSL *s, int debug) { /* Old function was do-nothing anyway... */ -- cgit v1.2.3