clean-up & certificateVerify handles ECDHE_RSA key exchange algorithm

Author: phoddie

modules/crypt/etc/ber.js

@@ -46,10 +46,10 @@ export default class BER {
 			this.#a = buffer;
 		else
 			this.#a = new Uint8Array(new ArrayBuffer(0, {maxByteLength: 0x10000000}));
-	};
+	}
 	getTag() {
 		return this.#a[this.#i++];
-	};
+	}
 	getLength() {
 		let length = this.#a[this.#i++];
 		if (length < 128)
@@ -64,19 +64,19 @@ export default class BER {
 			result = (result << 8) | this.#a[this.#i++];
 
 		return result;
-	};
+	}
 	peek() {
 		return this.#a[this.#i];
-	};
+	}
 	skip(length) {
 		this.#i += length;
-	};
+	}
 	next() {
 		const i = this.#i;
 		this.getTag();
 		this.skip(this.getLength());
 		return this.#a.subarray(i, this.#i)
-	};
+	}
 	getInteger() {
 		if (this.getTag() !== 2)
 			throw new Error("BER: not an integer");
@@ -92,7 +92,7 @@ export default class BER {
 			this.skip(length)
 			return BigInt.fromArrayBuffer(this.#a.buffer.slice(offset, offset + length));
 		}
-	};
+	}
 	getBitString() {
 		let result;
 		if (this.getTag() != 3)
@@ -102,19 +102,19 @@ export default class BER {
 		if (pad) {
 			result = new Uint8Array(length - 1);
 			for (let i = 0; i < length - 1; i++)
-				bs[i] = this.#a[this.#i++] >>> pad;
+				result[i] = this.#a[this.#i++] >>> pad;
 		}
 		else {
 			result = this.#a.subarray(this.#i, this.#i + length - 1);
 			this.#i += length;
 		}
 		return result;
-	};
+	}
 	getOctetString() {
 		if (this.getTag() != 0x04)
 			throw new Error("BER: not a octet string");
 		return this.getChunk(this.getLength());
-	};
+	}
 	getObjectIdentifier() {
 		if (this.getTag() !== 0x06)
 			throw new Error("BER: not an object identifier");
@@ -131,39 +131,39 @@ export default class BER {
 			oid.push((v << 7) | i);
 		}
 		return Uint32Array.from(oid);
-	};
+	}
 	getSequence() {
 		if (this.getTag() != 0x30)
 			throw new Error("BER: not a sequence");
 		const length = this.getLength();
 		const result = this.#a.subarray(this.#i, + this.#i + length);
 		this.#i += length;
 		return result;
-	};
+	}
 	getChunk(n) {
 		const result = new Uint8Array(this.#a.buffer, this.#a.byteOffset + this.#i, n);
 		this.skip(n);
 		return result;
-	};
+	}
 	getBuffer() {
 		return this.#a.slice(0, this.#i).buffer;
-	};
+	}
 
 	morebuf(n) {
 		if (n < 128) n = 128;
 		this.#a.buffer.resize(this.#a.length + n);
-	};
+	}
 	getc() {
 		return this.#a[this.#i++];
-	};
+	}
 	putc(c) {
 		if (this.#i >= this.#a.length)
 			this.morebuf(1);
 		this.#a[this.#i++] = c;
-	};
+	}
 	putTag(tag) {
 		this.putc(tag);
-	};
+	}
 	putLength(len) {
 		if (len < 128)
 			this.putc(len);
@@ -176,13 +176,13 @@ export default class BER {
 			while (--lenlen >= 0)
 				this.putc(len >>> (lenlen << 3));
 		}
-	};
+	}
 	putChunk(c) {
 		if (this.#i + c.byteLength > this.#a.length)
 			this.morebuf(c.byteLength);
 		this.#a.set(new Uint8Array(c), this.#i);
 		this.#i += c.byteLength;
-	};
+	}
 	get i() {
 		return this.#i;
 	}
@@ -191,7 +191,7 @@ export default class BER {
 		if (n.length < 2)
 			return "0" + n;
 		return n;
-	};
+	}
 	static encode(arr) {
 		const b = new BER;
 		const tag = arr[0];
@@ -334,7 +334,7 @@ export default class BER {
 		}
 		b.#a.buffer.resize(b.#i);
 		return b.#a.buffer;
-	};
+	}
 	static decode(a) {
 		return this._decode(new BER(a));
 	}
