yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9560 from lafirest/fix/conf_template_psk 

fix(psk): add new supported ciphers to the conf template
This commit is contained in:
Zaiming (Stone) Shi 2022-12-22 18:58:28 +01:00 committed by GitHub
parent 7eebc67f61 6f3e952edf
commit 2855c39fa9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rel/emqx_conf.template.en.md
View File

@ -314,7 +314,13 @@ ciphers =
"RSA-PSK-AES128-GCM-SHA256", "RSA-PSK-AES128-GCM-SHA256",
"RSA-PSK-AES128-CBC-SHA256", "RSA-PSK-AES128-CBC-SHA256",
"RSA-PSK-AES256-CBC-SHA", "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"
] ]
``` ```

8
rel/emqx_conf.template.zh.md
View File

@ -292,6 +292,12 @@ ciphers = [
"RSA-PSK-AES128-GCM-SHA256", "RSA-PSK-AES128-GCM-SHA256",
"RSA-PSK-AES128-CBC-SHA256", "RSA-PSK-AES128-CBC-SHA256",
"RSA-PSK-AES256-CBC-SHA", "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"
] ]
``` ```