mirror of
https://github.com/home-assistant/core.git
synced 2025-07-19 03:07:37 +00:00
Reenable TLS1.1 and 1.2 while leaving SSLv3 disabled (#2385)
This commit is contained in:
parent
baa9bdf6fc
commit
31d2a5d2d1
@ -40,7 +40,8 @@ DATA_API_PASSWORD = 'api_password'
|
|||||||
# TLS configuation follows the best-practice guidelines
|
# TLS configuation follows the best-practice guidelines
|
||||||
# specified here: https://wiki.mozilla.org/Security/Server_Side_TLS
|
# specified here: https://wiki.mozilla.org/Security/Server_Side_TLS
|
||||||
# Intermediate guidelines are followed.
|
# Intermediate guidelines are followed.
|
||||||
SSL_VERSION = ssl.PROTOCOL_TLSv1
|
SSL_VERSION = ssl.PROTOCOL_SSLv23
|
||||||
|
SSL_OPTS = ssl.OP_NO_SSLv2 | ssl.OP_NO_SSLv3 | ssl.OP_NO_COMPRESSION
|
||||||
CIPHERS = "ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:" \
|
CIPHERS = "ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:" \
|
||||||
"ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:" \
|
"ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:" \
|
||||||
"ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:" \
|
"ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:" \
|
||||||
@ -312,9 +313,11 @@ class HomeAssistantWSGI(object):
|
|||||||
|
|
||||||
sock = eventlet.listen((self.server_host, self.server_port))
|
sock = eventlet.listen((self.server_host, self.server_port))
|
||||||
if self.ssl_certificate:
|
if self.ssl_certificate:
|
||||||
sock = eventlet.wrap_ssl(sock, certfile=self.ssl_certificate,
|
context = ssl.SSLContext(SSL_VERSION)
|
||||||
keyfile=self.ssl_key, server_side=True,
|
context.options |= SSL_OPTS
|
||||||
ssl_version=SSL_VERSION, ciphers=CIPHERS)
|
context.set_ciphers(CIPHERS)
|
||||||
|
context.load_cert_chain(self.ssl_certificate, self.ssl_key)
|
||||||
|
sock = context.wrap_socket(sock, server_side=True)
|
||||||
wsgi.server(sock, self, log=_LOGGER)
|
wsgi.server(sock, self, log=_LOGGER)
|
||||||
|
|
||||||
def dispatch_request(self, request):
|
def dispatch_request(self, request):
|
||||||
|
Loading…
x
Reference in New Issue
Block a user