adjust asn1 export and cleanup

packages/node-opcua-crypto-test/package.json

@@ -36,10 +36,10 @@
     },
     "dependencies": {
         "@peculiar/webcrypto": "^1.5.0",
-        "@peculiar/x509": "^1.12.2",
+        "@peculiar/x509": "^1.12.3",
         "@types/jsrsasign": "^10.5.14",
         "@types/mocha": "^10.0.8",
-        "@types/node": "^22.6.1",
+        "@types/node": "^22.7.4",
         "cross-env": "^7.0.3",
         "jsrsasign": "^11.1.0",
         "lorem-ipsum": "^2.0.8",

packages/node-opcua-crypto-test/test-cjs/test_cjs.js

@@ -1,4 +1,4 @@
-const { exploreCertificateInfo } = require("../../node-opcua-crypto");
+const { exploreCertificateInfo } = require("node-opcua-crypto");
 // eslint-disable-next-line no-undef
 
 

packages/node-opcua-crypto-test/test-esm/test_esm.mjs

@@ -1,4 +1,4 @@
-import { exploreCertificateInfo } from "../../node-opcua-crypto/index.mjs";
+import { exploreCertificateInfo } from "node-opcua-crypto/web";
 // eslint-disable-next-line no-undef
 
 

packages/node-opcua-crypto-test/test/test_create_certificate_signing_request.ts

@@ -21,9 +21,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // ---------------------------------------------------------------------------------------------------------------------
 
-import fs from "fs";
-import path from "path";
-import os from "os";
+import fs from "node:fs";
+import path from "node:path";
+import os from "node:os";
 
 import "should";
 

packages/node-opcua-crypto-test/test/test_create_key_pair.ts

@@ -21,9 +21,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // ---------------------------------------------------------------------------------------------------------------------
 
-import fs from "fs";
-import path from "path";
-import os from "os";
+import fs from "node:fs";
+import path from "node:path";
+import os from "node:os";
 import should from "should";
 
 import {

packages/node-opcua-crypto-test/test/test_create_self_signed_certificate.ts

@@ -21,10 +21,10 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // ---------------------------------------------------------------------------------------------------------------------
 
-import fs from "fs";
-import path from "path";
-import os from "os";
-import util from "util";
+import fs from "node:fs";
+import path from "node:path";
+import os from "node:os";
+import util from "node:util";
 import should from "should";
 import x509 from "@peculiar/x509";
 import {

packages/node-opcua-crypto-test/test/test_crypto.ts

@@ -22,6 +22,8 @@
 // ---------------------------------------------------------------------------------------------------------------------
 
 import assert from "assert";
+import fs from "node:fs";
+import path from "node:path";
 import {
     createHmac,
     createCipheriv,
@@ -32,9 +34,7 @@ import {
     publicEncrypt as publicEncrypt_fromCrypto,
     randomBytes,
     KeyObject,
-} from "crypto";
-import fs from "fs";
-import path from "path";
+} from "node:crypto";
 import should from "should";
 import * as loremIpsum1 from "lorem-ipsum";
 

packages/node-opcua-crypto-test/test/test_crypto_explore_certificate.ts

@@ -22,8 +22,8 @@
 // ---------------------------------------------------------------------------------------------------------------------
 
 import should from "should";
-import path from "path";
-import fs from "fs";
+import path from "node:path";
+import fs from "node:fs";
 
 import {
     readCertificate,

packages/node-opcua-crypto-test/test/test_crypto_utils.ts

@@ -21,9 +21,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // ---------------------------------------------------------------------------------------------------------------------
 
-import fs from "fs";
-import os from "os";
-import path from "path";
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
 
 import * as loremIpsum from "lorem-ipsum";
 import "should";

packages/node-opcua-crypto-test/test/test_explore_crl.ts

@@ -21,7 +21,7 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // ---------------------------------------------------------------------------------------------------------------------
 
-import path from "path";
+import path from "node:path";
 import {
     verifyCertificateRevocationListSignature,
     exploreCertificateRevocationList,

packages/node-opcua-crypto-test/test/test_explore_csr.ts

@@ -21,7 +21,7 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // ---------------------------------------------------------------------------------------------------------------------
 
-import path from "path";
+import path from "node:path";
 import { exploreCertificateSigningRequest } from "node-opcua-crypto";
 
 import { readCertificateSigningRequest } from "node-opcua-crypto";

packages/node-opcua-crypto-test/test/test_explore_private_key.ts

@@ -21,7 +21,7 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // ---------------------------------------------------------------------------------------------------------------------
 
-import path from "path";
+import path from "node:path";
 import { explorePrivateKey } from "node-opcua-crypto";
 import { readPrivateRsaKey, readPrivateKey } from "node-opcua-crypto";
 import "should";

packages/node-opcua-crypto-test/test/test_extKeyUsage.ts

@@ -21,9 +21,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // ---------------------------------------------------------------------------------------------------------------------
 
-import path from "path";
-import { exploreCertificate, readCertificate } from "node-opcua-crypto";
+import path from "node:path";
 import should from "should";
+import { exploreCertificate, readCertificate } from "node-opcua-crypto";
 
 describe("X509ExtKeyUsage", () => {
     it("should parse extKeyUsage 1", () => {

packages/node-opcua-crypto-test/test/test_makeThumprint.ts

@@ -21,7 +21,7 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // ---------------------------------------------------------------------------------------------------------------------
 
-import path from "path";
+import path from "node:path";
 import { makeSHA1Thumbprint } from "node-opcua-crypto";
 import { readCertificate } from "node-opcua-crypto";
 

packages/node-opcua-crypto-test/test/test_make_private_key_from_pem.ts

@@ -1,4 +1,4 @@
-import path from "path";
+import path from "node:path";
 import "should";
 import {
     makePrivateKeyFromPem,

packages/node-opcua-crypto-test/test/test_peculiar_edge_case.ts

@@ -1,6 +1,6 @@
-import path from "path";
-import fs from "fs";
-import { tmpdir } from "os";
+import path from "node:path";
+import fs from "node:fs";
+import { tmpdir } from "node:os";
 import { Crypto as PeculiarWebCrypto } from "@peculiar/webcrypto";
 import * as x509 from "@peculiar/x509";
 import { AsnConvert, AsnUtf8StringConverter } from "@peculiar/asn1-schema";
@@ -116,7 +116,7 @@ declare const window: any;
 
 const ignoreCrypto = process.env.IGNORE_SUBTLE_FROM_CRYPTO;
 
-import nativeCrypto from "crypto";
+import nativeCrypto from "node:crypto";
 
 if (typeof window === "undefined") {
     _crypto = nativeCrypto as any;

packages/node-opcua-crypto-test/test/test_private_public_key_match.ts

@@ -21,7 +21,7 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // ---------------------------------------------------------------------------------------------------------------------
 
-import path from "path";
+import path from "node:path";
 import { exploreCertificate, explorePrivateKey } from "node-opcua-crypto";
 import { publicKeyAndPrivateKeyMatches, certificateMatchesPrivateKey } from "node-opcua-crypto";
 import { readCertificate, readPrivateKey } from "node-opcua-crypto";

packages/node-opcua-crypto-test/test/test_readBasicConstraint2_5_29_19.ts

@@ -1,4 +1,6 @@
-import { coerceCertificate, readTag, _readStruct, readTbsCertificate } from "node-opcua-crypto";
+import { coerceCertificate, readTbsCertificate } from "node-opcua-crypto";
+import { asn1 } from "node-opcua-crypto";
+
 import assert from "assert";
 
 /*
@@ -135,8 +137,8 @@ nPgNSo9ViIrAO7PVmvJ8ikE7Bi9io4fFSA0Jzok+tx9WFpta
 
 function extractBasicConstraintsExtension(certificate: string | Buffer) {
     certificate = coerceCertificate(certificate);
-    const block_info = readTag(certificate, 0);
-    const blocks = _readStruct(certificate, block_info);
+    const block_info = asn1.readTag(certificate, 0);
+    const blocks = asn1.readStruct(certificate, block_info);
     const { extensions } = readTbsCertificate(certificate, blocks[0]);
     return extensions?.basicConstraints;
 }

packages/node-opcua-crypto-test/test/test_rsaLengthPublicKey.ts

@@ -21,8 +21,8 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // ---------------------------------------------------------------------------------------------------------------------
 
-import { createPublicKey } from "crypto";
-import path from "path";
+import { createPublicKey } from "node:crypto";
+import path from "node:path";
 import { rsaLengthPublicKey } from "node-opcua-crypto";
 import { readCertificate, readCertificatePEM } from "node-opcua-crypto";
 

packages/node-opcua-crypto-test/test/test_special_import.ts

@@ -0,0 +1 @@
+import { exploreCertificate } from "node-opcua-crypto/web";

packages/node-opcua-crypto-test/test/test_verifyCertificateChain.ts

@@ -21,9 +21,8 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // ---------------------------------------------------------------------------------------------------------------------
 
-import path from "path";
-import { verifyCertificateChain } from "node-opcua-crypto";
-import { readCertificate } from "node-opcua-crypto";
+import path from "node:path";
+import { verifyCertificateChain, readCertificate } from "node-opcua-crypto";
 
 describe("Test Certificate Chain", () => {
     it("DX should verify a certificate chain", async () => {

packages/node-opcua-crypto-test/test/test_verify_certificate_signature.ts

@@ -21,23 +21,23 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // ---------------------------------------------------------------------------------------------------------------------
 
-import path from "path";
-import { SignPrivateKeyInput, constants, createSign } from "crypto";
+import path from "node:path";
+import { SignPrivateKeyInput, constants, createSign } from "node:crypto";
 import { verifyCertificateSignature, Certificate, toPem2, PrivateKey } from "node-opcua-crypto";
-import { readTag, _readStruct, _readAlgorithmIdentifier, _readSignatureValueBin } from "node-opcua-crypto";
+import { asn1 } from "node-opcua-crypto";
 import { readCertificate, readPrivateKey } from "node-opcua-crypto";
 
 export function investigateCertificateSignature(certificate: Certificate, caPrivateKey?: PrivateKey): void {
-    const block_info = readTag(certificate, 0);
-    const blocks = _readStruct(certificate, block_info);
+    const block_info = asn1.readTag(certificate, 0);
+    const blocks = asn1.readStruct(certificate, block_info);
 
     //  console.log(block_info, blocks[0], blocks[1], blocks[2]);
     const bufferTbsCertificate = certificate.subarray(block_info.position, block_info.position + 4 + blocks[0].length);
 
     // console.log("bufferTbsCertificate = ", bufferTbsCertificate.length);
-    const signatureAlgorithm = _readAlgorithmIdentifier(certificate, blocks[1]);
+    const signatureAlgorithm = asn1.readAlgorithmIdentifier(certificate, blocks[1]);
 
-    const signatureValue = _readSignatureValueBin(certificate, blocks[2]);
+    const signatureValue = asn1.readSignatureValueBin(certificate, blocks[2]);
     // console.log("", ellipsis(signatureValue.toString("hex")), signatureValue.length);
 
     function testPadding(padding: number, saltLength?: number): boolean {