Consolidate webcrypto directory into single file

.gitignore

@@ -9,5 +9,3 @@ node_modules
 /esm/*.js.map
 /esm/*.d.ts.map
 /lib
-/webcrypto/
-/esm/webcrypto/

README.md

@@ -76,7 +76,7 @@ import { xchacha20poly1305 } from '@noble/ciphers/chacha';
 ```js
 import { xchacha20poly1305 } from '@noble/ciphers/chacha';
 import { utf8ToBytes } from '@noble/ciphers/utils';
-import { randomBytes } from '@noble/ciphers/webcrypto/utils';
+import { randomBytes } from '@noble/ciphers/webcrypto';
 const key = randomBytes(32);
 const nonce = randomBytes(24);
 const chacha = xchacha20poly1305(key, nonce);
@@ -90,7 +90,7 @@ const data_ = chacha.decrypt(ciphertext); // utils.bytesToUtf8(data_) === data
 ```js
 import { gcm } from '@noble/ciphers/aes';
 import { utf8ToBytes } from '@noble/ciphers/utils';
-import { randomBytes } from '@noble/ciphers/webcrypto/utils';
+import { randomBytes } from '@noble/ciphers/webcrypto';
 const key = randomBytes(32);
 const nonce = randomBytes(24);
 const aes = gcm(key, nonce);
@@ -124,7 +124,7 @@ const nonce2 = hexToBytes('9610467513de0bbd7c4cc2c3c64069f1802086fbd3232b13');
 
 ```js
 import { xchacha20poly1305 } from '@noble/ciphers/chacha';
-import { managedNonce } from '@noble/ciphers/webcrypto/utils'
+import { managedNonce } from '@noble/ciphers/webcrypto'
 import { hexToBytes, utf8ToBytes } from '@noble/ciphers/utils';
 const key = hexToBytes('fa686bfdffd3758f6377abbc23bf3d9bdc1a0dda4a6e7f8dbdd579fa1ff6d7e1');
 const chacha = managedNonce(xchacha20poly1305)(key); // manages nonces for you
@@ -138,7 +138,7 @@ const data_ = chacha.decrypt(ciphertext);
 ```js
 import { chacha20poly1305 } from '@noble/ciphers/chacha';
 import { utf8ToBytes } from '@noble/ciphers/utils';
-import { randomBytes } from '@noble/ciphers/webcrypto/utils';
+import { randomBytes } from '@noble/ciphers/webcrypto';
 
 const key = randomBytes(32);
 const nonce = randomBytes(12);
@@ -166,7 +166,7 @@ import { chacha20, xchacha20, chacha8, chacha12 } from '@noble/ciphers/chacha';
 
 // Utilities
 import { bytesToHex, hexToBytes, bytesToUtf8, utf8ToBytes } from '@noble/ciphers/utils';
-import { managedNonce, randomBytes } from '@noble/ciphers/webcrypto/utils';
+import { managedNonce, randomBytes } from '@noble/ciphers/webcrypto';
 ```
 
 ## Implementations
@@ -217,7 +217,7 @@ Check out [PDF](http://cr.yp.to/chacha/chacha-20080128.pdf) and [wiki](https://e
 
 ```js
 import { gcm, siv, ctr, cbc, ecb } from '@noble/ciphers/aes';
-import { randomBytes } from '@noble/ciphers/webcrypto/utils';
+import { randomBytes } from '@noble/ciphers/webcrypto';
 const plaintext = new Uint8Array(32).fill(16);
 const key = randomBytes(32); // 24 for AES-192, 16 for AES-128
 for (let cipher of [gcm, siv]) {
@@ -254,8 +254,7 @@ Check out [AES internals and block modes](#aes-internals-and-block-modes).
 ### Webcrypto AES
 
 ```js
-import { gcm, ctr, cbc } from '@noble/ciphers/webcrypto/aes';
-import { randomBytes } from '@noble/ciphers/webcrypto/utils';
+import { gcm, ctr, cbc, randomBytes } from '@noble/ciphers/webcrypto';
 const plaintext = new Uint8Array(32).fill(16);
 const key = randomBytes(32);
 for (const cipher of [gcm]) {
@@ -310,7 +309,7 @@ Format-preserving encryption algorithm (FPE-FF1) specified in NIST Special Publi
 ### Managed nonces
 
 ```js
-import { managedNonce } from '@noble/ciphers/webcrypto/utils';
+import { managedNonce } from '@noble/ciphers/webcrypto';
 import { gcm, siv, ctr, cbc, ecb } from '@noble/ciphers/aes';
 import { xsalsa20poly1305 } from '@noble/ciphers/salsa';
 import { chacha20poly1305, xchacha20poly1305 } from '@noble/ciphers/chacha';
@@ -620,7 +619,7 @@ console.log(aes.utils.bytesToUtf8(plaintext) === message);
 
 import { gcm } from '@noble/ciphers/aes';
 import { bytesToUtf8, utf8ToBytes } from '@noble/ciphers/utils';
-import { managedNonce } from '@noble/ciphers/webcrypto/utils';
+import { managedNonce } from '@noble/ciphers/webcrypto';
 const aes = managedNonce(gcm)(key);
 const ciphertext = aes.encrypt(utf8ToBytes(message));
 const plaintext = aes.decrypt(key, ciphertext);

benchmark/aes.js

@@ -1,7 +1,7 @@
 import { utils as butils } from 'micro-bmark';
 import { createCipheriv, createDecipheriv } from 'node:crypto';
 
-import * as webcrypto from '@noble/ciphers/webcrypto/aes';
+import * as webcrypto from '@noble/ciphers/webcrypto';
 import { concatBytes } from '@noble/ciphers/utils';
 import * as aes from '@noble/ciphers/aes';
 import {

benchmark/cross_test.test.js

@@ -1,4 +1,4 @@
-import { deepStrictEqual } from 'assert';
+import { deepStrictEqual } from 'node:assert';
 import { should, describe } from 'micro-should';
 import { CIPHERS } from './aead.js';
 

package.json

@@ -5,7 +5,6 @@
   "files": [
     "esm",
     "src",
-    "webcrypto",
     "*.js",
     "*.js.map",
     "*.d.ts",
@@ -17,7 +16,7 @@
     "bench:install": "cd benchmark && npm install && cd ../../",
     "build": "npm run build:clean; tsc && tsc -p tsconfig.esm.json",
     "build:release": "cd build; npm i; npm run build",
-    "build:clean": "rm *.{js,d.ts,js.map,d.ts.map} esm/*.{js,d.ts,js.map,d.ts.map} 2> /dev/null; rm -r webcrypto esm/webcrypto 2> /dev/null",
+    "build:clean": "rm *.{js,d.ts,js.map,d.ts.map} esm/*.{js,d.ts,js.map,d.ts.map} 2> /dev/null",
     "lint": "prettier --check 'src/**/*.{js,ts}' 'test/**/*.{js,ts,mjs}'",
     "format": "prettier --write 'src/**/*.{js,ts}' 'test/**/*.{js,ts,mjs}'",
     "test": "node test/index.js"
