From 7c893aa3309bcd7756432c6ba5b96a8c57d9e4ff Mon Sep 17 00:00:00 2001
From: Cody Cutrer <cody@cutrer.us>
Date: Mon, 22 Apr 2024 15:48:29 -0600
Subject: [PATCH] fix streaming logs from MQTT for ESP32 devices using TLS
 (#6605)

---
 esphome/mqtt.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/esphome/mqtt.py b/esphome/mqtt.py
index 166301005d..667a20bcf8 100644
--- a/esphome/mqtt.py
+++ b/esphome/mqtt.py
@@ -10,6 +10,7 @@ import paho.mqtt.client as mqtt
 
 from esphome.const import (
     CONF_BROKER,
+    CONF_CERTIFICATE_AUTHORITY,
     CONF_DISCOVERY_PREFIX,
     CONF_ESPHOME,
     CONF_LOG_TOPIC,
@@ -99,7 +100,9 @@ def prepare(
     elif username:
         client.username_pw_set(username, password)
 
-    if config[CONF_MQTT].get(CONF_SSL_FINGERPRINTS):
+    if config[CONF_MQTT].get(CONF_SSL_FINGERPRINTS) or config[CONF_MQTT].get(
+        CONF_CERTIFICATE_AUTHORITY
+    ):
         if sys.version_info >= (2, 7, 13):
             tls_version = ssl.PROTOCOL_TLS  # pylint: disable=no-member
         else: