From 0da6bc7bcccad921951209c3230e4082f437d04d Mon Sep 17 00:00:00 2001
From: zhangjiaping <zhangjiaping@kylinos.cn>
Date: Thu, 3 Jun 2021 19:15:09 +0800
Subject: [PATCH] Fix: #56269 CA file end with .pfx could be choosen to connect
 802.1x wifi.

---
 debian/changelog               |   6 +++---
 src/wpawifidialog.cpp          |   6 +++---
 translations/kylin-nm_zh_CN.qm | Bin 23853 -> 24219 bytes
 translations/kylin-nm_zh_CN.ts |   8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 45511b85..61489e68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
-kylin-nm (3.0.1-1kylin49hw1) v101.hw; urgency=medium
+kylin-nm (3.0.1-1kylin49) v101; urgency=medium
   
-  * BUG号：#49773
-  * 需求号：无
+  * BUG号：无
+  * 需求号：#33308
   * 其他改动：无
 
  -- zhangjiaping <zhangjiaping@kylinos.cn>  Wed, 02 Jun 2021 17:53:12 +0800
diff --git a/src/wpawifidialog.cpp b/src/wpawifidialog.cpp
index c6633066..5bff1e12 100644
--- a/src/wpawifidialog.cpp
+++ b/src/wpawifidialog.cpp
@@ -387,7 +387,7 @@ void WpaWifiDialog::initCombox() {
         if (str.contains("Choose from file...") || str.contains("从文件选择..."))
         {
             QString fileName = QFileDialog::getOpenFileName(this, tr("Choose a CA certificate"), "recent:///",
-                                                            tr("CA Files (*.pem *.der *.p12 *.crt)"));
+                                                            tr("CA Files (*.pem *.der *.p12 *.crt *.cer *.pfx)"));
             if (!fileName.isNull()) {
                 m_wifiConfig->caCert = fileName;
                 QStringList nameList = fileName.split("/");
@@ -410,7 +410,7 @@ void WpaWifiDialog::initCombox() {
         if (str.contains("Choose from file...") || str.contains("从文件选择..."))
         {
             QString fileName = QFileDialog::getOpenFileName(this, tr("Choose a CA certificate"), "recent:///",
-                                                            tr("CA Files (*.pem *.der *.p12 *.crt)"));
+                                                            tr("CA Files (*.pem *.der *.p12 *.crt *.cer *.pfx)"));
             if (!fileName.isNull()) {
                 m_wifiConfig->clientCert = fileName;
                 QStringList nameList = fileName.split("/");
@@ -433,7 +433,7 @@ void WpaWifiDialog::initCombox() {
         if (str.contains("Choose from file...") || str.contains("从文件选择..."))
         {
             QString fileName = QFileDialog::getOpenFileName(this, tr("Choose a CA certificate"), "recent:///",
-                                                            tr("CA Files (*.pem *.der *.p12 *.crt *.key)"));
+                                                            tr("CA Files (*.pem *.der *.p12 *.crt *.key *.cer *.pfx)"));
             if (!fileName.isNull()) {
                 m_wifiConfig->privateKey = fileName;
                 QStringList nameList = fileName.split("/");
diff --git a/translations/kylin-nm_zh_CN.qm b/translations/kylin-nm_zh_CN.qm
index 7f50da6cd7cf98e18aa8fe340ff7e97ec562cadc..7f8d02316aa3607970a3f15a3abc574d3d1fa7bf 100644
GIT binary patch
delta 582
zcmZ3xi*fc|#t9;f0TV^-m;!SrhNdwE&Yrk;9#gRU<XA>OrXc0bYZ?6*xq@dfzYULL
zVDSGxnU%Ru$-j$boB2Nm28nVAt-=qXwVp!gfaR07GH+B*mz88-@cqO(bFwH<>o(SX
zOBORQIJ{(IJGPgB!E^?j`jM{;3;`E6x3UN_vTtHs$-v+@WAap1Kc>LLlb^D#6ABjP
zlIUE*z~CavrM7Pi14Gcc$xGSFm;ziT%d+P&1+q@=Wj7NFe$HL1bc=z(X%BbvjH5tB
zQIoH-1HJKivMq-kQ=swWSPnfV|A5K89BNEKQzmcac*hh_IC&}OW~LCs%~4$6eCxv)
zoEaP$6jIy$zA-2;XfS9o=rI&9q%!0Jc_4NQkX;027cdwy7(v;|K+zI78(B>nLj{8-
z2LlkW0kNL5qk>yzPHM4&hL&DIYOaEoUP@{akSs7X0+IsBMI}Hg86uQcp*guRM!Y_W
h3XaMKI=qqy2by3yPzl+E5C>+bR$@4Fb3nvh767ANl`Q}O

delta 250
zcmbQemvQYb#t9;f4iiP~m;(4GhNdwE*iPI#k16ow<XA>OrhucH*E0Gsas^p2zYULL
zVDMWwnU%Ru$xnx6oB2Nm28nVAt-=qXwVpy~f6vKVnK#PMoGc2|62ZD}$zlcuhnH+@
z$M!NXn9g8RKk}7<!M}KOFN+}K<YlbBOaZBrzp}0q3f#^m(Yb_y!9|oyZQm9KhQNZ!
zTiME({GLtLWzS>sUp{#*yO~f>CwHyVEd~asJ>1PRjxsO={F(fe9q8<-lYKelnEbC!
s&gIZ!^8GY<E{7UZpxNZ39PgO?g(q+2+{_eod2<%mH{Z?sBJZ*Q0Eb9byZ`_I

diff --git a/translations/kylin-nm_zh_CN.ts b/translations/kylin-nm_zh_CN.ts
index ae601444..74108c4e 100644
--- a/translations/kylin-nm_zh_CN.ts
+++ b/translations/kylin-nm_zh_CN.ts
@@ -1946,13 +1946,13 @@
     <message>
         <location filename="../src/wpawifidialog.cpp" line="381"/>
         <location filename="../src/wpawifidialog.cpp" line="404"/>
-        <source>CA Files (*.pem *.der *.p12 *.crt)</source>
-        <translation type="unfinished"></translation>
+        <source>CA Files (*.pem *.der *.p12 *.crt *.cer *.pfx)</source>
+        <translation>CA 文件 (*.pem *.der *.p12 *.crt *.cer *.pfx)</translation>
     </message>
     <message>
         <location filename="../src/wpawifidialog.cpp" line="427"/>
-        <source>CA Files (*.pem *.der *.p12 *.crt *.key)</source>
-        <translation type="unfinished"></translation>
+        <source>CA Files (*.pem *.der *.p12 *.crt *.key *.cer *.pfx)</source>
+        <translation>CA 文件 (*.pem *.der *.p12 *.crt *.key *.cer *.pfx)</translation>
     </message>
     <message>
         <location filename="../src/wpawifidialog.cpp" line="931"/>