Update source files for pre-3.0 deprecation Reviewed-by: Tim Hudson <tjh@openssl.org> (Merged from https://github.com/openssl/openssl/pull/10364)
diff --git a/ssl/methods.c b/ssl/methods.c index 0b03f80..6118fdb 100644 --- a/ssl/methods.c +++ b/ssl/methods.c
@@ -172,7 +172,7 @@ 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 2c901ff1..74161b0 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c
@@ -4243,7 +4243,7 @@ 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 @@ 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... */