xades-bes-signer 1.0.2 → 1.0.4

package/dist/src/libs/credentials.d.ts

@@ -25,7 +25,7 @@ export declare function getPCK12CertInfo(certificate: Uint8Array<ArrayBufferLike
         issuerSerialNumber: number;
         signingTime: string;
         certificateX509: string;
-        modulus: string | undefined;
+        modulus: string;
         exponent: string;
         key: forge.pki.rsa.PrivateKey;
     };

package/dist/src/libs/credentials.js

@@ -133,22 +133,23 @@ function getPCK12CertInfo(certificate, certKey) {
     let key = getKey(pckcs8);
     const pem = certX509ToPem(cert);
     let certificateX509 = pem.substring(pem.indexOf("\n") + 1, pem.indexOf("-----END CERTIFICATE-----"));
-    certificateX509.replace(/\r?\n|\r/g, "").replace(/([^\0]{76})/g, "$1\n");
+    certificateX509 = certificateX509.replace(/\r?\n|\r/g, "").replace(/([^\0]{76})/g, "$1\n");
     const ISODateTime = new Date().toISOString().slice(0, 19);
     const certificateANS1 = certX509ToASN1(cert);
     const certificateDER = forge.asn1.toDer(certificateANS1).getBytes();
     const hashCErtificateX509DER = (0, security_1.sha1ToBase64)(certificateDER, "utf-8");
     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)();
-    const signatureNumber = (0, security_1.getRandomValues)();
-    const signedPropertiesNumber = (0, security_1.getRandomValues)();
-    const signedInfoNumber = (0, security_1.getRandomValues)();
-    const signedPropertiesIdNumber = (0, security_1.getRandomValues)();
-    const referenceIdNumber = (0, security_1.getRandomValues)();
-    const signatureValueNumber = (0, security_1.getRandomValues)();
-    const objectNumber = (0, security_1.getRandomValues)();
+    let modulus = (0, security_1.bigintToBase64)(BigInt(key.n.toString()));
+    modulus = modulus.replace(/\r?\n|\r/g, '').replace(/([^\0]{76})/g, '$1\n');
+    const certificateNumber = (0, security_1.getRandomValues)(999990, 9999999);
+    const signatureNumber = (0, security_1.getRandomValues)(99990, 999999);
+    const signedPropertiesNumber = (0, security_1.getRandomValues)(99990, 999999);
+    const signedInfoNumber = (0, security_1.getRandomValues)(99990, 999999);
+    const signedPropertiesIdNumber = (0, security_1.getRandomValues)(99990, 999999);
+    const referenceIdNumber = (0, security_1.getRandomValues)(99990, 999999);
+    const signatureValueNumber = (0, security_1.getRandomValues)(99990, 999999);
+    const objectNumber = (0, security_1.getRandomValues)(99990, 999999);
     return {
         radomValues: {
             certificateNumber,

package/dist/src/libs/signer.js

@@ -54,7 +54,7 @@ function getSignedPropertiesNode(params) {
         `</etsi:Cert>` +
         `</etsi:SigningCertificate>` +
         `<etsi:SignedDataObjectProperties>` +
-        `<etsi:DataObjectFormat ObjectReference="#Reference-ID=${params.referenceIdNumber}">` +
+        `<etsi:DataObjectFormat ObjectReference="#Reference-ID-${params.referenceIdNumber}">` +
         `<etsi:Description>contenido comprobante</etsi:Description>` +
         `<etsi:MimeType>text/xml</etsi:MimeType>` +
         `</etsi:DataObjectFormat>` +
@@ -67,7 +67,7 @@ function getKeyInfoNode(params) {
         `\n<ds:X509Certificate>\n${params.certificateX509}\n</ds:X509Certificate>` +
         `\n</ds:X509Data>` +
         `\n</ds:KeyValue>\n<ds:RSAKeyValue>\n<ds:Modulus>\n${params.modulus}\n</ds:Modulus>` +
-        `\n<ds:Exponent>\n${params.exponent}</ds:Exponent>` +
+        `\n<ds:Exponent>${params.exponent}</ds:Exponent>` +
         `\n</ds:RSAKeyValue>` +
         `\n</ds:KeyInfo>`);
 }
@@ -91,7 +91,7 @@ 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>`);
+        `\n</ds:SignedInfo>`);
 }
 function getSignatureObject(params) {
     const objectSignature = `<ds:Object Id="Signature${params.signatureNumber}-Object${params.objectNumber}">` +
@@ -183,8 +183,8 @@ function sign(params) {
         const md = (0, security_1.toSha1)(signedInfoCanonicalized, "utf8");
         const signatureValue = (_b = (_a = (0, security_1.toBase64String)(certInfo.certInfo.key.sign(md))
             .match(/.{1,76}/g)) === null || _a === void 0 ? void 0 : _a.join("\n")) !== null && _b !== void 0 ? _b : "";
-        const signatureValueNode = `\n<ds:SignatureValue Id="SignatureValue${certInfo.radomValues.signatureValueNumber}">` +
-            `${signatureValue}\n</ds:SignatureValue>`;
+        const signatureValueNode = `<ds:SignatureValue Id="SignatureValue${certInfo.radomValues.signatureValueNumber}">` +
+            `\n${signatureValue}\n</ds:SignatureValue>`;
         const objectSignature = getSignatureObject({
             signatureNumber: certInfo.radomValues.signatureNumber,
             objectNumber: certInfo.radomValues.objectNumber,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xades-bes-signer",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "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",