xades-bes-signer 1.0.0 → 1.0.2

package/dist/src/libs/credentials.js

@@ -123,7 +123,7 @@ function getPCK12CertInfo(certificate, certKey) {
     const certBags = (_b = data[forge.pki.oids.certBag]) !== null && _b !== void 0 ? _b : [];
     const friendlyName = certBags[1].attributes.friendlyName[0];
     let certBag = getCertificate(certBags);
-    if (isCerticateValid(certBag.cert)) {
+    if (!isCerticateValid(certBag.cert)) {
         throw new Error("Invalid certificate, check the validity");
     }
     const cert = certBag.cert;
@@ -138,7 +138,7 @@ function getPCK12CertInfo(certificate, certKey) {
     const certificateANS1 = certX509ToASN1(cert);
     const certificateDER = forge.asn1.toDer(certificateANS1).getBytes();
     const hashCErtificateX509DER = (0, security_1.sha1ToBase64)(certificateDER, "utf-8");
-    const certificateX509SN = parseInt(hashCErtificateX509DER, 16);
+    const certificateX509SN = parseInt(cert === null || cert === void 0 ? void 0 : cert.serialNumber, 16);
     const exponent = (0, security_1.hexToBase64)(key.e.data[0].toString(16));
     const modulus = (0, security_1.bigintToBase64)(BigInt(key.n.toString()));
     const certificateNumber = (0, security_1.getRandomValues)();

package/dist/src/libs/signer.js

@@ -73,9 +73,10 @@ function getKeyInfoNode(params) {
 }
 function getSignedInfoNode(params) {
     return (`<ds:SignedInfo Id="Signature-SignedInfo${params.signedInfoNumber}">` +
-        `\n<ds:CanonicalizationMethod> Algorithm=”http://www.w3.org/TR/2001/REC-xml-c14n20010315”></ds:CanonicalizationMethod>` +
+        `\n<ds:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n20010315"></ds:CanonicalizationMethod>` +
         `\n<ds:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"></ds:SignatureMethod>` +
-        `\n<ds:Reference Id="SignedPropertiedID${params.signedPropertiesIdNumber}"> Type="http://uri.etsi.org/01903#SignedProperties" URI="#Signature${params.signatureNumber}-SignedProperties${params.signedPropertiesNumber}">` +
+        `\n<ds:Reference Id="SignedPropertiesID${params.signedPropertiesIdNumber}" `
+        + `Type="http://uri.etsi.org/01903#SignedProperties" URI="#Signature${params.signatureNumber}-SignedProperties${params.signedPropertiesNumber}">` +
         `\n<ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></ds:DigestMethod>` +
         `\n<ds:DigestValue>${params.sha1SignedProperties}</ds:DigestValue>` +
         `\n</ds:Reference>` +
@@ -90,12 +91,12 @@ function getSignedInfoNode(params) {
         `\n<ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></ds:DigestMethod>` +
         `\n<ds:DigestValue>${params.sha1Xml}</ds:DigestValue>` +
         `\n</ds:Reference>` +
-        `</ds:SignedInfo`);
+        `</ds:SignedInfo>`);
 }
 function getSignatureObject(params) {
     const objectSignature = `<ds:Object Id="Signature${params.signatureNumber}-Object${params.objectNumber}">` +
         `<etsi:QualifyingProperties Target="#Signature${params.signatureNumber}">` +
-        `${params.signedInfo}` +
+        `${params.signedProperties}` +
         `</etsi:QualifyingProperties></ds:Object>`;
     return objectSignature;
 }
@@ -135,7 +136,7 @@ function sign(params) {
         const arayuint8 = new Uint8Array(p12Buffer === null || p12Buffer === void 0 ? void 0 : p12Buffer.buffer);
         let certInfo = (0, credentials_1.getPCK12CertInfo)(arayuint8, p12Password);
         const sha1Xml = (0, security_1.sha1ToBase64)(xmlData.replace(`<?xml version="1.0" encoding="UTF-8"?>`, ""), "utf8");
-        const namespaces = 'xmlns:ds="http://www.w3.org/2000/09/xmldsig#namespace xmlns:estsi="http://uri.etsi.org/01903/v1.3.2#"';
+        const namespaces = 'xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:estsi="http://uri.etsi.org/01903/v1.3.2#"';
         let signedProperties = getSignedPropertiesNode({
             signatureNumber: certInfo.radomValues.signatureNumber,
             signedPropertiesNumber: certInfo.radomValues.signedPropertiesNumber,
@@ -187,7 +188,7 @@ function sign(params) {
         const objectSignature = getSignatureObject({
             signatureNumber: certInfo.radomValues.signatureNumber,
             objectNumber: certInfo.radomValues.objectNumber,
-            signedInfo,
+            signedProperties,
         });
         const signatureNode = getSignatureNode({
             namespaces,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xades-bes-signer",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "XAdES-BES signer utilities for Node.js (TypeScript) — certificate handling and XAdES-BES signature helpers.",
   "main": "/dist/src/main.js",
   "types": "/dist/src/main.d.ts",