##// END OF EJS Templates
hgweb: disable SSLv3 serving (BC)...
Augie Fackler -
r23070:c289fb36 stable
parent child Browse files
Show More
@@ -208,7 +208,7 b' class _httprequesthandleropenssl(_httpre'
208 OpenSSL.SSL.Context
208 OpenSSL.SSL.Context
209 except ImportError:
209 except ImportError:
210 raise util.Abort(_("SSL support is unavailable"))
210 raise util.Abort(_("SSL support is unavailable"))
211 ctx = OpenSSL.SSL.Context(OpenSSL.SSL.SSLv23_METHOD)
211 ctx = OpenSSL.SSL.Context(OpenSSL.SSL.TLSv1_METHOD)
212 ctx.use_privatekey_file(ssl_cert)
212 ctx.use_privatekey_file(ssl_cert)
213 ctx.use_certificate_file(ssl_cert)
213 ctx.use_certificate_file(ssl_cert)
214 sock = socket.socket(httpserver.address_family, httpserver.socket_type)
214 sock = socket.socket(httpserver.address_family, httpserver.socket_type)
@@ -249,8 +249,9 b' class _httprequesthandlerssl(_httpreques'
249 ssl.wrap_socket
249 ssl.wrap_socket
250 except ImportError:
250 except ImportError:
251 raise util.Abort(_("SSL support is unavailable"))
251 raise util.Abort(_("SSL support is unavailable"))
252 httpserver.socket = ssl.wrap_socket(httpserver.socket, server_side=True,
252 httpserver.socket = ssl.wrap_socket(
253 certfile=ssl_cert, ssl_version=ssl.PROTOCOL_SSLv23)
253 httpserver.socket, server_side=True,
254 certfile=ssl_cert, ssl_version=ssl.PROTOCOL_TLSv1)
254
255
255 def setup(self):
256 def setup(self):
256 self.connection = self.request
257 self.connection = self.request
General Comments 0
You need to be logged in to leave comments. Login now