diff options
author | Christian Heimes <christian@python.org> | 2021-04-17 13:49:50 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-17 13:49:50 (GMT) |
commit | b8d0fa035d74ae6ae00794c9af636b427c5dc650 (patch) | |
tree | 4d2eb46657607777fd5854247ee2c561492cb750 /Modules | |
parent | ea39f82b97e0625334af560ef9876684d8e5abeb (diff) | |
download | cpython-b8d0fa035d74ae6ae00794c9af636b427c5dc650.zip cpython-b8d0fa035d74ae6ae00794c9af636b427c5dc650.tar.gz cpython-b8d0fa035d74ae6ae00794c9af636b427c5dc650.tar.bz2 |
bpo-43669: Remove OpenSSL 0.9 to 1.1.0 specific documentation (GH-25453)
Diffstat (limited to 'Modules')
-rw-r--r-- | Modules/_ssl.c | 33 | ||||
-rw-r--r-- | Modules/clinic/_ssl.c.h | 40 |
2 files changed, 1 insertions, 72 deletions
diff --git a/Modules/_ssl.c b/Modules/_ssl.c index f441a16..92aabcb 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -4971,38 +4971,6 @@ _ssl_RAND_status_impl(PyObject *module) return PyLong_FromLong(RAND_status()); } -#ifndef OPENSSL_NO_EGD -/* LCOV_EXCL_START */ -/*[clinic input] -_ssl.RAND_egd - path: object(converter="PyUnicode_FSConverter") - / - -Queries the entropy gather daemon (EGD) on the socket named by 'path'. - -Returns number of bytes read. Raises SSLError if connection to EGD -fails or if it does not provide enough data to seed PRNG. -[clinic start generated code]*/ - -static PyObject * -_ssl_RAND_egd_impl(PyObject *module, PyObject *path) -/*[clinic end generated code: output=02a67c7c367f52fa input=1aeb7eb948312195]*/ -{ - int bytes = RAND_egd(PyBytes_AsString(path)); - Py_DECREF(path); - if (bytes == -1) { - PyErr_SetString(PySSLErrorObject, - "EGD connection failed or EGD did not return " - "enough data to seed the PRNG"); - return NULL; - } - return PyLong_FromLong(bytes); -} -/* LCOV_EXCL_STOP */ -#endif /* OPENSSL_NO_EGD */ - - - /*[clinic input] _ssl.get_default_verify_paths @@ -5445,7 +5413,6 @@ static PyMethodDef PySSL_methods[] = { _SSL_RAND_ADD_METHODDEF _SSL_RAND_BYTES_METHODDEF _SSL_RAND_PSEUDO_BYTES_METHODDEF - _SSL_RAND_EGD_METHODDEF _SSL_RAND_STATUS_METHODDEF _SSL_GET_DEFAULT_VERIFY_PATHS_METHODDEF _SSL_ENUM_CERTIFICATES_METHODDEF diff --git a/Modules/clinic/_ssl.c.h b/Modules/clinic/_ssl.c.h index 95aad0c..74ab5a8 100644 --- a/Modules/clinic/_ssl.c.h +++ b/Modules/clinic/_ssl.c.h @@ -1105,40 +1105,6 @@ _ssl_RAND_status(PyObject *module, PyObject *Py_UNUSED(ignored)) return _ssl_RAND_status_impl(module); } -#if !defined(OPENSSL_NO_EGD) - -PyDoc_STRVAR(_ssl_RAND_egd__doc__, -"RAND_egd($module, path, /)\n" -"--\n" -"\n" -"Queries the entropy gather daemon (EGD) on the socket named by \'path\'.\n" -"\n" -"Returns number of bytes read. Raises SSLError if connection to EGD\n" -"fails or if it does not provide enough data to seed PRNG."); - -#define _SSL_RAND_EGD_METHODDEF \ - {"RAND_egd", (PyCFunction)_ssl_RAND_egd, METH_O, _ssl_RAND_egd__doc__}, - -static PyObject * -_ssl_RAND_egd_impl(PyObject *module, PyObject *path); - -static PyObject * -_ssl_RAND_egd(PyObject *module, PyObject *arg) -{ - PyObject *return_value = NULL; - PyObject *path; - - if (!PyUnicode_FSConverter(arg, &path)) { - goto exit; - } - return_value = _ssl_RAND_egd_impl(module, path); - -exit: - return return_value; -} - -#endif /* !defined(OPENSSL_NO_EGD) */ - PyDoc_STRVAR(_ssl_get_default_verify_paths__doc__, "get_default_verify_paths($module, /)\n" "--\n" @@ -1351,10 +1317,6 @@ exit: #endif /* defined(_MSC_VER) */ -#ifndef _SSL_RAND_EGD_METHODDEF - #define _SSL_RAND_EGD_METHODDEF -#endif /* !defined(_SSL_RAND_EGD_METHODDEF) */ - #ifndef _SSL_ENUM_CERTIFICATES_METHODDEF #define _SSL_ENUM_CERTIFICATES_METHODDEF #endif /* !defined(_SSL_ENUM_CERTIFICATES_METHODDEF) */ @@ -1362,4 +1324,4 @@ exit: #ifndef _SSL_ENUM_CRLS_METHODDEF #define _SSL_ENUM_CRLS_METHODDEF #endif /* !defined(_SSL_ENUM_CRLS_METHODDEF) */ -/*[clinic end generated code: output=9468e58904a565a2 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=ae3d1851daba6562 input=a9049054013a1b77]*/ |