summaryrefslogtreecommitdiff
path: root/Lib/ssl.py
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2011-12-20 10:13:40 +0100
committerAntoine Pitrou <solipsis@pitrou.net>2011-12-20 10:13:40 +0100
commitebc604f8d909687e1b84ef9f32e802436179a246 (patch)
treedb3ffd28d881cd7b607ef02b6da1b4250b9d68e3 /Lib/ssl.py
parent68ece2b25b5fb69c905bd2e4d64553b55fdc6080 (diff)
downloadcpython-ebc604f8d909687e1b84ef9f32e802436179a246.tar.gz
Issue #13634: Add support for querying and disabling SSL compression.
Diffstat (limited to 'Lib/ssl.py')
-rw-r--r--Lib/ssl.py11
1 files changed, 11 insertions, 0 deletions
diff --git a/Lib/ssl.py b/Lib/ssl.py
index d2441042a5..0b2f743f22 100644
--- a/Lib/ssl.py
+++ b/Lib/ssl.py
@@ -70,6 +70,10 @@ from _ssl import (
OP_ALL, OP_NO_SSLv2, OP_NO_SSLv3, OP_NO_TLSv1,
OP_CIPHER_SERVER_PREFERENCE, OP_SINGLE_ECDH_USE,
)
+try:
+ from _ssl import OP_NO_COMPRESSION
+except ImportError:
+ pass
from _ssl import RAND_status, RAND_egd, RAND_add, RAND_bytes, RAND_pseudo_bytes
from _ssl import (
SSL_ERROR_ZERO_RETURN,
@@ -330,6 +334,13 @@ class SSLSocket(socket):
else:
return self._sslobj.cipher()
+ def compression(self):
+ self._checkClosed()
+ if not self._sslobj:
+ return None
+ else:
+ return self._sslobj.compression()
+
def send(self, data, flags=0):
self._checkClosed()
if self._sslobj: