set_options() uses unsigned long long

vstinner · vstinner · commit f3f6c45eb8cc · 2023-07-13T01:55:36.000+02:00
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
@@ -3623,7 +3623,7 @@ static int
 set_options(PySSLContext *self, PyObject *arg, void *c)
 {
     PyObject *new_opts_obj;
-    unsigned long new_opts_arg;
+    unsigned long long new_opts_arg;
     uint64_t new_opts, opts, clear, set;
     uint64_t opt_no = (
         SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1 |
@@ -3633,8 +3633,8 @@ set_options(PySSLContext *self, PyObject *arg, void *c)
     if (!PyArg_Parse(arg, "O!", &PyLong_Type, &new_opts_obj)) {
         return -1;
     }
-    new_opts_arg = PyLong_AsUnsignedLong(new_opts_obj);
-    if (new_opts_arg == (unsigned long)-1 && PyErr_Occurred()) {
+    new_opts_arg = PyLong_AsUnsignedLongLong(new_opts_obj);
+    if (new_opts_arg == (unsigned long long)-1 && PyErr_Occurred()) {
         return -1;
     }
     Py_BUILD_ASSERT(sizeof(new_opts) >= sizeof(new_opts_arg));

Original file line number	Diff line number	Diff line change
`@@ -3623,7 +3623,7 @@ static int`
`3623`	`3623`	`set_options(PySSLContext self, PyObject arg, void *c)`
`3624`	`3624`	`{`
`3625`	`3625`	`PyObject *new_opts_obj;`
`3626`		`- unsigned long new_opts_arg;`
	`3626`	`+ unsigned long long new_opts_arg;`
`3627`	`3627`	`uint64_t new_opts, opts, clear, set;`
`3628`	`3628`	`uint64_t opt_no = (`
`3629`	`3629`	`SSL_OP_NO_SSLv2 \| SSL_OP_NO_SSLv3 \| SSL_OP_NO_TLSv1 \|`
`@@ -3633,8 +3633,8 @@ set_options(PySSLContext self, PyObject arg, void *c)`
`3633`	`3633`	`if (!PyArg_Parse(arg, "O!", &PyLong_Type, &new_opts_obj)) {`
`3634`	`3634`	`return -1;`
`3635`	`3635`	`}`
`3636`		`- new_opts_arg = PyLong_AsUnsignedLong(new_opts_obj);`
`3637`		`- if (new_opts_arg == (unsigned long)-1 && PyErr_Occurred()) {`
	`3636`	`+ new_opts_arg = PyLong_AsUnsignedLongLong(new_opts_obj);`
	`3637`	`+ if (new_opts_arg == (unsigned long long)-1 && PyErr_Occurred()) {`
`3638`	`3638`	`return -1;`
`3639`	`3639`	`}`
`3640`	`3640`	`Py_BUILD_ASSERT(sizeof(new_opts) >= sizeof(new_opts_arg));`