summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Benjamin <davidben@davidben.net>2022-07-21 18:44:30 (GMT)
committerGitHub <noreply@github.com>2022-07-21 18:44:30 (GMT)
commit936f71e5d4f50f2238b0320d44f7fb5f88e39809 (patch)
tree59a5ba864858178cc56a6781f6fb1ca2aaee2d52
parenta6daaf2a132efbb1965b4502ff8a8cf3b5afed0e (diff)
downloadcpython-936f71e5d4f50f2238b0320d44f7fb5f88e39809.zip
cpython-936f71e5d4f50f2238b0320d44f7fb5f88e39809.tar.gz
cpython-936f71e5d4f50f2238b0320d44f7fb5f88e39809.tar.bz2
gh-95095: Use SSL_CTX_get_max_proto_version instead of SSL_CTX_ctrl (GH-95096)
The wrapper macros are more readable and match the form recommended in the OpenSSL documentation. They also slightly less error-prone, as the mapping of arguments to SSL_CTX_ctrl is not always clear. (Though in this case it's straightforward.) https://www.openssl.org/docs/man1.1.1/man3/SSL_CTX_get_max_proto_version.html
-rw-r--r--Modules/_ssl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 78c02c1..bf8bd9d 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -3515,7 +3515,7 @@ set_min_max_proto_version(PySSLContext *self, PyObject *arg, int what)
static PyObject *
get_minimum_version(PySSLContext *self, void *c)
{
- int v = SSL_CTX_ctrl(self->ctx, SSL_CTRL_GET_MIN_PROTO_VERSION, 0, NULL);
+ int v = SSL_CTX_get_min_proto_version(self->ctx);
if (v == 0) {
v = PY_PROTO_MINIMUM_SUPPORTED;
}
@@ -3531,7 +3531,7 @@ set_minimum_version(PySSLContext *self, PyObject *arg, void *c)
static PyObject *
get_maximum_version(PySSLContext *self, void *c)
{
- int v = SSL_CTX_ctrl(self->ctx, SSL_CTRL_GET_MAX_PROTO_VERSION, 0, NULL);
+ int v = SSL_CTX_get_max_proto_version(self->ctx);
if (v == 0) {
v = PY_PROTO_MAXIMUM_SUPPORTED;
}