new version

hivesolutions · Feb 3, 2016 · b5c2c28 · b5c2c28
1 parent ccccf9d
commit b5c2c28
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/setup.py b/setup.py
@@ -53,7 +53,7 @@
 netius.common.ensure_setup()
 setuptools.setup(
     name = "netius",
-    version = "1.6.17",
+    version = "1.6.18",
     author = "Hive Solutions Lda.",
     author_email = "development@hive.pt",
     description = "Netius System",

diff --git a/src/netius/base/common.py b/src/netius/base/common.py
@@ -62,7 +62,7 @@
 identification of both the clients and the services this
 value may be prefixed or suffixed """
 
-VERSION = "1.6.17"
+VERSION = "1.6.18"
 """ The version value that identifies the version of the
 current infra-structure, all of the services and clients
 may share this value """
@@ -1430,6 +1430,8 @@ def _ssl_init(self, strict = True, env = True):
             self._ssl_context.options |= ssl.OP_SINGLE_DH_USE
         if secure and hasattr(ssl, "OP_SINGLE_ECDH_USE"):
             self._ssl_context.options |= ssl.OP_SINGLE_ECDH_USE
+        if secure and hasattr(ssl, "OP_CIPHER_SERVER_PREFERENCE"):
+            self._ssl_context.options |= ssl.OP_CIPHER_SERVER_PREFERENCE
         if secure and hasattr(self._ssl_context, "set_ecdh_curve"):
             self._ssl_context.set_ecdh_curve("prime256v1")
         if secure and SSL_DH_PATH and hasattr(self._ssl_context, "load_dh_params"):
@@ -1452,6 +1454,8 @@ def _ssl_init(self, strict = True, env = True):
                 context.options |= ssl.OP_SINGLE_DH_USE
             if secure and hasattr(ssl, "OP_SINGLE_ECDH_USE"):
                 context.options |= ssl.OP_SINGLE_ECDH_USE
+            if secure and hasattr(ssl, "OP_CIPHER_SERVER_PREFERENCE"):
+                context.options |= ssl.OP_CIPHER_SERVER_PREFERENCE
             if secure and hasattr(context, "set_ecdh_curve"):
                 context.set_ecdh_curve("prime256v1")
             if secure and SSL_DH_PATH and hasattr(context, "load_dh_params"):