]> granicus.if.org Git - python/commitdiff
Issue #26470: Use short name rather than name for compression name to fix #27958.
authorChristian Heimes <christian@python.org>
Mon, 5 Sep 2016 23:10:39 +0000 (01:10 +0200)
committerChristian Heimes <christian@python.org>
Mon, 5 Sep 2016 23:10:39 +0000 (01:10 +0200)
Modules/_ssl.c

index bb4005176685afbc691a5259fa7f51a51156d4af..b2838edc8fb5236b4de7d1c82c875301680b323e 100644 (file)
@@ -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);