n20-common-lib 2.12.1 → 2.12.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.12.1",
+  "version": "2.12.2",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/plugins/Sign/SkfSign/index.js

@@ -96,12 +96,12 @@ export async function getSign(plain, dn = getDN()) {
 
   // 获取并验证证书信息
   const checkRes = await getCertInfo(dn)
-  
+
   // 证书验证错误处理
   const errorMessages = {
-    'dnListEmpty': '没有匹配到证书!',
-    'dnIsEmpty': 'DN参数为空!', 
-    'Empty': '当前Ukey不匹配!'
+    dnListEmpty: '没有匹配到证书!',
+    dnIsEmpty: 'DN参数为空!',
+    Empty: '当前Ukey不匹配!'
   }
 
   if (checkRes === -1 || Object.keys(errorMessages).includes(checkRes)) {
@@ -117,7 +117,7 @@ export async function getSign(plain, dn = getDN()) {
       closeOnClickModal: false,
       inputType: 'password'
     })
-    
+
     return await performSign(plainText, pin)
   } catch (error) {
     return Promise.reject(error)
@@ -133,9 +133,7 @@ export async function getCertInfo(dn) {
   return new Promise((resolve, reject) => {
     // 获取证书列表
     IWSASkfGetCertList(
-      process.env.VUE_APP_NetSign_ARG ||
-        window.VUE_APP_NetSign_ARG ||
-        'WTSKFInterface.dll',
+      process.env.VUE_APP_NetSign_ARG || window.VUE_APP_NetSign_ARG || 'WTSKFInterface.dll',
       (CertListData, errorCode) => {
         if (errorCode) {
           Message.error(codeDate[errorCode])
@@ -157,7 +155,12 @@ export async function getCertInfo(dn) {
  */
 async function performSign(plainText, value) {
   return new Promise((resolve, reject) => {
-    IWSASkfSignData(plainText, 0, value, 'SM3', (errorCode, signedData) => {
+    let code = 'SM3'
+    // 有色信创国产系统 需要传入SHA1
+    if (window.VUE_APP_NetSign_ARG === '/opt/apps/cn.win-trust.usertool/files/bin/libSKFInterface.so') {
+      code = 'SHA1'
+    }
+    IWSASkfSignData(plainText, 0, value, code, (errorCode, signedData) => {
       if (errorCode === 0 || errorCode === '0') {
         resolve(signedData)
       } else {