Updated20241202174104

Config/button.json

@@ -2,7 +2,7 @@
   "main_main": [
     [
       28,
-      440
+      445
     ],
     {
       "name": "inf",
@@ -50,7 +50,7 @@
   "card_main": [
     [
       28,
-      230
+      232
     ],
     {
       "name": "add",
@@ -80,7 +80,7 @@
   "card_opts": [
     [
       28,
-      385
+      390
     ],
     {
       "name": "ssh",
@@ -110,7 +110,7 @@
   "cert_main": [
     [
       428,
-      230
+      232
     ],
     {
       "name": "cer",

Config/frames.json

@@ -7,44 +7,44 @@
   ],
   "main_main": [
     390,
-    105,
+    100,
     15,
-    420
+    425
   ],
   "card_main": [
     390,
-    415,
+    420,
     15,
     5
   ],
   "card_info": [
     365,
     120,
     28,
-    260
+    265
   ],
   "cert_main": [
     650,
     520,
-    415,
+    420,
     5
   ],
   "cert_info": [
     625,
     160,
     428,
-    260
+    265
   ],
   "cert_user": [
     308,
     95,
     428,
-    420
+    425
   ],
   "cert_last": [
     308,
     95,
     745,
-    420
+    425
   ]
 }

Config/global.json

@@ -97,7 +97,7 @@
     "msg_pass_next_same": "新旧密码不能相同",
     "msg_pass_change_ok": "修改重置密码结果",
     "msg_pass_change_tx": "PIN密码修改",
-    "msg_pass_resets_tx": "%重置PIN密码",
+    "msg_pass_resets_tx": "PIN重置密码",
     "msg_card": "卡片",
     "msg_info": "信息",
     "msg_open": "打开",
@@ -112,7 +112,7 @@
     "msg_confirm": "确认",
     "msg_cancel": "取消",
     "msg_disable": "禁用",
-    "msg_char": "字符",
+    "msg_char": "字",
     "msg_create": "创建",
     "msg_result": "结果",
     "msg_user": "用户",
@@ -148,8 +148,8 @@
     "msg_no_cert": "(未找到证书)",
     "msg_ou_full": "组织单元",
     "msg_ks_full": "密钥限制",
-    "msg_ml_lite": "邮件特性",
-    "msg_ml_full": "SMIME",
+    "msg_ml_lite": "其他特性",
+    "msg_ml_full": "邮件加密",
     "msg_ml_text": "需邮件特性",
     "msg_must_in": "必填",
     "msg_none_in": "选填",
@@ -158,7 +158,7 @@
     "msg_domain": "域名列表",
     "msg_emails": "邮箱列表",
     "msg_splits": "用分号分割",
-    "msg_create_csr": "创建证书请求",
+    "msg_create_csr": "创建请求",
     "DigitalSignature": "数字签名",
     "nonRepudiation": "认可签名",
     "Encipherment": "加密解密",
@@ -195,7 +195,8 @@
     "cer_text": "注意：只能导入当前虚拟智能卡已存在对应密钥的证书",
     "sc_title": "未安装OpenSC",
     "sc_datas": "您似乎还没有安装OpenSC\n是否立即安装?",
-    "csp_sets": "使用自定义CSP"
+    "csp_sets": "使用自定义CSP",
+    "csp_set_": "选择CSP"
   },
   "en": {
     "main_text": "TPM Virtual Smart Card Manager",
@@ -348,7 +349,7 @@
     "msg_ou_full": "Organizational Unit",
     "msg_ks_full": "Key Restrictions",
     "msg_ml_lite": "Email Features",
-    "msg_ml_full": "SMIME",
+    "msg_ml_full": " SMIME",
     "msg_ml_text": "Email Features Required",
     "msg_must_in": "Required",
     "msg_none_in": "Optional",
@@ -357,7 +358,7 @@
     "msg_domain": "Domain List",
     "msg_emails": "Email List",
     "msg_splits": "Separated by semicolons",
-    "msg_create_csr": "Create Certificate Request",
+    "msg_create_csr": "Create CSR",
     "DigitalSignature": "Digital Signature",
     "nonRepudiation": "Acceptance Signature",
     "Encipherment": "Encryption and Decryption",
@@ -394,6 +395,7 @@
     "cer_text": "Note: Only the Cert with key on the card can import",
     "sc_title": "OpenSC not Install",
     "sc_datas": "It seems you have not installed OpenSC\nInstall now?",
-    "csp_sets": "Use custom CSP"
+    "csp_sets": "Use custom CSP",
+    "csp_set_": "Use CSP"
   }
 }

Config/labels.json

@@ -11,7 +11,7 @@
   "card_info": {
     "conf": [
       35,
-      275
+      280
     ],
     "data": [
       {
@@ -34,7 +34,7 @@
   "cert_info": {
     "conf": [
       432,
-      278
+      283
     ],
     "data": [
       {
@@ -71,7 +71,7 @@
   "cert_user": {
     "conf": [
       432,
-      435
+      440
     ],
     "data": [
       {
@@ -93,7 +93,7 @@
   "cert_last": {
     "conf": [
       750,
-      435
+      440
     ],
     "data": [
       {

Config/tables.json

@@ -9,35 +9,35 @@
     }
   },
   "card_main": {
-    "pack": [28, 30, 158],
+    "pack": [28, 23, 170],
     "data": {
       "ITEM": [
         30,
         "card_list"
       ],
       "NAME": [
-        175,
+        200,
         "card_name"
       ],
       "UUID": [
-        135,
+        110,
         "card_uuid"
       ]
     }
   },
   "cert_main": {
-    "pack": [428, 30, 158],
+    "pack": [428, 23, 170],
     "data": {
       "ITEM": [
-        55,
+        60,
         "cert_guid"
       ],
       "NAME": [
-        300,
+        290,
         "cert_name"
       ],
       "LENS": [
-        65,
+        70,
         "pub_length"
       ],
       "USED": [

Module/Certificates.py

@@ -88,7 +88,7 @@ def parseCert(self):
         self.IssuedDate = self._certs_['start_time'] if 'start_time' in self._certs_ else "Unknown"
         self.ExpireDate = self._certs_['end_time'] if 'end_time' in self._certs_ else "Unknown"
         self.CertSHA160 = self._certs_['cert_sha1'] if 'cert_sha1' in self._certs_ else "Unknown"
-        
+
         self.pub_length = str(self._certs_['pubkey_len']) if 'pubkey_len' in self._certs_ else "Unknown"
         self.pub_origin = str(self._certs_['pubkey']) if 'pubkey' in self._certs_ else "Unknown"
         self.pub_key_al = str(self._certs_['pubkey_type']) if 'pubkey_type' in self._certs_ else "Unknown"
@@ -103,7 +103,7 @@ def parseCert(self):
         self.is_ca_cert = str(self.certExtend('basicConstraints')).split(":")[-1]
 
         self.CertPolicy = self.certExtend('certificatePolicies')
-        self.MainUsages = self.certExtend('keyUsage') if type(self.certExtend('keyUsage')) is str else ""
+        self.MainUsages = self.certExtend('keyUsage') if len(str(self.certExtend('keyUsage'))) > 0 else ""
         self.MainHashID = self.certExtend('authorityKeyIdentifier')
         self.SubsUsages = self.certExtend('extendedKeyUsage')
         self.SubsOwners = self.certExtend('subjectAltName')