51 lines
1.6 KiB
Text
51 lines
1.6 KiB
Text
http://bugs.python.org/issue24557
|
|
https://hg.python.org/cpython/rev/fe168c2b5e95
|
|
|
|
assume egd unless OPENSSL_NO_EGD is defined-remove configure check
|
|
|
|
--- Modules/_ssl.c.orig 2015-12-07 01:39:10 UTC
|
|
+++ Modules/_ssl.c
|
|
@@ -3916,7 +3916,7 @@ _ssl_RAND_status_impl(PyModuleDef *modul
|
|
return PyLong_FromLong(RAND_status());
|
|
}
|
|
|
|
-#ifdef HAVE_RAND_EGD
|
|
+#ifndef OPENSSL_NO_EGD
|
|
/*[clinic input]
|
|
_ssl.RAND_egd
|
|
path: object(converter="PyUnicode_FSConverter")
|
|
@@ -3942,7 +3942,7 @@ _ssl_RAND_egd_impl(PyModuleDef *module,
|
|
}
|
|
return PyLong_FromLong(bytes);
|
|
}
|
|
-#endif /* HAVE_RAND_EGD */
|
|
+#endif /* OPENSSL_NO_EGD */
|
|
|
|
|
|
|
|
--- Modules/clinic/_ssl.c.h.orig 2015-12-07 01:39:10 UTC
|
|
+++ Modules/clinic/_ssl.c.h
|
|
@@ -893,7 +893,7 @@ _ssl_RAND_status(PyModuleDef *module, PyObject *Py_UNUSED(ignored))
|
|
return _ssl_RAND_status_impl(module);
|
|
}
|
|
|
|
-#if defined(HAVE_RAND_EGD)
|
|
+#if !defined(OPENSSL_NO_EGD)
|
|
|
|
PyDoc_STRVAR(_ssl_RAND_egd__doc__,
|
|
"RAND_egd($module, path, /)\n"
|
|
@@ -924,7 +924,7 @@ _ssl_RAND_egd(PyModuleDef *module, PyObject *arg)
|
|
return return_value;
|
|
}
|
|
|
|
-#endif /* defined(HAVE_RAND_EGD) */
|
|
+#endif /* !defined(OPENSSL_NO_EGD) */
|
|
|
|
PyDoc_STRVAR(_ssl_get_default_verify_paths__doc__,
|
|
"get_default_verify_paths($module, /)\n"
|
|
@@ -1102,4 +1102,4 @@ _ssl_enum_crls(PyModuleDef *module, PyObject *args, PyObject *kwargs)
|
|
#ifndef _SSL_ENUM_CRLS_METHODDEF
|
|
#define _SSL_ENUM_CRLS_METHODDEF
|
|
#endif /* !defined(_SSL_ENUM_CRLS_METHODDEF) */
|
|
-/*[clinic end generated code: output=a14999cb565a69a2 input=a9049054013a1b77]*/
|
|
+/*[clinic end generated code: output=abe795f14cb63b6a input=a9049054013a1b77]*/
|