[Python-checkins] cpython (3.5): Issue #26470: Use short name rather than name for compression name to fix
christian.heimes
python-checkins at python.org
Mon Sep 5 19:13:54 EDT 2016
https://hg.python.org/cpython/rev/5566732c8ac5
changeset: 103090:5566732c8ac5
branch: 3.5
parent: 103088:e85ce70b73b3
user: Christian Heimes <christian at python.org>
date: Tue Sep 06 01:10:39 2016 +0200
summary:
Issue #26470: Use short name rather than name for compression name to fix #27958.
files:
Modules/_ssl.c | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -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)
@@ -1644,7 +1639,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);
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list