diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-12-06 03:02:33 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-12-06 03:02:33 (GMT) |
| commit | daa491b6d743ab50f8cd58a9eb945d05eb9eaed8 (patch) | |
| tree | dc9e66479fa1d41ef63979e311ff2dfcf84a73f7 /Modules/_ssl.c | |
| parent | e4d2ba7e0b112c3fd5b472c50c90557a423512c4 (diff) | |
| parent | 60766c47e7008149e3f4091bebe9ee25a0b98bd2 (diff) | |
| download | cpython-daa491b6d743ab50f8cd58a9eb945d05eb9eaed8.zip cpython-daa491b6d743ab50f8cd58a9eb945d05eb9eaed8.tar.gz cpython-daa491b6d743ab50f8cd58a9eb945d05eb9eaed8.tar.bz2 | |
merge 2.7.9 release branch
Diffstat (limited to 'Modules/_ssl.c')
| -rw-r--r-- | Modules/_ssl.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Modules/_ssl.c b/Modules/_ssl.c index 8ee8c3d..898d6c0 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -1997,8 +1997,10 @@ context_new(PyTypeObject *type, PyObject *args, PyObject *kwds) else if (proto_version == PY_SSL_VERSION_TLS1_2) ctx = SSL_CTX_new(TLSv1_2_method()); #endif +#ifndef OPENSSL_NO_SSL3 else if (proto_version == PY_SSL_VERSION_SSL3) ctx = SSL_CTX_new(SSLv3_method()); +#endif #ifndef OPENSSL_NO_SSL2 else if (proto_version == PY_SSL_VERSION_SSL2) ctx = SSL_CTX_new(SSLv2_method()); @@ -4023,8 +4025,10 @@ init_ssl(void) PyModule_AddIntConstant(m, "PROTOCOL_SSLv2", PY_SSL_VERSION_SSL2); #endif +#ifndef OPENSSL_NO_SSL3 PyModule_AddIntConstant(m, "PROTOCOL_SSLv3", PY_SSL_VERSION_SSL3); +#endif PyModule_AddIntConstant(m, "PROTOCOL_SSLv23", PY_SSL_VERSION_SSL23); PyModule_AddIntConstant(m, "PROTOCOL_TLSv1", |