Commit a596338b authored by Antoine Pitrou's avatar Antoine Pitrou

Fix previous fix (the cause was actually a misplaced #endif, or so it seems)

parent 41f8c4f5
...@@ -2499,6 +2499,7 @@ error: ...@@ -2499,6 +2499,7 @@ error:
#endif #endif
return ret; return ret;
} }
#endif
PyDoc_STRVAR(PySSL_set_servername_callback_doc, PyDoc_STRVAR(PySSL_set_servername_callback_doc,
"set_servername_callback(method)\n\ "set_servername_callback(method)\n\
...@@ -2509,7 +2510,6 @@ the SSL/TLS client in the SNI extension.\n\ ...@@ -2509,7 +2510,6 @@ the SSL/TLS client in the SNI extension.\n\
If the argument is None then the callback is disabled. The method is called\n\ If the argument is None then the callback is disabled. The method is called\n\
with the SSLSocket, the server name as a string, and the SSLContext object.\n\ with the SSLSocket, the server name as a string, and the SSLContext object.\n\
See RFC 6066 for details of the SNI"); See RFC 6066 for details of the SNI");
#endif
static PyObject * static PyObject *
set_servername_callback(PySSLContext *self, PyObject *args) set_servername_callback(PySSLContext *self, PyObject *args)
...@@ -2575,10 +2575,8 @@ static struct PyMethodDef context_methods[] = { ...@@ -2575,10 +2575,8 @@ static struct PyMethodDef context_methods[] = {
{"set_ecdh_curve", (PyCFunction) set_ecdh_curve, {"set_ecdh_curve", (PyCFunction) set_ecdh_curve,
METH_O, NULL}, METH_O, NULL},
#endif #endif
#if HAVE_SNI && !defined(OPENSSL_NO_TLSEXT)
{"set_servername_callback", (PyCFunction) set_servername_callback, {"set_servername_callback", (PyCFunction) set_servername_callback,
METH_VARARGS, PySSL_set_servername_callback_doc}, METH_VARARGS, PySSL_set_servername_callback_doc},
#endif
{NULL, NULL} /* sentinel */ {NULL, NULL} /* sentinel */
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment