Using @types/sjcl types.

Author: armfazh

eslint.config.mjs

@@ -14,7 +14,6 @@ export default eslintTS.config(
             'jest.config.mjs',
             'eslint.config.mjs',
             'coverage/*',
-            'src/groupSjcl.ts',
             'src/sjcl/index.js',
             'src/sjcl/index.d.ts',
             'lib/*'

package-lock.json

@@ -43,7 +43,6 @@
         "@eslint/js": "9.11.1",
         "@types/benchmark": "2.1.5",
         "@types/jest": "29.5.13",
-        "@types/sjcl": "1.0.34",
         "benchmark": "2.1.4",
         "eslint": "9.11.1",
         "eslint-config-prettier": "9.1.0",

package.json

@@ -4,19 +4,24 @@
 # Run this file from the root of the project.
 # $ make -f sjcl.Makefile
 
-SJCL_OUTPUT_PATH=src/sjcl
-SJCL_SRC_PATH=node_modules/sjcl
+SJCL_OUTPUT_PATH=$(CURDIR)/src/sjcl
 
-all:
-	cd ${SJCL_SRC_PATH} && \
+.ONESHELL:
+
+all: ${SJCL_OUTPUT_PATH}/index.js ${SJCL_OUTPUT_PATH}/index.d.ts
+
+${SJCL_OUTPUT_PATH}/index.js:
+	cd node_modules/sjcl
 	./configure --without-all --with-bn --with-convenience --compress=none \
-            --with-codecBytes --with-codecHex --with-codecArrayBuffer && \
+                --with-codecBytes --with-codecHex --with-codecArrayBuffer
 	make
-	npm i -D dts-gen
-	npx dts-gen -m sjcl -o -f ${SJCL_OUTPUT_PATH}/index
-	npm un -D dts-gen
-	echo "export default sjcl;" >> ${SJCL_SRC_PATH}/sjcl.js
-	cp ${SJCL_SRC_PATH}/sjcl.js ${SJCL_OUTPUT_PATH}/index.js
+	cp sjcl.js $@
+	echo "export default sjcl;" >> $@
+
+${SJCL_OUTPUT_PATH}/index.d.ts:
+	npm i -D @types/sjcl
+	cp node_modules/@types/sjcl/index.d.ts $@
+	npm un -D @types/sjcl
 
 clean:
-	rm -f ${SJCL_OUTPUT_PATH}/index.js ${SJCL_OUTPUT_PATH}/index.d.ts
+	rm -f ${SJCL_OUTPUT_PATH}/index.d.ts ${SJCL_OUTPUT_PATH}/index.js

sjcl.Makefile

@@ -7,7 +7,7 @@
         "sourceMap": false,
         "allowJs": true
     },
-    "files": [
-        "index.js"
+    "include": [
+        "."
     ]
-}
+}

src/sjcl/tsconfig.json

