Merge pull request #17 from soellman/ssl

Remove use of SSLv3
gromacs · Oct 12, 2015 · d027024 · d027024
2 parents 1751f2c + 7481d8e
commit d027024
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/cpc/network/https/real_https_connection.py b/cpc/network/https/real_https_connection.py
@@ -75,7 +75,6 @@ def connect(self):
                                         self.privateKeyFile,
                                         self.certFile,
                                         cert_reqs = ssl.CERT_REQUIRED,
-                                        ssl_version=ssl.PROTOCOL_SSLv3,
                                         ca_certs=self.caFile)
             self.sock.connect((self.host,self.port))
             self.connected = True
@@ -104,10 +103,9 @@ def connect(self):
 
             #create an ssl context and load certificate verify locations
             self.sock = ssl.wrap_socket(sock,
-                                        cert_reqs = ssl.CERT_NONE,
-                                        ssl_version=ssl.PROTOCOL_SSLv3)
+                                        cert_reqs = ssl.CERT_NONE)
             self.sock.connect((self.host,self.port))
 
         except ssl.SSLError as e:
             log.error(e)
-            raise
+            raise
diff --git a/cpc/network/server.py b/cpc/network/server.py
@@ -69,7 +69,6 @@ def __init__(self, handler_class, conf, serverState):
         try:
             self.socket =  ssl.wrap_socket(sock, fpem, fcert, server_side=True,\
                                            cert_reqs = ssl.CERT_REQUIRED,
-                                           ssl_version=ssl.PROTOCOL_SSLv3,
                                            ca_certs=ca
                                            )
             self.server_bind()
@@ -106,7 +105,6 @@ def __init__(self, handler_class, conf, serverState):
         try:
             self.socket =  ssl.wrap_socket(sock, fpem, fcert, server_side=True,\
                                            cert_reqs = ssl.CERT_NONE,
-                                           ssl_version=ssl.PROTOCOL_SSLv3,
                                            ca_certs=ca)
             self.server_bind()
             self.server_activate()