Skip to content

[v7r0] Make M2Crypto TLS implementation compatible with openssl 1.1 serie #4391

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
atsareg merged 1 commit into from
Sep 10, 2020
Merged

[v7r0] Make M2Crypto TLS implementation compatible with openssl 1.1 serie #4391

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions Core/DISET/private/Transports/SSL/M2Utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,16 @@ def getM2SSLContext(ctx=None, **kwargs):
raise RuntimeError("CA path (%s) is not a valid directory" % caPath)
ctx.load_verify_locations(capath=caPath)

# If the version of M2Crypto is recent enough, there is an API
# to accept proxy certificate, and we do not need to rely on
# OPENSSL_ALLOW_PROXY_CERT environment variable
# which was removed as of openssl 1.1
# We need this to be merged in M2Crypto: https://gitlab.com/m2crypto/m2crypto/merge_requests/236
# We set the proper verify flag to the X509Store of the context
# as described here https://www.openssl.org/docs/man1.1.1/man7/proxy-certificates.html
if hasattr(SSL, 'verify_allow_proxy_certs'):
ctx.get_cert_store().set_flags(SSL.verify_allow_proxy_certs) # pylint: disable=no-member

# Other parameters
sslMethod = kwargs.get('sslMethod', None)
if sslMethod:
Expand Down