From ad0873549da624e0bf3432d441c976fcf03c8bdc Mon Sep 17 00:00:00 2001 From: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Date: Thu, 3 Aug 2023 09:11:41 +0200 Subject: [PATCH] Fix ssl DeprecationWarnings (#97623) --- homeassistant/components/webostv/media_player.py | 4 ++-- homeassistant/util/ssl.py | 9 ++------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/homeassistant/components/webostv/media_player.py b/homeassistant/components/webostv/media_player.py index 664b45e92cb..579c97c5277 100644 --- a/homeassistant/components/webostv/media_player.py +++ b/homeassistant/components/webostv/media_player.py @@ -8,7 +8,7 @@ from datetime import timedelta from functools import wraps from http import HTTPStatus import logging -from ssl import SSLContext +import ssl from typing import Any, Concatenate, ParamSpec, TypeVar, cast from aiowebostv import WebOsClient, WebOsTvPairError @@ -476,7 +476,7 @@ class LgWebOSMediaPlayerEntity(RestoreEntity, MediaPlayerEntity): content = None ssl_context = None if url.startswith("https"): - ssl_context = SSLContext() + ssl_context = ssl.SSLContext(protocol=ssl.PROTOCOL_TLS_CLIENT) websession = async_get_clientsession(self.hass) with suppress(asyncio.TimeoutError): diff --git a/homeassistant/util/ssl.py b/homeassistant/util/ssl.py index 84585d7a8c7..2b503716063 100644 --- a/homeassistant/util/ssl.py +++ b/homeassistant/util/ssl.py @@ -127,14 +127,9 @@ def server_context_modern() -> ssl.SSLContext: Modern guidelines are followed. """ context = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER) + context.minimum_version = ssl.TLSVersion.TLSv1_2 - context.options |= ( - ssl.OP_NO_SSLv2 - | ssl.OP_NO_SSLv3 - | ssl.OP_NO_TLSv1 - | ssl.OP_NO_TLSv1_1 - | ssl.OP_CIPHER_SERVER_PREFERENCE - ) + context.options |= ssl.OP_CIPHER_SERVER_PREFERENCE if hasattr(ssl, "OP_NO_COMPRESSION"): context.options |= ssl.OP_NO_COMPRESSION