From: Christian Heimes <christian@python.org>
Date: Mon, 5 Sep 2016 23:10:39 +0000 (+0200)
Subject: Issue #26470: Use short name rather than name for compression name to fix #27958.
X-Git-Tag: v2.7.13rc1~175
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9940633e89d7928cdc392b065df342b9352956ae;p=python

Issue #26470: Use short name rather than name for compression name to fix #27958.
---

diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index d1f7900328..589ea70a51 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -148,11 +148,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)
@@ -1519,7 +1514,7 @@ static PyObject *PySSL_compression(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 PyBytes_FromString(short_name);