[Bf-extensions-cvs] [7ff9f6c] master: netrender: resolve issue with PROTOCOL_SSLv3

[Campbell Barton]

Commit: 7ff9f6c3e71c7b188c393df058ffe9588883cfcc
Author: Campbell Barton
Date:   Fri Dec 5 17:21:45 2014 +0100
Branches: master
https://developer.blender.org/rBA7ff9f6c3e71c7b188c393df058ffe9588883cfcc

netrender: resolve issue with PROTOCOL_SSLv3

This is no longer available for Debian, use SSLv23 as suggested.

===================================================================

M	netrender/master.py

===================================================================

diff --git a/netrender/master.py b/netrender/master.py
index 3c087e5..d1b8fde 100644
--- a/netrender/master.py
+++ b/netrender/master.py
@@ -1158,7 +1158,12 @@ def runMaster(address, broadcast, clear, force, path, update_stats, test_break,u
     httpd.stats = update_stats
     if use_ssl:
         import ssl
-        httpd.socket=ssl.wrap_socket(httpd.socket,certfile=cert_path,server_side=True,keyfile=key_path,ciphers="ALL",ssl_version=ssl.PROTOCOL_SSLv3)
+        httpd.socket = ssl.wrap_socket(
+                server_side=True,
+                keyfile=key_path,
+                ciphers="ALL",
+                ssl_version=ssl.PROTOCOL_SSLv23,
+                )
     if broadcast:
         s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
         s.setsockopt(socket.SOL_SOCKET, socket.SO_BROADCAST, 1)