@@ -47,13 +47,14 @@ export function int_to_bytes(num: number, byteLength: number): Uint8Array {
 
 export function joinAll(a: Uint8Array[]): Uint8Array {
     let size = 0;
-    for (let i = 0; i < a.length; i++) {
-        size += a[i].length;
+    for (const ai of a) {
+        size += ai.length;
     }
     const ret = new Uint8Array(new ArrayBuffer(size));
-    for (let i = 0, offset = 0; i < a.length; i++) {
-        ret.set(a[i], offset);
-        offset += a[i].length;
+    let offset = 0;
+    for (const ai of a) {
+        ret.set(ai, offset);
+        offset += ai.length;
     }
     return ret;
 }
@@ -62,12 +63,9 @@ export function xor(a: Uint8Array, b: Uint8Array): Uint8Array {
     if (a.length !== b.length || a.length === 0) {
         throw new Error(`arrays of different length: ${a.length} - ${b.length}`);
     }
-    const n = a.length;
-    const c = new Uint8Array(n);
-    for (let i = 0; i < n; i++) {
-        c[i] = a[i] ^ b[i];
-    }
-    return c;
+    const ai: IterableIterator<number> = a[Symbol.iterator]();
+    const bi: IterableIterator<number> = b[Symbol.iterator]();
+    return new Uint8Array(a.length).map(() => ai.next().value ^ bi.next().value);
 }
 
 function incCounter(c: Uint8Array): void {

src/util.ts

@@ -1,9 +1,8 @@
 // Copyright (c) 2023 Cloudflare, Inc.
 // Licensed under the Apache-2.0 license found in the LICENSE file or at https://opensource.org/licenses/Apache-2.0
 
-import sjcl from '../src/sjcl/index.js';
-import type { BigNumber } from 'sjcl';
 import { jest } from '@jest/globals';
+import sjcl from '../src/sjcl/index.js';
 
 import { i2osp } from '../src/util.js';
 import { BlindRSA, RSABSSA, getSuiteByName } from '../src/index.js';
@@ -32,10 +31,10 @@ function paramsFromVector(v: Vector): {
     const q = hexNumToB64URL(v.q);
 
     // Calculate CRT values
-    const bnD: BigNumber = new sjcl.bn(v.d);
-    const bnP: BigNumber = new sjcl.bn(v.p);
-    const bnQ: BigNumber = new sjcl.bn(v.q);
-    const one: BigNumber = new sjcl.bn(1);
+    const bnD = new sjcl.bn(v.d);
+    const bnP = new sjcl.bn(v.p);
+    const bnQ = new sjcl.bn(v.q);
+    const one = new sjcl.bn(1);
     const dp = hexNumToB64URL(bnD.mod(bnP.sub(one)).toString());
     const dq = hexNumToB64URL(bnD.mod(bnQ.sub(one)).toString());
     const qi = hexNumToB64URL(bnQ.inverseMod(bnP).toString());
@@ -120,9 +119,9 @@ describe.each(vectors)('Errors-vec$#', (v: Vector) => {
 
 describe.each(vectors)('TestVectors', (v: Vector) => {
     beforeEach(() => {
-        const n: BigNumber = new sjcl.bn(v.n);
+        const n = new sjcl.bn(v.n);
         const kLen = Math.ceil(n.bitLength() / 8);
-        const rInv: BigNumber = new sjcl.bn(v.inv);
+        const rInv = new sjcl.bn(v.inv);
         const r = rInv.inverseMod(n);
         const rBytes = i2osp(r, kLen);
 

test/blindrsa.test.ts

@@ -2,7 +2,6 @@
 // Licensed under the Apache-2.0 license found in the LICENSE file or at https://opensource.org/licenses/Apache-2.0
 
 import sjcl from '../src/sjcl/index.js';
-import type { BigNumber } from 'sjcl';
 import { jest } from '@jest/globals';
 
 import { i2osp } from '../src/util.js';
@@ -33,10 +32,10 @@ function paramsFromVector(v: Vector): {
     const q = hexNumToB64URL(v.q);
 
     // Calculate CRT values
-    const bnD: BigNumber = new sjcl.bn(v.d);
-    const bnP: BigNumber = new sjcl.bn(v.p);
-    const bnQ: BigNumber = new sjcl.bn(v.q);
-    const one: BigNumber = new sjcl.bn(1);
+    const bnD = new sjcl.bn(v.d);
+    const bnP = new sjcl.bn(v.p);
+    const bnQ = new sjcl.bn(v.q);
+    const one = new sjcl.bn(1);
     const dp = hexNumToB64URL(bnD.mod(bnP.sub(one)).toString());
     const dq = hexNumToB64URL(bnD.mod(bnQ.sub(one)).toString());
     const qi = hexNumToB64URL(bnQ.inverseMod(bnP).toString());

test/partially_blindrsa.test.ts

@@ -1,27 +1,19 @@
-import type { SjclCodec } from 'sjcl';
-import sjcl from '../src/sjcl';
+import sjcl from '../src/sjcl/index.js';
 
 export function hexToUint8(x: string): Uint8Array {
     if (x.startsWith('0x')) {
         x = x.slice(2);
     }
-    const hexCodec: SjclCodec<string> = sjcl.codec.hex;
-    const bytesCodec: SjclCodec<number[]> = sjcl.codec.bytes;
-    return new Uint8Array(bytesCodec.fromBits(hexCodec.toBits(x)));
+    return new Uint8Array(sjcl.codec.bytes.fromBits(sjcl.codec.hex.toBits(x)));
 }
 
 export function uint8ToHex(x: Uint8Array): string {
-    const hexCodec: SjclCodec<string> = sjcl.codec.hex;
-    const bytesCodec: SjclCodec<number[]> = sjcl.codec.bytes;
-    return hexCodec.fromBits(bytesCodec.toBits(Array.from(x)));
+    return sjcl.codec.hex.fromBits(sjcl.codec.bytes.toBits(Array.from(x)));
 }
 
 export function hexNumToB64URL(x: string): string {
     if (x.startsWith('0x')) {
         x = x.slice(2);
     }
-
-    const hexCodec: SjclCodec<string> = sjcl.codec.hex;
-    const b64Codec: SjclCodec<string> = sjcl.codec.base64url;
-    return b64Codec.fromBits(hexCodec.toBits(x));
+    return sjcl.codec.base64url.fromBits(sjcl.codec.hex.toBits(x));
 }