Просмотр исходного кода

Merge pull request #9560 from lafirest/fix/conf_template_psk

fix(psk): add new supported ciphers to the conf template
Zaiming (Stone) Shi 3 лет назад
Родитель
Сommit
2855c39fa9
2 измененных файлов с 14 добавлено и 2 удалено
  1. 7 1
      rel/emqx_conf.template.en.md
  2. 7 1
      rel/emqx_conf.template.zh.md

+ 7 - 1
rel/emqx_conf.template.en.md

@@ -314,7 +314,13 @@ ciphers =
     "RSA-PSK-AES128-GCM-SHA256",
     "RSA-PSK-AES128-CBC-SHA256",
     "RSA-PSK-AES256-CBC-SHA",
-    "RSA-PSK-AES128-CBC-SHA"
+    "RSA-PSK-AES128-CBC-SHA",
+    "PSK-AES256-GCM-SHA384",
+    "PSK-AES128-GCM-SHA256",
+    "PSK-AES256-CBC-SHA384",
+    "PSK-AES256-CBC-SHA",
+    "PSK-AES128-CBC-SHA256",
+    "PSK-AES128-CBC-SHA"
   ]
 ```
 

+ 7 - 1
rel/emqx_conf.template.zh.md

@@ -292,6 +292,12 @@ ciphers = [
     "RSA-PSK-AES128-GCM-SHA256",
     "RSA-PSK-AES128-CBC-SHA256",
     "RSA-PSK-AES256-CBC-SHA",
-    "RSA-PSK-AES128-CBC-SHA"
+    "RSA-PSK-AES128-CBC-SHA",
+    "PSK-AES256-GCM-SHA384",
+    "PSK-AES128-GCM-SHA256",
+    "PSK-AES256-CBC-SHA384",
+    "PSK-AES256-CBC-SHA",
+    "PSK-AES128-CBC-SHA256",
+    "PSK-AES128-CBC-SHA"
   ]
 ```