diff options
| author | Christian Heimes <christian@python.org> | 2016-09-06 01:10:39 +0200 |
|---|---|---|
| committer | Christian Heimes <christian@python.org> | 2016-09-06 01:10:39 +0200 |
| commit | 8b8818d0572aa9a5363ba12d815eb1843a39e834 (patch) | |
| tree | 8a77e44528ff0e4e34785a5d22bca6d63f0861fc /Modules/_ssl.c | |
| parent | cd7964fe5ae67fd442b7fc3edd3c7459fe3f6887 (diff) | |
| download | cpython-8b8818d0572aa9a5363ba12d815eb1843a39e834.tar.gz | |
Issue #26470: Use short name rather than name for compression name to fix #27958.
Diffstat (limited to 'Modules/_ssl.c')
| -rw-r--r-- | Modules/_ssl.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/Modules/_ssl.c b/Modules/_ssl.c index bb40051766..b2838edc8f 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -151,11 +151,6 @@ static int COMP_get_type(const COMP_METHOD *meth) { return meth->type; } - -static const char *COMP_get_name(const COMP_METHOD *meth) -{ - return meth->name; -} #endif static pem_password_cb *SSL_CTX_get_default_passwd_cb(SSL_CTX *ctx) @@ -1644,7 +1639,7 @@ _ssl__SSLSocket_compression_impl(PySSLSocket *self) comp_method = SSL_get_current_compression(self->ssl); if (comp_method == NULL || COMP_get_type(comp_method) == NID_undef) Py_RETURN_NONE; - short_name = COMP_get_name(comp_method); + short_name = OBJ_nid2sn(COMP_get_type(comp_method)); if (short_name == NULL) Py_RETURN_NONE; return PyUnicode_DecodeFSDefault(short_name); |