diff --git a/assets/webui/ofdgo.js b/assets/webui/ofdgo.js index c8e8e4f..1b3fb25 100644 --- a/assets/webui/ofdgo.js +++ b/assets/webui/ofdgo.js @@ -1555,19 +1555,19 @@ function renderSignatures() { appendSignatureCheck(row, "原文", signature.dataHashOK); appendSignatureCheck(row, "签名", signature.signedValueOK); if (signature.type !== "Sign") { - appendSignatureCheck(row, "印章", signature.sealOK && signature.sealMatchOK); - appendSignatureCheck(row, "匹配", signature.sealMatchOK); + appendSignatureCheck(row, "章验", signature.sealOK); + appendSignatureCheck(row, "一致", signature.sealMatchOK); } appendSignatureCheck(row, "证书", signature.certOK); appendSignaturePolicy(row, "时效", signature.certTimeChecked, signature.certTimeOK); appendSignaturePolicy(row, "信任", signature.certTrustChecked, signature.certTrustOK); - appendSignatureLine(row, "保护", signatureReferenceText(signature), signatureReferenceStatus(signature)); appendSignatureLine(row, "序号", signature.signSerial); appendSignatureLine(row, "算法", signature.signatureMethod); appendSignatureLine(row, "散列", signature.digestMethod); appendSignatureLine(row, "主体", signature.signSubject && signature.signSubject !== signature.signer ? signature.signSubject : ""); appendSignatureLine(row, "颁发", signature.signIssuer); appendSignatureLine(row, "章证", signature.sealSubject); + appendSignatureLine(row, "保护", signatureReferenceText(signature), signatureReferenceStatus(signature)); appendSignatureLine(row, "错误", signature.error, "fail"); fragment.append(row); } diff --git a/internal/webui/webui.go b/internal/webui/webui.go index 9919516..85d4ea3 100644 --- a/internal/webui/webui.go +++ b/internal/webui/webui.go @@ -59,14 +59,14 @@ type SignatureInfo struct { CertTimeOK bool `json:"certTimeOK,omitempty"` CertTrustChecked bool `json:"certTrustChecked,omitempty"` CertTrustOK bool `json:"certTrustOK,omitempty"` - ReferenceCount int `json:"referenceCount"` - ReferencePassed int `json:"referencePassed"` SignSerial string `json:"signSerial,omitempty"` SignatureMethod string `json:"signatureMethod,omitempty"` DigestMethod string `json:"digestMethod,omitempty"` SignSubject string `json:"signSubject,omitempty"` SignIssuer string `json:"signIssuer,omitempty"` SealSubject string `json:"sealSubject,omitempty"` + ReferenceCount int `json:"referenceCount"` + ReferencePassed int `json:"referencePassed"` Stamps []SignatureStampInfo `json:"stamps,omitempty"` Error string `json:"error,omitempty"` } @@ -347,14 +347,14 @@ func signatureInfo(report ofdgo.SignatureVerifyReport) SignatureInfo { CertTimeOK: report.CertTimeOK, CertTrustChecked: report.CertTrustChecked, CertTrustOK: report.CertTrustOK, - ReferenceCount: len(report.References), - ReferencePassed: signatureReferencePassed(report.References), SignSerial: report.SignCert.SerialNumber, SignatureMethod: report.SignatureMethod, DigestMethod: report.DigestMethod, SignSubject: report.SignCert.Subject, SignIssuer: report.SignCert.Issuer, SealSubject: report.SealCert.Subject, + ReferenceCount: len(report.References), + ReferencePassed: signatureReferencePassed(report.References), Stamps: signatureStampInfos(report.StampPositions), Error: signatureReportError(report), }