diff options
| author | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2015-06-12 16:03:01 +0200 |
|---|---|---|
| committer | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2015-06-14 18:17:53 +0200 |
| commit | 9c6d237d02290c2388f19ec8f215827d4f921e4b (patch) | |
| tree | bf81c1f272914a8ddabeab917d14eb9332fda6bd /netlib/tcp.py | |
| parent | 5fab755a05f2ddd1b3e8e446e10fdcbded894e70 (diff) | |
| download | mitmproxy-9c6d237d02290c2388f19ec8f215827d4f921e4b.tar.gz mitmproxy-9c6d237d02290c2388f19ec8f215827d4f921e4b.tar.bz2 mitmproxy-9c6d237d02290c2388f19ec8f215827d4f921e4b.zip | |
add new TLS methods
Diffstat (limited to 'netlib/tcp.py')
| -rw-r--r-- | netlib/tcp.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/netlib/tcp.py b/netlib/tcp.py index eb8a523f..74fe70d4 100644 --- a/netlib/tcp.py +++ b/netlib/tcp.py @@ -19,6 +19,9 @@ SSLv2_METHOD = SSL.SSLv2_METHOD SSLv3_METHOD = SSL.SSLv3_METHOD SSLv23_METHOD = SSL.SSLv23_METHOD TLSv1_METHOD = SSL.TLSv1_METHOD +TLSv1_1_METHOD = SSL.TLSv1_1_METHOD +TLSv1_2_METHOD = SSL.TLSv1_2_METHOD + OP_NO_SSLv2 = SSL.OP_NO_SSLv2 OP_NO_SSLv3 = SSL.OP_NO_SSLv3 @@ -376,7 +379,7 @@ class _Connection(object): alpn_select=None, ): """ - :param method: One of SSLv2_METHOD, SSLv3_METHOD, SSLv23_METHOD, TLSv1_METHOD or TLSv1_1_METHOD + :param method: One of SSLv2_METHOD, SSLv3_METHOD, SSLv23_METHOD, TLSv1_METHOD, TLSv1_1_METHOD, or TLSv1_2_METHOD :param options: A bit field consisting of OpenSSL.SSL.OP_* values :param cipher_list: A textual OpenSSL cipher list, see https://www.openssl.org/docs/apps/ciphers.html :rtype : SSL.Context |