summaryrefslogtreecommitdiff
path: root/ssl
diff options
context:
space:
mode:
authorBenjamin Kaduk <bkaduk@akamai.com>2018-09-19 21:14:04 -0500
committerBenjamin Kaduk <bkaduk@akamai.com>2020-08-12 18:02:42 -0700
commitdd0164e7565bb14fac193aea4c2c37714bf66d56 (patch)
tree8ecc1ed69d9ea3eb397887c0761295d9b255ca55 /ssl
parenteeccc237239d6f2b6fbc557be7062bfe2ab836be (diff)
downloadopenssl-new-dd0164e7565bb14fac193aea4c2c37714bf66d56.tar.gz
Mark SSL_CTX_set_ssl_version() as deprecated in 3.0
Also, document its unusual semantics of resetting the cipher list (but preserving other configuration). Reviewed-by: Paul Dale <paul.dale@oracle.com> Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org> (Merged from https://github.com/openssl/openssl/pull/7274)
Diffstat (limited to 'ssl')
-rw-r--r--ssl/ssl_lib.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 63a7433be4..f957664a48 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -642,6 +642,7 @@ int SSL_clear(SSL *s)
return 1;
}
+#ifndef OPENSSL_NO_DEPRECATED_3_0
/** Used to change an SSL_CTXs default SSL method type */
int SSL_CTX_set_ssl_version(SSL_CTX *ctx, const SSL_METHOD *meth)
{
@@ -664,6 +665,7 @@ int SSL_CTX_set_ssl_version(SSL_CTX *ctx, const SSL_METHOD *meth)
}
return 1;
}
+#endif
SSL *SSL_new(SSL_CTX *ctx)
{