Skip to content

Commit

Permalink
Merge branch 'develop' into dependabot/pip/stix_shifter/colorlog-6.8.2
Browse files Browse the repository at this point in the history
  • Loading branch information
mdazam1942 authored Mar 22, 2024
2 parents abe5ba0 + 1fcc83a commit 021ed8d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ pyflakes==1.6.0
pylint==2.15.5
pytest==7.2.0
requests_mock==1.7.0
six==1.12.0
six==1.16.0
wrapt==1.14.1
2 changes: 1 addition & 1 deletion stix_shifter_modules/onelogin/requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
onelogin==2.0.1
onelogin==2.0.4
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ def __init__(self, host, port=None, headers={}, url_modifier_function=None, cert
self.server_ip = server_ip

# default ssl context is used based on https://docs.python.org/3.9/library/ssl.html#ssl.create_default_context
self.ssl_context = ssl.create_default_context(purpose=ssl.Purpose.CLIENT_AUTH)
#SERVER_AUTH is for authenticating servers (IE: Client would use this to communicate with a server).
self.ssl_context = ssl.create_default_context(purpose=ssl.Purpose.SERVER_AUTH)
ssl_cert_file = os.environ.get('SSL_CERT_FILE')
if ssl_cert_file:
# library reference https://docs.python.org/3.9/library/ssl.html#ssl.SSLContext.load_verify_locations
Expand Down

0 comments on commit 021ed8d

Please sign in to comment.