@@ -44,15 +43,6 @@
       "import": "./esm/index.js",
       "default": "./index.js"
     },
-    "./webcrypto/crypto": {
-      "types": "./webcrypto/crypto.d.ts",
-      "node": {
-        "import": "./esm/webcrypto/cryptoNode.js",
-        "default": "./webcrypto/cryptoNode.js"
-      },
-      "import": "./esm/webcrypto/crypto.js",
-      "default": "./webcrypto/crypto.js"
-    },
     "./_micro": {
       "types": "./_micro.d.ts",
       "import": "./esm/_micro.js",
@@ -68,6 +58,15 @@
       "import": "./esm/_polyval.js",
       "default": "./_polyval.js"
     },
+    "./crypto": {
+      "types": "./crypto.d.ts",
+      "node": {
+        "import": "./esm/cryptoNode.js",
+        "default": "./cryptoNode.js"
+      },
+      "import": "./esm/crypto.js",
+      "default": "./crypto.js"
+    },
     "./aes": {
       "types": "./aes.d.ts",
       "import": "./esm/aes.js",
@@ -98,20 +97,15 @@
       "import": "./esm/index.js",
       "default": "./index.js"
     },
-    "./webcrypto/aes": {
-      "types": "./webcrypto/aes.d.ts",
-      "import": "./esm/webcrypto/aes.js",
-      "default": "./webcrypto/aes.js"
-    },
-    "./webcrypto/utils": {
-      "types": "./webcrypto/utils.d.ts",
-      "import": "./esm/webcrypto/utils.js",
-      "default": "./webcrypto/utils.js"
+    "./webcrypto": {
+      "types": "./webcrypto.d.ts",
+      "import": "./esm/webcrypto.js",
+      "default": "./webcrypto.js"
     }
   },
   "browser": {
     "node:crypto": false,
-    "./webcrypto/crypto": "./webcrypto/crypto.js"
+    "./crypto": "./crypto.js"
   },
   "keywords": [
     "salsa20",

src/_micro.ts

@@ -7,9 +7,10 @@
 // prettier-ignore
 import {
   Cipher, XorStream, createView, setBigUint64, wrapCipher,
-  bytesToHex, concatBytes, ensureBytes, equalBytes, hexToNumber, numberToBytesBE,
+  bytesToHex, concatBytes, equalBytes, hexToNumber, numberToBytesBE,
 } from './utils.js';
 import { createCipher, rotl } from './_arx.js';
+import { bytes as abytes } from './_assert.js';
 
 function bytesToNumberLE(bytes: Uint8Array): bigint {
   return hexToNumber(bytesToHex(Uint8Array.from(bytes).reverse()));
@@ -195,8 +196,8 @@ const _0 = BigInt(0);
 const _1 = BigInt(1);
 // Can be speed-up using BigUint64Array, but would be more complicated
 export function poly1305(msg: Uint8Array, key: Uint8Array): Uint8Array {
-  ensureBytes(msg);
-  ensureBytes(key);
+  abytes(msg);
+  abytes(key);
   let acc = _0;
   const r = bytesToNumberLE(key.subarray(0, 16)) & CLAMP_R;
   const s = bytesToNumberLE(key.subarray(16));
@@ -242,11 +243,11 @@ function computeTag(
 export const xsalsa20poly1305 = wrapCipher(
   { blockSize: 64, nonceLength: 24, tagLength: 16 },
   function xsalsa20poly1305(key: Uint8Array, nonce: Uint8Array) {
-    ensureBytes(key);
-    ensureBytes(nonce);
+    abytes(key);
+    abytes(nonce);
     return {
       encrypt: (plaintext: Uint8Array) => {
-        ensureBytes(plaintext);
+        abytes(plaintext);
         const m = concatBytes(new Uint8Array(32), plaintext);
         const c = xsalsa20(key, nonce, m);
         const authKey = c.subarray(0, 32);
@@ -255,7 +256,7 @@ export const xsalsa20poly1305 = wrapCipher(
         return concatBytes(tag, data);
       },
       decrypt: (ciphertext: Uint8Array) => {
-        ensureBytes(ciphertext);
+        abytes(ciphertext);
         if (ciphertext.length < 16) throw new Error('encrypted data must be at least 16 bytes');
         const c = concatBytes(new Uint8Array(16), ciphertext);
         const authKey = xsalsa20(key, nonce, new Uint8Array(32));
@@ -280,17 +281,17 @@ export const _poly1305_aead =
   (key: Uint8Array, nonce: Uint8Array, AAD?: Uint8Array): Cipher => {
     const tagLength = 16;
     const keyLength = 32;
-    ensureBytes(key, keyLength);
-    ensureBytes(nonce);
+    abytes(key, keyLength);
+    abytes(nonce);
     return {
       encrypt: (plaintext: Uint8Array) => {
-        ensureBytes(plaintext);
+        abytes(plaintext);
         const res = fn(key, nonce, plaintext, undefined, 1);
         const tag = computeTag(fn, key, nonce, res, AAD);
         return concatBytes(res, tag);
       },
       decrypt: (ciphertext: Uint8Array) => {
-        ensureBytes(ciphertext);
+        abytes(ciphertext);
         if (ciphertext.length < tagLength)
           throw new Error(`encrypted data must be at least ${tagLength} bytes`);
         const passedTag = ciphertext.subarray(-tagLength);

src/_poly1305.ts

@@ -1,5 +1,5 @@
-import { exists as aexists, output as aoutput } from './_assert.js';
-import { Input, ensureBytes, toBytes, Hash } from './utils.js';
+import { exists as aexists, bytes as abytes, output as aoutput } from './_assert.js';
+import { Input, toBytes, Hash } from './utils.js';
 
 // Poly1305 is a fast and parallel secret-key message-authentication code.
 // https://cr.yp.to/mac.html, https://cr.yp.to/mac/poly1305-20050329.pdf
@@ -19,7 +19,7 @@ class Poly1305 implements Hash<Poly1305> {
 
   constructor(key: Input) {
     key = toBytes(key);
-    ensureBytes(key, 32);
+    abytes(key, 32);
     const t0 = u8to16(key, 0);
     const t1 = u8to16(key, 2);
     const t2 = u8to16(key, 4);

src/_polyval.ts

@@ -1,5 +1,5 @@
-import { createView, toBytes, Input, Hash, u32, ensureBytes } from './utils.js';
-import { exists as aexists, output as aoutput } from './_assert.js';
+import { createView, toBytes, Input, Hash, u32 } from './utils.js';
+import { bytes as abytes, exists as aexists, output as aoutput } from './_assert.js';
 
 // GHash from AES-GCM and its little-endian "mirror image" Polyval from AES-SIV.
 // Implemented in terms of GHash with conversion function for keys
@@ -76,7 +76,7 @@ class GHASH implements Hash<GHASH> {
   // We select bits per window adaptively based on expectedLength
   constructor(key: Input, expectedLength?: number) {
     key = toBytes(key);
-    ensureBytes(key, 16);
+    abytes(key, 16);
     const kView = createView(key);
     let k0 = kView.getUint32(0, false);
     let k1 = kView.getUint32(4, false);