traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Christian Heimes 2016-09-06 01:14:34 +02:00
parent 7eacdcc3b8 281e5f8839
commit 0061bf5892
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Modules/_ssl.c
View File

@ -151,11 +151,6 @@ static int COMP_get_type(const COMP_METHOD *meth)
{ {
return meth->type; return meth->type;
} }
static const char *COMP_get_name(const COMP_METHOD *meth)
{
return meth->name;
}
#endif #endif
static pem_password_cb *SSL_CTX_get_default_passwd_cb(SSL_CTX *ctx) static pem_password_cb *SSL_CTX_get_default_passwd_cb(SSL_CTX *ctx)
@ -1714,7 +1709,7 @@ _ssl__SSLSocket_compression_impl(PySSLSocket *self)
comp_method = SSL_get_current_compression(self->ssl); comp_method = SSL_get_current_compression(self->ssl);
if (comp_method == NULL || COMP_get_type(comp_method) == NID_undef) if (comp_method == NULL || COMP_get_type(comp_method) == NID_undef)
Py_RETURN_NONE; Py_RETURN_NONE;
short_name = COMP_get_name(comp_method); short_name = OBJ_nid2sn(COMP_get_type(comp_method));
if (short_name == NULL) if (short_name == NULL)
Py_RETURN_NONE; Py_RETURN_NONE;
return PyUnicode_DecodeFSDefault(short_name); return PyUnicode_DecodeFSDefault(short_name);