(original) (raw)

changeset: 103092:d92f26a53b70 parent: 103089:29300ed6dffe parent: 103090:5566732c8ac5 user: Christian Heimes christian@python.org date: Tue Sep 06 01:14:34 2016 +0200 files: Modules/_ssl.c description: Issue #26470: Use short name rather than name for compression name to fix #27958. diff -r 29300ed6dffe -r d92f26a53b70 Modules/_ssl.c --- a/Modules/_ssl.c Mon Sep 05 18:10:32 2016 -0500 +++ b/Modules/_ssl.c Tue Sep 06 01:14:34 2016 +0200 @@ -151,11 +151,6 @@ { 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) @@ -1714,7 +1709,7 @@ 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); /christian@python.org