diff options
| author | Benjamin Peterson <benjamin@python.org> | 2016-07-07 06:55:15 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2016-07-07 06:55:15 (GMT) |
| commit | b8a2f51ceb636878ec767554eddbb11ff4502c55 (patch) | |
| tree | ec04fad6ca54ca6c7054479471b7c2ac674a8b94 /Modules | |
| parent | 27007dccec8ce20ee95e45492643bc1407326abc (diff) | |
| download | cpython-b8a2f51ceb636878ec767554eddbb11ff4502c55.zip cpython-b8a2f51ceb636878ec767554eddbb11ff4502c55.tar.gz cpython-b8a2f51ceb636878ec767554eddbb11ff4502c55.tar.bz2 | |
assume egd unless OPENSSL_NO_EGD is defined—remove configure check (closes #24557)
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_ssl.c | 4 | ||||
| -rw-r--r-- | Modules/clinic/_ssl.c.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Modules/_ssl.c b/Modules/_ssl.c index 1117b55..ddf8e45 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -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 */ diff --git a/Modules/clinic/_ssl.c.h b/Modules/clinic/_ssl.c.h index 4dbc5d0..9cbcc28 100644 --- a/Modules/clinic/_ssl.c.h +++ b/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 @@ 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]*/ |