summaryrefslogtreecommitdiffstats
path: root/Lib/ssl.py
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2011-07-08 16:49:07 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2011-07-08 16:49:07 (GMT)
commit7128f95bd27b34c82299d8572d4172bf0c8a13a3 (patch)
tree5d73969ecb7d13388554dacfb7a298c3b5fa3a89 /Lib/ssl.py
parent4468e55d4bd2a9ac4c6aeaffeb99653b7737ebd6 (diff)
parentb9ac25d1c394714f0565845b274e7eebb402f1e7 (diff)
downloadcpython-7128f95bd27b34c82299d8572d4172bf0c8a13a3.zip
cpython-7128f95bd27b34c82299d8572d4172bf0c8a13a3.tar.gz
cpython-7128f95bd27b34c82299d8572d4172bf0c8a13a3.tar.bz2
Issue #12440: When testing whether some bits in SSLContext.options can be
reset, check the version of the OpenSSL headers Python was compiled against, rather than the runtime version of the OpenSSL library.
Diffstat (limited to 'Lib/ssl.py')
-rw-r--r--Lib/ssl.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/Lib/ssl.py b/Lib/ssl.py
index 1a7f599..cde99fc 100644
--- a/Lib/ssl.py
+++ b/Lib/ssl.py
@@ -78,6 +78,8 @@ from _ssl import (
from _ssl import HAS_SNI
from _ssl import (PROTOCOL_SSLv3, PROTOCOL_SSLv23,
PROTOCOL_TLSv1)
+from _ssl import _OPENSSL_API_VERSION
+
_PROTOCOL_NAMES = {
PROTOCOL_TLSv1: "TLSv1",
PROTOCOL_SSLv23: "SSLv23",