From 6113d467c19ac018a4e36c30f3f66c2d8dc9918b Mon Sep 17 00:00:00 2001
From: William Yang <mscame@gmail.com>
Date: Mon, 6 Feb 2023 09:12:59 +0100
Subject: [PATCH] fix(mqtt-bridge): support verify TLS wildcard cert

---
 apps/emqx/rebar.config         | 2 +-
 changes/v5.0.17/fix-9916.en.md | 2 ++
 changes/v5.0.17/fix-9916.zh.md | 1 +
 mix.exs                        | 2 +-
 rebar.config                   | 2 +-
 5 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 changes/v5.0.17/fix-9916.en.md
 create mode 100644 changes/v5.0.17/fix-9916.zh.md

diff --git a/apps/emqx/rebar.config b/apps/emqx/rebar.config
index cad599436..7f494f76c 100644
--- a/apps/emqx/rebar.config
+++ b/apps/emqx/rebar.config
@@ -43,7 +43,7 @@
             {meck, "0.9.2"},
             {proper, "1.4.0"},
             {bbmustache, "1.10.0"},
-            {emqtt, {git, "https://github.com/emqx/emqtt", {tag, "1.7.0-rc.1"}}}
+            {emqtt, {git, "https://github.com/emqx/emqtt", {tag, "1.7.0"}}}
         ]},
         {extra_src_dirs, [{"test", [recursive]}]}
     ]}
diff --git a/changes/v5.0.17/fix-9916.en.md b/changes/v5.0.17/fix-9916.en.md
new file mode 100644
index 000000000..dd6de13e5
--- /dev/null
+++ b/changes/v5.0.17/fix-9916.en.md
@@ -0,0 +1,2 @@
+Fix MQTT bridge fails to verify TLS wildcard server certificate. 
+
diff --git a/changes/v5.0.17/fix-9916.zh.md b/changes/v5.0.17/fix-9916.zh.md
new file mode 100644
index 000000000..3bed13e4c
--- /dev/null
+++ b/changes/v5.0.17/fix-9916.zh.md
@@ -0,0 +1 @@
+修复MQTT桥接器无法验证TLS通配符服务器证书的问题。
diff --git a/mix.exs b/mix.exs
index 18e11fdd7..11fa83646 100644
--- a/mix.exs
+++ b/mix.exs
@@ -60,7 +60,7 @@ defmodule EMQXUmbrella.MixProject do
       {:ecpool, github: "emqx/ecpool", tag: "0.5.3", override: true},
       {:replayq, github: "emqx/replayq", tag: "0.3.7", override: true},
       {:pbkdf2, github: "emqx/erlang-pbkdf2", tag: "2.0.4", override: true},
-      {:emqtt, github: "emqx/emqtt", tag: "1.7.0-rc.2", override: true},
+      {:emqtt, github: "emqx/emqtt", tag: "1.7.0", override: true},
       {:rulesql, github: "emqx/rulesql", tag: "0.1.4"},
       {:observer_cli, "1.7.1"},
       {:system_monitor, github: "ieQu1/system_monitor", tag: "3.0.3"},
diff --git a/rebar.config b/rebar.config
index 1a9d651dc..1fd795b87 100644
--- a/rebar.config
+++ b/rebar.config
@@ -62,7 +62,7 @@
     , {ecpool, {git, "https://github.com/emqx/ecpool", {tag, "0.5.3"}}}
     , {replayq, {git, "https://github.com/emqx/replayq.git", {tag, "0.3.7"}}}
     , {pbkdf2, {git, "https://github.com/emqx/erlang-pbkdf2.git", {tag, "2.0.4"}}}
-    , {emqtt, {git, "https://github.com/emqx/emqtt", {tag, "1.7.0-rc.2"}}}
+    , {emqtt, {git, "https://github.com/emqx/emqtt", {tag, "1.7.0"}}}
     , {rulesql, {git, "https://github.com/emqx/rulesql", {tag, "0.1.4"}}}
     , {observer_cli, "1.7.1"} % NOTE: depends on recon 2.5.x
     , {system_monitor, {git, "https://github.com/ieQu1/system_monitor", {tag, "3.0.3"}}}