Working 2 packet x25519_kyber768Half_xchacha20 encryption scheme

tomekmarchi · tomekmarchi · commit 453b262eccec · 2024-08-29T21:07:50.000-04:00
Demos added for cipherSuite 1 Hybrid Post Quantum
diff --git a/package.json b/package.json
@@ -100,6 +100,7 @@
 		"server": "nodemon ./serverApp/index.js --watch ./udsp/ --watch ./serverApp/  --watch ./utilities/",
 		"simulate": "nodemon ./scripts/simulate.js --watch ./client/ --watch ./server/ --watch ./scripts/simulate.js --watch utilities/",
 		"connectRequest": "nodemon ./scripts/client/connectRequest.js --watch ./udsp/ --watch ./scripts/client/connectRequest.js --watch ./utilities/ --delay 3",
+		"connect": "nodemon ./scripts/client/connect.js --watch ./udsp/ --watch ./scripts/client/connect.js --watch ./utilities/ --delay 3",
 		"closeReconnect": "nodemon ./scripts/client/closeReconnect.js --watch ./udsp/ --watch ./scripts/client/closeReconnect.js --watch ./utilities/ --delay 3",
 		"request": "nodemon ./scripts/client/request.js --watch ./udsp/ --watch ./scripts/client/request.js --watch ./utilities/ --delay 3",
 		"close": "nodemon ./scripts/client/close.js --watch ./udsp/ --watch ./scripts/client/close.js --watch ./utilities/ --delay 3",
