From 281e5f8839355a03ace8c2162bd69ff0082e73f0 Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Tue, 6 Sep 2016 01:10:39 +0200 Subject: [PATCH] Issue #26470: Use short name rather than name for compression name to fix #27958. --- Modules/_ssl.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Modules/_ssl.c b/Modules/_ssl.c index bb400517668..b2838edc8fb 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);