From 0041142785b347b757dc881247b59850ec7d2f4e Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Fri, 12 Dec 2014 12:23:09 +0100 Subject: Issue #22935: Fix ssl module when SSLv3 protocol is not supported --- Lib/ssl.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Lib/ssl.py b/Lib/ssl.py index 3d4997c..392603c 100644 --- a/Lib/ssl.py +++ b/Lib/ssl.py @@ -116,18 +116,14 @@ def _import_symbols(prefix): _import_symbols('OP_') _import_symbols('ALERT_DESCRIPTION_') _import_symbols('SSL_ERROR_') +_import_symbols('PROTOCOL_') from _ssl import HAS_SNI, HAS_ECDH, HAS_NPN -from _ssl import PROTOCOL_SSLv3, PROTOCOL_SSLv23, PROTOCOL_TLSv1 from _ssl import _OPENSSL_API_VERSION -_PROTOCOL_NAMES = { - PROTOCOL_TLSv1: "TLSv1", - PROTOCOL_SSLv23: "SSLv23", - PROTOCOL_SSLv3: "SSLv3", -} +_PROTOCOL_NAMES = {value: name for name, value in globals().items() if name.startswith('PROTOCOL_')} try: from _ssl import PROTOCOL_SSLv2 _SSLv2_IF_EXISTS = PROTOCOL_SSLv2 -- cgit v0.12