summaryrefslogtreecommitdiffstats
path: root/Lib/ssl.py
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-05-21 09:56:06 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-05-21 09:56:06 (GMT)
commitb52187710e4b486b33624fbde9ba646bc8e925fc (patch)
tree3f1c6369c64536edc721855273a793339a0fba9f /Lib/ssl.py
parent955d1b22e2b7c1e42a23565e29ba150f1fc9a0ef (diff)
downloadcpython-b52187710e4b486b33624fbde9ba646bc8e925fc.zip
cpython-b52187710e4b486b33624fbde9ba646bc8e925fc.tar.gz
cpython-b52187710e4b486b33624fbde9ba646bc8e925fc.tar.bz2
Issue #4870: Add an `options` attribute to SSL contexts, as well as
several ``OP_*`` constants to the `ssl` module. This allows to selectively disable protocol versions, when used in combination with `PROTOCOL_SSLv23`.
Diffstat (limited to 'Lib/ssl.py')
-rw-r--r--Lib/ssl.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/Lib/ssl.py b/Lib/ssl.py
index 24d3771..585105d 100644
--- a/Lib/ssl.py
+++ b/Lib/ssl.py
@@ -63,6 +63,7 @@ from _ssl import _SSLContext, SSLError
from _ssl import CERT_NONE, CERT_OPTIONAL, CERT_REQUIRED
from _ssl import (PROTOCOL_SSLv2, PROTOCOL_SSLv3, PROTOCOL_SSLv23,
PROTOCOL_TLSv1)
+from _ssl import OP_ALL, OP_NO_SSLv2, OP_NO_SSLv3, OP_NO_TLSv1
from _ssl import RAND_status, RAND_egd, RAND_add
from _ssl import (
SSL_ERROR_ZERO_RETURN,