This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch 5.3
in repository https://gitbox.apache.org/repos/asf/cloudstack-cloudmonkey.git
The following commit(s) were added to refs/heads/5.3 by this push:
new 9464276 Don't force connections to TLSv1 (#25)
9464276 is described below
commit 94642763e6cdbf64a6cca15fdc23722511224d4b
Author: Craig Squire <craig.squ...@gmail.com>
AuthorDate: Fri Aug 31 07:56:49 2018 -0500
Don't force connections to TLSv1 (#25)
Forcing the connection to TLSv1 is actually downgrading connections that
would otherwise be TLSv1_2. Cloudmonkey is better off auto-negotiating ssl/tls
versions and versions should be enforced on the server side. Since the Go
version is still alpha, it would be very useful to have the Python version play
nice with TLSv1_2.
---
CHANGES.md | 5 +++++
Dockerfile | 2 +-
cloudmonkey/config.py | 2 +-
cloudmonkey/requester.py | 4 ++--
docs/source/conf.py | 2 +-
5 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index 013d837..6d5f08a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,11 @@
Apache CloudStack CloudMonkey Changelog
---------------------------------------
+Version 5.3.4
+=============
+This release includes
+- Allow ssl version to be negotiated automatically
+
Version 5.3.3
=============
This release includes
diff --git a/Dockerfile b/Dockerfile
index 696974d..d36527e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,7 +22,7 @@ MAINTAINER "Apache CloudStack" <d...@cloudstack.apache.org>
LABEL Description="Apache CloudStack CloudMonkey; Python based CloudStack
command line interface"
LABEL Vendor="Apache.org"
LABEL License=ApacheV2
-LABEL Version=5.3.3
+LABEL Version=5.3.4
COPY . /cloudstack-cloudmonkey
RUN pip install requests
diff --git a/cloudmonkey/config.py b/cloudmonkey/config.py
index c5faec2..47235ef 100644
--- a/cloudmonkey/config.py
+++ b/cloudmonkey/config.py
@@ -16,7 +16,7 @@
# specific language governing permissions and limitations
# under the License.
-__version__ = "5.3.3"
+__version__ = "5.3.4"
__description__ = "Command Line Interface for Apache CloudStack"
__maintainer__ = "The Apache CloudStack Team"
__maintaineremail__ = "d...@cloudstack.apache.org"
diff --git a/cloudmonkey/requester.py b/cloudmonkey/requester.py
index 914854f..b4fed26 100644
--- a/cloudmonkey/requester.py
+++ b/cloudmonkey/requester.py
@@ -70,7 +70,7 @@ def login(url, username, password, domain="/",
verifysslcert=False):
sessionkey = ''
session = requests.Session()
- session.mount('https://', SSLAdapter(ssl.PROTOCOL_TLSv1))
+ session.mount('https://', SSLAdapter())
try:
resp = session.post(url, params=args, verify=verifysslcert)
@@ -217,7 +217,7 @@ def make_request(command, args, logger, url, credentials,
expires,
args["signature"] = sign_request(args, credentials['secretkey'])
session = requests.Session()
- session.mount('https://', SSLAdapter(ssl.PROTOCOL_TLSv1))
+ session.mount('https://', SSLAdapter())
try:
response = session.get(url, params=args, verify=verifysslcert)
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 9c30ccb..e9e79a8 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -55,7 +55,7 @@ copyright = u'2012-2014, The Apache Software Foundation'
# built documents.
#
# The short X.Y version.
-version = '5.3.3'
+version = '5.3.4'
# The full version, including alpha/beta/rc tags.
release = version
