Merge pull request #3364 from tmm1/osx-ssl-compile
Avoid referencing undefined SSLv2_method on MacOSX
This commit is contained in:
commit
d92f252609
2 changed files with 2 additions and 8 deletions
|
|
@ -223,10 +223,7 @@ when defined(ssl):
|
||||||
of protSSLv23:
|
of protSSLv23:
|
||||||
newCTX = SSL_CTX_new(SSLv23_method()) # SSlv2,3 and TLS1 support.
|
newCTX = SSL_CTX_new(SSLv23_method()) # SSlv2,3 and TLS1 support.
|
||||||
of protSSLv2:
|
of protSSLv2:
|
||||||
when not defined(linux):
|
raiseSslError("SSLv2 is no longer secure and has been deprecated, use protSSLv3")
|
||||||
newCTX = SSL_CTX_new(SSLv2_method())
|
|
||||||
else:
|
|
||||||
raiseSslError()
|
|
||||||
of protSSLv3:
|
of protSSLv3:
|
||||||
newCTX = SSL_CTX_new(SSLv3_method())
|
newCTX = SSL_CTX_new(SSLv3_method())
|
||||||
of protTLSv1:
|
of protTLSv1:
|
||||||
|
|
|
||||||
|
|
@ -314,10 +314,7 @@ when defined(ssl):
|
||||||
of protSSLv23:
|
of protSSLv23:
|
||||||
newCTX = SSL_CTX_new(SSLv23_method()) # SSlv2,3 and TLS1 support.
|
newCTX = SSL_CTX_new(SSLv23_method()) # SSlv2,3 and TLS1 support.
|
||||||
of protSSLv2:
|
of protSSLv2:
|
||||||
when not defined(linux) and not defined(OpenBSD):
|
raiseSslError("SSLv2 is no longer secure and has been deprecated, use protSSLv3")
|
||||||
newCTX = SSL_CTX_new(SSLv2_method())
|
|
||||||
else:
|
|
||||||
raiseSslError()
|
|
||||||
of protSSLv3:
|
of protSSLv3:
|
||||||
newCTX = SSL_CTX_new(SSLv3_method())
|
newCTX = SSL_CTX_new(SSLv3_method())
|
||||||
of protTLSv1:
|
of protTLSv1:
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue