diff options
| author | Christian Heimes <christian@python.org> | 2016-09-05 23:10:39 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@python.org> | 2016-09-05 23:10:39 (GMT) |
| commit | 281e5f8839355a03ace8c2162bd69ff0082e73f0 (patch) | |
| tree | 629629ee7be2caa490cf7975288b8b925d29b30b /Modules | |
| parent | f4a7381719d8a0ad7bf00b7c071581ee2c0fd2e8 (diff) | |
| download | cpython-281e5f8839355a03ace8c2162bd69ff0082e73f0.zip cpython-281e5f8839355a03ace8c2162bd69ff0082e73f0.tar.gz cpython-281e5f8839355a03ace8c2162bd69ff0082e73f0.tar.bz2 | |
Issue #26470: Use short name rather than name for compression name to fix #27958.
Diffstat (limited to 'Modules')
| -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 bb40051..b2838ed 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); |