summaryrefslogtreecommitdiff
path: root/OpenSSL/ssl/ssl.c
diff options
context:
space:
mode:
authorJean-Paul Calderone <exarkun@twistedmatrix.com>2013-10-06 08:58:04 -0400
committerJean-Paul Calderone <exarkun@twistedmatrix.com>2013-10-06 08:58:04 -0400
commit5c0fd5568efa1ea922f99c74e1e65f0fcdac061c (patch)
tree04ac610a15ee962aa030a2cc92f577be445be02b /OpenSSL/ssl/ssl.c
parentf7e37e6b2f83f7fd00f7e5aaee9ecc55e349fd87 (diff)
parentd1e969eddee9fe3d970aebdc860f95fccc40230d (diff)
downloadpyopenssl-trunk.tar.gz
Add support for negotiating TLSv1_1 or TLSv1_2HEADtrunk
Diffstat (limited to 'OpenSSL/ssl/ssl.c')
-rw-r--r--OpenSSL/ssl/ssl.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSSL/ssl/ssl.c b/OpenSSL/ssl/ssl.c
index 5725d5d..6b0fd84 100644
--- a/OpenSSL/ssl/ssl.c
+++ b/OpenSSL/ssl/ssl.c
@@ -185,6 +185,8 @@ do { \
PyModule_AddIntConstant(module, "SSLv3_METHOD", ssl_SSLv3_METHOD);
PyModule_AddIntConstant(module, "SSLv23_METHOD", ssl_SSLv23_METHOD);
PyModule_AddIntConstant(module, "TLSv1_METHOD", ssl_TLSv1_METHOD);
+ PyModule_AddIntConstant(module, "TLSv1_1_METHOD", ssl_TLSv1_1_METHOD);
+ PyModule_AddIntConstant(module, "TLSv1_2_METHOD", ssl_TLSv1_2_METHOD);
/* Verify constants */
PyModule_AddIntConstant(module, "VERIFY_NONE", SSL_VERIFY_NONE);
@@ -204,6 +206,12 @@ do { \
PyModule_AddIntConstant(module, "OP_NO_SSLv2", SSL_OP_NO_SSLv2);
PyModule_AddIntConstant(module, "OP_NO_SSLv3", SSL_OP_NO_SSLv3);
PyModule_AddIntConstant(module, "OP_NO_TLSv1", SSL_OP_NO_TLSv1);
+#ifdef SSL_OP_NO_TLSv1_1
+ PyModule_AddIntConstant(module, "OP_NO_TLSv1_1", SSL_OP_NO_TLSv1_1);
+#endif
+#ifdef SSL_OP_NO_TLSv1_2
+ PyModule_AddIntConstant(module, "OP_NO_TLSv1_2", SSL_OP_NO_TLSv1_2);
+#endif
/* More SSL option constants */
PyModule_AddIntConstant(module, "OP_MICROSOFT_SESS_ID_BUG", SSL_OP_MICROSOFT_SESS_ID_BUG);