@@ -356,7 +356,7 @@ export default class BER {
 			res = [res];
 		res.unshift(tag);
 		return res;
-	};
+	}
 	static decodeTag(tag, b, len) {
 		let res;
 		if ((tag >> 6) == 2) {	// context specific class
@@ -424,7 +424,6 @@ export default class BER {
 			break;
 		case 0x09:	// real -- not supported
 			throw new Error("BER: unsupported");
-			break;
 		case 0x07:	// object descriptor
 		case 0x0c:	// UTF8 string
 		case 0x12:	// numeric string
@@ -470,7 +469,5 @@ export default class BER {
 			break;
 		}
 		return res;
-	};
-};
-
-Object.freeze(BER.prototype);
+	}
+}

modules/crypt/etc/ecdsa.js

@@ -38,19 +38,17 @@
 import RNG from "rng";
 import PKCS1 from "pkcs1";
 import Mont from "mont";
-import EC from "ec";
-import Curve from "curve";
 import BER from "ber";
 
 export default class ECDSA {
-	constructor(key, curve, priv) {
+	constructor(key, curve /* , priv */) {
 		this.u = key;
 		this.G = curve.G;
 		this.orderSize = curve.orderSize;
 		this.n = new Mont({m: curve.n});
 		this.ec = curve.ec;
 		this.k = curve.k;	// just for a debugging purpose
-	};
+	}
 	_sign(H) {
 		// (r, s) = (k*G, (e + du*r) / k)
 		var ec = this.ec;
@@ -67,7 +65,7 @@ export default class ECDSA {
 			var s = n.mul(n.add(e, n.mul(du, r)), n.mulinv(k));
 		} while (s == 0);
 		return {r, s};
-	};
+	}
 	sign(H, asn1) {
 		const sig = this._sign(H);
 		if (asn1)
@@ -76,7 +74,7 @@ export default class ECDSA {
 		const os = new ArrayBuffer();
 		const l = this.orderSize;
 		return os.concat(PKCS1.I2OSP(sig.r, l), PKCS1.I2OSP(sig.s, l));
-	};
+	}
 	_verify(H, r, s) {
 		// u1 = e / s
 		// u2 = r / s
@@ -93,7 +91,7 @@ export default class ECDSA {
 		// var R = ec.add(ec.mul(G, u1), ec.mul(Qu, u2));
 		var R = ec.mul2(G, u1, Qu, u2);
 		return R.X === r;
-	};
+	}
 	verify(H, sig, asn1) {
 		var r, s;
 		if (asn1) {
@@ -108,11 +106,11 @@ export default class ECDSA {
 			s = PKCS1.OS2IP(sig.slice(l, l*2));
 		}
 		return this._verify(H, r, s);
-	};
+	}
 	static randint(max) {
 		var i = BigInt.fromArrayBuffer(RNG.get(BigInt.bitLength(max) >>> 3));
 		while (i >= max)
 			i >>>= 1;
 		return i;
-	};
-};
+	}
+}

modules/crypt/ssl/ssl_cert.js

@@ -56,10 +56,8 @@ class CertificateManager {
 		this.#verify = options.verify ?? true;
 		if (options.certificate)
 			this.register(options.certificate);
-		if (options.clientCertificates)
-			this.#clientCertificates = options.clientCertificates;
-		if (options.clientKey)
-			this.#clientKey = options.clientKey;
+		this.#clientCertificates = options.clientCertificates;
+		this.#clientKey = options.clientKey;
 	}
 	getCerts() {
 		// return the self certs

modules/crypt/ssl/ssl_ciphersuites.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2021  Moddable Tech, Inc.
+ * Copyright (c) 2016-2022  Moddable Tech, Inc.
  *
  *   This file is part of the Moddable SDK Runtime.
  * 
@@ -36,9 +36,7 @@
  */
 
 import config from "mc/config";
-import {AES, CBC, DES, DHE_RSA, ECDHE_RSA, GCM, MD5, NONE, NULL, RSA, SHA1, SHA256, SHA384, TDES} from "ssl/constants";
-
-
+import {AES, CBC, DHE_RSA, ECDHE_RSA, GCM, RSA, SHA1, SHA256 /* , SHA384, TDES */} from "ssl/constants";
 
 const supportedCipherSuites = [
 	{