Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
W
Warden
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pavel Valach
Warden
Commits
fc907c25
Commit
fc907c25
authored
4 years ago
by
Pavel Kácha
Browse files
Options
Downloads
Patches
Plain Diff
Allow for more modern ciphers - also fixes compatibility with newer openssl and Python 2.7.13
parent
15f59fbf
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
warden_client/warden_client.py
+5
-5
5 additions, 5 deletions
warden_client/warden_client.py
with
5 additions
and
5 deletions
warden_client/warden_client.py
+
5
−
5
View file @
fc907c25
...
...
@@ -42,9 +42,9 @@ class HTTPSConnection(httplib.HTTPSConnection):
Used only if ssl.SSLContext is not available (Python version < 2.7.9)
'''
def
__init__
(
self
,
host
,
**
kwargs
):
self
.
ciphers
=
kwargs
.
pop
(
'
ciphers
'
,
None
)
self
.
ca_certs
=
kwargs
.
pop
(
'
ca_certs
'
,
None
)
self
.
ssl_version
=
kwargs
.
pop
(
'
ssl_version
'
,
ssl
.
PROTOCOL_
SSLv23
)
self
.
ciphers
=
kwargs
.
pop
(
'
ciphers
'
,
None
)
self
.
ca_certs
=
kwargs
.
pop
(
'
ca_certs
'
,
None
)
self
.
ssl_version
=
kwargs
.
pop
(
'
ssl_version
'
,
ssl
.
PROTOCOL_
TLS
)
httplib
.
HTTPSConnection
.
__init__
(
self
,
host
,
**
kwargs
)
...
...
@@ -269,8 +269,8 @@ class Client(object):
self
.
retry
=
int
(
retry
)
self
.
pause
=
int
(
pause
)
self
.
ciphers
=
'
TLS_RSA_WITH_AES_256_CBC_SHA
'
self
.
sslversion
=
ssl
.
PROTOCOL_TLS
v1
self
.
ciphers
=
None
self
.
sslversion
=
ssl
.
PROTOCOL_TLS
# If Python is new enough to have SSLContext, use it for SSL settings,
# otherwise our own class derived from httplib.HTTPSConnection is used
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment