summaryrefslogtreecommitdiff
path: root/Lib/ssl.py
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2011-07-08 18:47:06 +0200
committerAntoine Pitrou <solipsis@pitrou.net>2011-07-08 18:47:06 +0200
commitb9ac25d1c394714f0565845b274e7eebb402f1e7 (patch)
treeab68b24e92248ffd54b256fe8e7c38d67d63b2bd /Lib/ssl.py
parent6e2e3b9e8188acca0d40df365f3d9595fad59991 (diff)
downloadcpython-git-b9ac25d1c394714f0565845b274e7eebb402f1e7.tar.gz
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 e9e9aa8db0..ce9ebdf30a 100644
--- a/Lib/ssl.py
+++ b/Lib/ssl.py
@@ -77,6 +77,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",