salty-crypto 0.3.1 → 1.0.0-rc.0

package/src/noise/algorithms.ts

@@ -1,13 +1,13 @@
 /// SPDX-License-Identifier: MIT
-/// SPDX-FileCopyrightText: Copyright © 2023 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
+/// SPDX-FileCopyrightText: Copyright © 2023-2025 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
 
-import { AEAD } from '../aead';
-import { Hash } from '../hash';
-import { DH } from '../dh';
-import { HMAC } from '../hmac';
-import { HKDF } from '../hkdf';
+import { AEAD } from '../aead.js';
+import { Hash } from '../hash.js';
+import { DH } from '../dh.js';
+import { HMAC } from '../hmac.js';
+import { HKDF } from '../hkdf.js';
 
-import { Rekey } from './rekey';
+import { Rekey } from './rekey.js';
 
 export interface Algorithms {
     dh: DH,

package/src/noise/cipherstate.ts

@@ -1,9 +1,9 @@
 /// SPDX-License-Identifier: MIT
-/// SPDX-FileCopyrightText: Copyright © 2023 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
+/// SPDX-FileCopyrightText: Copyright © 2023-2025 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
 
-import { Nonce } from '../nonce';
-import { makeRekey } from './rekey';
-import { Algorithms } from './algorithms';
+import { Nonce } from '../nonce.js';
+import { makeRekey } from './rekey.js';
+import { Algorithms } from './algorithms.js';
 
 export class CipherState {
     view: DataView | null = null;

package/src/noise/handshake.ts

@@ -1,14 +1,14 @@
 /// SPDX-License-Identifier: MIT
-/// SPDX-FileCopyrightText: Copyright © 2023 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
+/// SPDX-FileCopyrightText: Copyright © 2023-2025 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
 
-import { DHKeyPair } from '../dh';
-import * as Bytes from '../bytes';
+import { DHKeyPair } from '../dh.js';
+import * as Bytes from '../bytes.js';
 
-import { Algorithms } from './algorithms';
-import { CipherState } from './cipherstate';
-import { HandshakePattern, KeyMixToken, lookupPattern, Token } from './patterns';
-import { HKDF, makeHKDF } from '../hkdf';
-import { makeHMAC } from '../hmac';
+import { Algorithms } from './algorithms.js';
+import { CipherState } from './cipherstate.js';
+import { HandshakePattern, KeyMixToken, lookupPattern, Token } from './patterns.js';
+import { HKDF, makeHKDF } from '../hkdf.js';
+import { makeHMAC } from '../hmac.js';
 
 export type Role = 'initiator' | 'responder';
 

package/src/noise/patterns.ts

@@ -1,5 +1,5 @@
 /// SPDX-License-Identifier: MIT
-/// SPDX-FileCopyrightText: Copyright © 2023 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
+/// SPDX-FileCopyrightText: Copyright © 2023-2025 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
 
 export type KeyTransferToken = 'e' | 's';
 export type KeyMixToken = 'ee' | 'es' | 'se' | 'ss' | 'psk';

package/src/noise/profiles.ts

@@ -1,10 +1,10 @@
 /// SPDX-License-Identifier: MIT
-/// SPDX-FileCopyrightText: Copyright © 2023 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
+/// SPDX-FileCopyrightText: Copyright © 2023-2025 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
 
-import { Algorithms } from './algorithms';
-import { BLAKE2s } from '../hash';
-import { ChaCha20Poly1305_RFC8439 } from '../aead';
-import { X25519 } from '../dh';
+import { Algorithms } from './algorithms.js';
+import { BLAKE2s } from '../hash.js';
+import { ChaCha20Poly1305_RFC8439 } from '../aead.js';
+import { X25519 } from '../dh.js';
 
 export const Noise_25519_ChaChaPoly_BLAKE2s: Algorithms = {
     dh: X25519,

package/src/noise/rekey.ts

@@ -1,8 +1,8 @@
 /// SPDX-License-Identifier: MIT
-/// SPDX-FileCopyrightText: Copyright © 2023 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
+/// SPDX-FileCopyrightText: Copyright © 2023-2025 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
 
-import { AEAD } from '../aead';
-import { Nonce } from '../nonce';
+import { AEAD } from '../aead.js';
+import { Nonce } from '../nonce.js';
 
 export type Rekey = (k: DataView) => DataView;
 

package/src/noise.ts

@@ -1,5 +1,5 @@
 /// SPDX-License-Identifier: MIT
-/// SPDX-FileCopyrightText: Copyright © 2023 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
+/// SPDX-FileCopyrightText: Copyright © 2023-2025 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
 
 export { Algorithms, matchPattern } from './noise/algorithms';
 export { CipherState } from './noise/cipherstate';

package/src/nonce.ts

@@ -1,5 +1,5 @@
 /// SPDX-License-Identifier: MIT
-/// SPDX-FileCopyrightText: Copyright © 2023 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
+/// SPDX-FileCopyrightText: Copyright © 2023-2025 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
 
 export class Nonce {
     constructor(public lo = 0, public hi = 0, public extra = 0) {}

package/src/random.ts

@@ -1,5 +1,5 @@
 /// SPDX-License-Identifier: MIT
-/// SPDX-FileCopyrightText: Copyright © 2023 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
+/// SPDX-FileCopyrightText: Copyright © 2023-2025 Tony Garnock-Jones <tonyg@leastfixedpoint.com>
 
 // TypeScript port of the randomness-generation code from nacl-fast.js from tweetnacl.
 //
@@ -12,7 +12,6 @@
 // // See for details: http://tweetnacl.cr.yp.to/
 
 export const _randomBytes: (out: Uint8Array, n: number) => void = (() => {
-    var crypto: any = typeof self !== 'undefined' ? (self.crypto || (self as any).msCrypto) : null;
     if (crypto && crypto.getRandomValues) {
         const QUOTA = 65536;
         return (x: Uint8Array, n: number) => {
@@ -21,7 +20,7 @@ export const _randomBytes: (out: Uint8Array, n: number) => void = (() => {
             }
         };
     } else if (typeof require !== 'undefined') {
-        crypto = require('crypto');
+        const crypto = require('crypto');
         if (crypto && crypto.randomBytes) {
             return (x: Uint8Array, n: number) => x.set(crypto.randomBytes(n));
         }

package/test/{tests/aead.test.ts → aead.test.ts}

@@ -1,5 +1,5 @@
-import { ChaCha20Poly1305_RFC8439, Nonce } from '../../dist/salty-crypto.js';
-import { it, expect } from '../harness';
+import { ChaCha20Poly1305_RFC8439, Nonce } from '../dist/salty-crypto.js';
+import { it, expect } from 'vitest';
 
 it('section 2.8.2 from rfc 8439', () => {
     const sunscreen_str = "Ladies and Gentlemen of the class of '99: If I could offer you only one tip for the future, sunscreen would be it.";

package/test/{tests/blake2.test.ts → blake2.test.ts}

@@ -1,5 +1,5 @@
-import { BLAKE2s } from '../../dist/salty-crypto.js';
-import { it, expect } from '../harness';
+import { BLAKE2s } from '../dist/salty-crypto.js';
+import { it, expect } from 'vitest';
 
 it('Appendix B of RFC 7693', () => {
     expect(BLAKE2s.digest(new TextEncoder().encode("abc"))).toEqual(Uint8Array.from([

package/test/{tests/chacha20.test.ts → chacha20.test.ts}

@@ -1,6 +1,6 @@
-import { ChaCha20, INTERNALS, Nonce } from '../../dist/salty-crypto.js';
+import { ChaCha20, INTERNALS, Nonce } from '../dist/salty-crypto.js';
 const { chacha20_quarter_round, chacha20_block } = INTERNALS.cipher.chacha20;
-import { it, expect } from '../harness';
+import { it, expect } from 'vitest';
 
 it('chacha20_quarter_round 1', () => {
     const s = new Uint32Array(4);

package/test/{tests/io.test.ts → io.test.ts}

@@ -1,5 +1,5 @@
-import { IO } from '../../dist/salty-crypto.js';
-import { describe, it, expect } from '../harness';
+import { IO } from '../dist/salty-crypto.js';
+import { describe, it, expect } from 'vitest';
 
 describe('basic', async () => {
     const s =

package/test/{tests/noise.test.ts → noise.test.ts}

@@ -8,8 +8,8 @@ import {
     isOneWay,
     lookupPattern,
     matchPattern,
-} from '../../dist/salty-crypto.js';
-import { describe, it, expect } from '../harness';
+} from '../dist/salty-crypto.js';
+import { describe, it, expect } from 'vitest';
 
 import fs from 'fs';
 import path from 'path';

package/test/{tests/poly1305.test.ts → poly1305.test.ts}

@@ -1,6 +1,6 @@
-import { Poly1305 } from '../../dist/salty-crypto.js';
+import { Poly1305 } from '../dist/salty-crypto.js';
 
-import { it, expect } from '../harness';
+import { it, expect } from 'vitest';
 
 it('section 2.5.2 from rfc 8439', () => {
     const key = Uint8Array.from([

package/tsup.config.ts

@@ -0,0 +1,14 @@
+import { defineConfig } from 'tsup';
+
+export default defineConfig({
+    entry: {
+        'salty-crypto': 'src/index.ts',
+    },
+    format: ['cjs', 'esm', 'iife'],
+    globalName: 'SaltyCrypto',
+    dts: true,
+    sourcemap: true,
+    clean: true,
+    minify: true,
+    target: 'es2017',
+});

package/rollup.config.js

@@ -1,19 +0,0 @@
-module.exports = [
-  {
-    input: 'lib/index.js',
-    plugins: [require('@rollup/plugin-terser')()],
-    output: {
-      file: 'dist/salty-crypto.js',
-      format: 'umd',
-      name: 'SaltyCrypto',
-    },
-  },
-  {
-    input: 'lib/index.d.ts',
-    plugins: [require('rollup-plugin-dts').default()],
-    output: {
-      file: 'dist/salty-crypto.d.ts',
-      format: 'es',
-    },
-  },
-];

package/test/harness.ts

@@ -1,74 +0,0 @@
-export { expect } from 'expect';
-import { JestAssertionError } from 'expect';
-import { glob } from 'glob';
-import path from 'path';
-
-export class Stats {
-    total = 0;
-    passed = 0;
-    failed = 0;
-    errors = 0;
-
-    merge(s: Stats) {
-        this.total += s.total;
-        this.passed += s.passed;
-        this.failed += s.failed;
-        this.errors += s.errors;
-    }
-}
-
-export let testDepth = 0;
-export let testStats = new Stats();
-
-function indent(msg: string) {
-    let str = '';
-    for (let i = 0; i < testDepth; i++) str = str + '    ';
-    console.log(str + msg);
-}
-
-export async function describe(what: string, f: () => (Promise<void> | void)): Promise<void> {
-    indent('- ' + what);
-    testDepth++;
-    await f();
-    testDepth--;
-}
-
-export async function it(what: string, f: () => (Promise<void> | void)): Promise<void> {
-    try {
-        testStats.total++;
-        await f();
-        testStats.passed++;
-        indent('✓ ' + what);
-    } catch (exn) {
-        if (exn instanceof JestAssertionError) {
-            testStats.failed++;
-            indent('\x1b[33m✗ ' + what + '\x1b[0m')
-            console.error(`${'\x1b[31m'}${exn.message}${'\x1b[0m'}`);
-        } else {
-            testStats.errors++;
-            throw exn;
-        }
-    }
-}
-
-export async function runTests(patterns: string[]): Promise<void> {
-    for (const pattern of patterns) {
-        const files = glob.sync(pattern, { nodir: true });
-        for (const mod of files) {
-            await describe(mod, async () => {
-                await import(path.resolve(process.cwd(), mod));
-            });
-        }
-    }
-}
-
-(async () => {
-    if (Object.is(require.main, module)) {
-        console.time('tests');
-        let patterns = process.argv.slice(2);
-        if (patterns.length === 0) patterns = ['./lib-test/**/*.test.js'];
-        await runTests(patterns);
-        console.timeEnd('tests');
-        console.log(testStats);
-    }
-})();

package/test/tsconfig.json

@@ -1,18 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "es2017",
-    "lib": ["ES2017", "DOM"],
-    "declaration": true,
-    "baseUrl": ".",
-    "rootDir": ".",
-    "outDir": "../lib-test",
-    "declarationDir": "../lib-test",
-    "esModuleInterop": true,
-    "moduleResolution": "node",
-    "module": "esnext",
-    "sourceMap": true,
-    "strict": true,
-    "allowJs": true
-  },
-  "include": ["**/*"]
-}