ilusha/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2026-09-29 09:40:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

assume egd unless OPENSSL_NO_EGD is defined—remove configure check (closes #24557)

Browse source
This commit is contained in:
Benjamin Peterson 2016-07-06 23:55:15 -07:00
parent 27007dccec
commit b8a2f51ceb
6 changed files with 156 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Modules/_ssl.c
View file

@ -3938,7 +3938,7 @@ _ssl_RAND_status_impl(PyModuleDef *module)
return PyLong_FromLong(RAND_status());
}
#ifdef HAVE_RAND_EGD
#ifndef OPENSSL_NO_EGD
/*[clinic input]
_ssl.RAND_egd
path: object(converter="PyUnicode_FSConverter")
@ -3964,7 +3964,7 @@ _ssl_RAND_egd_impl(PyModuleDef *module, PyObject *path)
}
return PyLong_FromLong(bytes);
}
#endif /* HAVE_RAND_EGD */
#endif /* OPENSSL_NO_EGD */

6
Modules/clinic/_ssl.c.h
View file

@ -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 @@ exit:
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 @@ exit:
#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]*/