diff --git a/scripts/certificates.js b/scripts/certificates.js
@@ -9,7 +9,7 @@ const UWCertificate = await domainCertificate({
 	entity: 'universalweb.io',
 	// ownerHash: profile.getSignature(),
 	signatureAlgorithm: 0,
-	cipherSuites: [0, 1],
+	cipherSuites: 1,
 	records: [
 		[
 			'aaaa',
diff --git a/scripts/client/connect.js b/scripts/client/connect.js
@@ -0,0 +1,20 @@
+console.clear();
+console.log('STARTING CLIENT');
+console.time('Full');
+import { client } from '#udsp';
+import { currentPath } from '@universalweb/acid';
+console.time('Connected');
+// Universal Web Client Socket
+const uwClient = await client({
+	destinationCertificate: `${currentPath(import.meta)}/../../udsp/dis/cache/universalWebPublic.cert`,
+	// Load Profile Certificate from Keychain
+	keychain: 'Universal Web Profile',
+	// Load Profile Certificate from file
+	profile: `${currentPath(import.meta)}/../../profiles/default/profile.cert`,
+	// Force overide cipherSuite
+	cipherSuite: 1,
+});
+const connection = await uwClient.connect();
+console.timeEnd('Connected');
+console.log('INTRO =>', uwClient);
+console.timeEnd('Full');
diff --git a/scripts/client/connectRequest.js b/scripts/client/connectRequest.js
@@ -10,7 +10,9 @@ const uwClient = await client({
 	// Load Profile Certificate from Keychain
 	keychain: 'Universal Web Profile',
 	// Load Profile Certificate from file
-	profile: `${currentPath(import.meta)}/../../profiles/default/profile.cert`
+	profile: `${currentPath(import.meta)}/../../profiles/default/profile.cert`,
+	// Force overide cipherSuite
+	cipherSuite: 1,
 });
 const connection = await uwClient.connect();
 console.timeEnd('Connected');
diff --git a/udsp/client/configCryptography.js b/udsp/client/configCryptography.js
@@ -11,7 +11,7 @@ export async function configCryptography() {
 	const { cipherSuites }	= certificate;
 	this.signatureAlgorithm = await certificate.getSignatureAlgorithm();
 	if (noValue(this.cipherSuite)) {
-		this.cipherSuite = await certificate.selectCipherSuite(cipherSuites);
+		this.cipherSuite = await certificate.selectCipherSuite(this.options?.cipherSuite || cipherSuites);
 	}
 	// console.log(this.cipherSuite);
 	assign(this, await this.cipherSuite.clientEphemeralKeypair());
diff --git a/udsp/client/index.js b/udsp/client/index.js
@@ -54,7 +54,7 @@ import { publicDomainCertificate } from '../../utilities/certificate/domain.js';
 import { sendPacket } from '../sendPacket.js';
 import { setDestination } from './setDestination.js';
 import { socketOnError } from './socketOnError.js';
-import { uwProfile } from '../../utilities/certificate/profile.js';
+import { uwProfile } from '../../UWProfile/index.js';
 import { uwRequest } from '#udsp/requestMethods/request';
 import { watch } from '#watch';
 const {
diff --git a/udsp/request/ask.js b/udsp/request/ask.js
@@ -75,6 +75,7 @@ export class Ask extends Base {
 		this.accept(this.response);
 	}
 	isAsk = true;
+	static type = 'ask';
 }
 export async function ask(source) {
 	return construct(Ask, source);
diff --git a/udsp/request/onFrame.js b/udsp/request/onFrame.js
@@ -56,7 +56,7 @@ export async function onFrame(frame, header, rinfo) {
 		packetId,
 		data
 	] = frame;
-	console.log(`onPacket Stream Id ${id}`);
+	console.log(`onPacket Stream Id ${id}`, this);
 	if (isMethodCodeValid(rpc) === false) {
 		source.destroy('Invalid RPC');
 		return;
diff --git a/udsp/request/reply.js b/udsp/request/reply.js
@@ -59,6 +59,7 @@ export class Reply extends Base {
 		this.state = 1;
 		await processEvent(this.request, this.response, this.source().server());
 	}
+	static type = 'reply';
 }
 export function reply(...args) {
 	// console.log(client);
diff --git a/udsp/request/rpc/onData.js b/udsp/request/rpc/onData.js
@@ -3,7 +3,7 @@ export async function onDataReady(id, rpc, packetId, data, frame, source, rinfo)
 		source.totalReceivedUniquePackets++;
 		source.receivedDataReadyPacket = true;
 	}
-	console.log('Data Ready Packet Received', source.type);
+	console.log('Data Ready Packet Received', id, rpc, packetId, data, frame, source, rinfo);
 	source.sendData();
 }
 export async function onData(id, rpc, packetId, data, frame, source, rinfo) {
diff --git a/udsp/request/rpc/onHead.js b/udsp/request/rpc/onHead.js
@@ -6,6 +6,7 @@ export async function onHeadReady(id, rpc, packetId, data, frame, source, rinfo)
 	source.sendHead();
 }
 export async function onHead(id, rpc, packetId, data, frame, source, rinfo) {
+	console.log('On Head Function', id, rpc, packetId, data, frame, source, rinfo);
 	if (!source.receivedSetupPacket || source.incomingHeadPackets[packetId]) {
 		return;
 	}
diff --git a/udsp/server/clients/index.js b/udsp/server/clients/index.js
@@ -241,7 +241,7 @@ export class Client {
 	data = construct(Map);
 	requestQueue = construct(Map);
 	connectionIdSize = defaultClientConnectionIdSize;
-	type = 'serverClient';
+	static type = 'serverClient';
 	isServerClient = true;
 	isServerEnd = true;
 	initialize = initialize;
diff --git a/utilities/certificate/keychain.js b/utilities/certificate/keychain.js
@@ -3,7 +3,7 @@ import { isBuffer, promise } from '@universalweb/acid';
 import keychain from 'keychain';
 import { toBase64 } from '#crypto';
 export function keychainGetPromise(account, accept, reject) {
-	console.log(account);
+	console.log('Keychain Account', account);
 	keychain.getPassword({
 		account,
 		service: 'Universal Web'
diff --git a/utilities/cryptoMiddleware/index.js b/utilities/cryptoMiddleware/index.js
@@ -67,7 +67,7 @@ export function getCipherSuites(indexes, version = currentVersion) {
 			const cipherSuitesArray = compactMapArray(indexes, (value) => {
 				const cipherSuite = getCipherSuite(value, version);
 				if (cipherSuite) {
-					cipherSuitesArray.push(cipherSuite);
+					return cipherSuite;
 				}
 			});
 			return cipherSuitesArray;
diff --git a/utilities/cryptoMiddleware/x25519_Kyber768Half_xChaCha.js b/utilities/cryptoMiddleware/x25519_Kyber768Half_xChaCha.js
@@ -1,3 +1,4 @@
+// Closed source not for private and or corporate use.
 import * as defaultCrypto from '#crypto';
 import { assign, clearBuffer, isBuffer } from '@universalweb/acid';
 import {
@@ -8,6 +9,7 @@ import {
 	serverSetSessionAttach,
 } from './x25519.js';
 import { decapsulate, encapsulate, encryptionKeypair } from './kyber768.js';
+import { decrypt, encrypt } from './XChaCha.js';
 import { blake3 } from '@noble/hashes/blake3';
 import { ml_kem768 } from '@noble/post-quantum/ml-kem';
 const {
@@ -120,6 +122,8 @@ export const x25519_kyber768Half_xchacha20 = {
 		const x25519Keypair = await encryptionKeypair25519();
 		return x25519Keypair;
 	},
+	decrypt,
+	encrypt,
 };
 // EXAMPLE
 // const ogServer = await encryptionKeypair25519();

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ const UWCertificate = await domainCertificate({`
`9`	`9`	`entity: 'universalweb.io',`
`10`	`10`	`// ownerHash: profile.getSignature(),`
`11`	`11`	`signatureAlgorithm: 0,`
`12`		`- cipherSuites: [0, 1],`
	`12`	`+ cipherSuites: 1,`
`13`	`13`	`records: [`
`14`	`14`	`[`
`15`	`15`	`'aaaa',`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ export async function configCryptography() {`
`11`	`11`	`const { cipherSuites } = certificate;`
`12`	`12`	`this.signatureAlgorithm = await certificate.getSignatureAlgorithm();`
`13`	`13`	`if (noValue(this.cipherSuite)) {`
`14`		`- this.cipherSuite = await certificate.selectCipherSuite(cipherSuites);`
	`14`	`+ this.cipherSuite = await certificate.selectCipherSuite(this.options?.cipherSuite \|\| cipherSuites);`
`15`	`15`	`}`
`16`	`16`	`// console.log(this.cipherSuite);`
`17`	`17`	`assign(this, await this.cipherSuite.clientEphemeralKeypair());`
Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,7 @@ export class Ask extends Base {`
`75`	`75`	`this.accept(this.response);`
`76`	`76`	`}`
`77`	`77`	`isAsk = true;`
	`78`	`+ static type = 'ask';`
`78`	`79`	`}`
`79`	`80`	`export async function ask(source) {`
`80`	`81`	`return construct(Ask, source);`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@ export class Reply extends Base {`
`59`	`59`	`this.state = 1;`
`60`	`60`	`await processEvent(this.request, this.response, this.source().server());`
`61`	`61`	`}`
	`62`	`+ static type = 'reply';`
`62`	`63`	`}`
`63`	`64`	`export function reply(...args) {`
`64`	`65`	`// console.log(client);`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ export async function onDataReady(id, rpc, packetId, data, frame, source, rinfo)`
`3`	`3`	`source.totalReceivedUniquePackets++;`
`4`	`4`	`source.receivedDataReadyPacket = true;`
`5`	`5`	`}`
`6`		`- console.log('Data Ready Packet Received', source.type);`
	`6`	`+ console.log('Data Ready Packet Received', id, rpc, packetId, data, frame, source, rinfo);`
`7`	`7`	`source.sendData();`
`8`	`8`	`}`
`9`	`9`	`export async function onData(id, rpc, packetId, data, frame, source, rinfo) {`