moving key exchange logic into cas-lib

WingZer0o · WingZer0o · commit 5416ef73f274 · 2024-05-19T00:45:20.000-04:00
diff --git a/index.d.ts b/index.d.ts
@@ -19,7 +19,7 @@ export function sha512(dataToHash: Array<number>): Array<number>
 export function sha512Verify(dataToHash: Array<number>, dataToVerify: Array<number>): boolean
 export function sha256(dataToHash: Array<number>): Array<number>
 export function sha256Verify(dataToHash: Array<number>, dataToVerify: Array<number>): boolean
-export function x25519GenerateSecretAndPublicKey(): X25519SecretPublicKeyResult
+export function x25519GenerateSecretAndPublicKey(): CASx25519SecretPublicKeyResult
 export function x25519DiffieHellman(mySecretKey: Array<number>, usersPublicKey: Array<number>): Array<number>
 export function aesNonce(): Array<number>
 export function aes128Key(): Array<number>
@@ -47,8 +47,8 @@ export function ascon128KeyGenerate(): Array<number>
 export function ascon128NonceGenerate(): Array<number>
 export function ascon128Encrypt(key: Array<number>, nonce: Array<number>, plaintext: Array<number>): Array<number>
 export function ascon128Decrypt(key: Array<number>, nonce: Array<number>, ciphertext: Array<number>): Array<number>
-export type x25519SecretPublicKeyResult = X25519SecretPublicKeyResult
-export class X25519SecretPublicKeyResult {
+export type CASx25519SecretPublicKeyResult = CaSx25519SecretPublicKeyResult
+export class CaSx25519SecretPublicKeyResult {
   publicKey: Array<number>
   secretKey: Array<number>
   constructor(publicKey: Array<number>, secretKey: Array<number>)
diff --git a/index.node b/index.node
diff --git a/src-ts/key_exchange/index.ts b/src-ts/key_exchange/index.ts
@@ -1,3 +1,4 @@
+import { CASx25519SecretPublicKeyResult } from "../../index";
 import { X25519Wrapper } from "./x25519";
 
-export { X25519Wrapper };
+export { X25519Wrapper, CASx25519SecretPublicKeyResult };
diff --git a/src-ts/key_exchange/x25519.ts b/src-ts/key_exchange/x25519.ts
@@ -1,12 +1,12 @@
-import { x25519DiffieHellman, x25519GenerateSecretAndPublicKey, X25519SecretPublicKeyResult } from "../../index"
+import { CASx25519SecretPublicKeyResult, x25519DiffieHellman, x25519GenerateSecretAndPublicKey } from "../../index"
 
 export class X25519Wrapper {
     /**
      * Generates and secret and public key to be used to create a shared secret with Diffie Hellman.
      * User should share their public key with the other user and take the other user's public key and they can generate a Shared Secret.
      * @returns X25519SecretPublicKeyResult
      */
-    public generateSecretAndPublicKey(): X25519SecretPublicKeyResult {
+    public generateSecretAndPublicKey(): CASx25519SecretPublicKeyResult {
         return x25519GenerateSecretAndPublicKey();
     }
 
diff --git a/src/key_exchange/cas_key_exchange.rs b/src/key_exchange/cas_key_exchange.rs
diff --git a/src/key_exchange/types.rs b/src/key_exchange/types.rs
@@ -0,0 +1,17 @@
+use cas_lib::key_exchange::x25519::x25519SecretPublicKeyResult;
+use napi_derive::napi;
+
+#[napi(constructor)]
+pub struct CASx25519SecretPublicKeyResult {
+    pub public_key: Vec<u8>,
+    pub secret_key: Vec<u8>,
+}
+
+impl From<x25519SecretPublicKeyResult> for CASx25519SecretPublicKeyResult {
+    fn from(value: x25519SecretPublicKeyResult) -> Self {
+        CASx25519SecretPublicKeyResult {
+            public_key: value.public_key,
+            secret_key: value.secret_key
+        }
+    }
+}
diff --git a/src/key_exchange/x25519.rs b/src/key_exchange/x25519.rs
@@ -1,44 +1,12 @@
-use napi::bindgen_prelude::ClassInstance;
+use cas_lib::key_exchange::{cas_key_exchange::CASKeyExchange, x25519::X25519};
 use napi_derive::napi;
-use rand::rngs::OsRng;
-use x25519_dalek::{PublicKey, StaticSecret};
 
-use super::cas_key_exchange::CASKeyExchange;
+use super::types::CASx25519SecretPublicKeyResult;
 
-#[napi(constructor)]
-pub struct x25519SecretPublicKeyResult {
-    pub public_key: Vec<u8>,
-    pub secret_key: Vec<u8>,
-}
-
-pub struct X25519;
-
-impl CASKeyExchange for X25519 {
-    fn generate_secret_and_public_key() -> x25519SecretPublicKeyResult {
-        let secret_key = StaticSecret::random_from_rng(OsRng);
-        let public_key = PublicKey::from(&secret_key);
-        let result = x25519SecretPublicKeyResult {
-            secret_key: secret_key.as_bytes().to_vec(),
-            public_key: public_key.as_bytes().to_vec(),
-        };
-        result
-    }
-
-    fn diffie_hellman(my_secret_key: Vec<u8>, users_public_key: Vec<u8>) -> Vec<u8> {
-        let mut secret_key_array: [u8; 32] = Default::default();
-        secret_key_array.copy_from_slice(&my_secret_key);
-        let mut users_public_key_array: [u8; 32] = Default::default();
-        users_public_key_array.copy_from_slice(&users_public_key);
-
-        let secret_key = StaticSecret::from(secret_key_array);
-        let public_key = PublicKey::from(users_public_key_array);
-        return secret_key.diffie_hellman(&public_key).as_bytes().to_vec();
-    }
-}
 
 #[napi]
-pub fn x25519_generate_secret_and_public_key() -> x25519SecretPublicKeyResult {
-    return <X25519 as CASKeyExchange>::generate_secret_and_public_key();
+pub fn x25519_generate_secret_and_public_key() -> CASx25519SecretPublicKeyResult {
+    return <X25519 as CASKeyExchange>::generate_secret_and_public_key().into();
 }
 
 #[napi]
diff --git a/src/lib.rs b/src/lib.rs
@@ -9,8 +9,8 @@ mod hashers {
 }
 
 mod key_exchange {
-    pub mod cas_key_exchange;
     pub mod x25519;
+    pub mod types;
 }
 
 mod symmetric {
diff --git a/test-ts/insecure-channel.test.spec.ts b/test-ts/insecure-channel.test.spec.ts
@@ -1,15 +1,15 @@
 import {AESWrapper} from "../src-ts/symmetric/index";
 import {X25519Wrapper} from "../src-ts/key_exchange/index";
-import {X25519SecretPublicKeyResult} from "../index";
+import {CASx25519SecretPublicKeyResult} from "../index";
 import { areEqual } from "./helpers/array";
 import { assert } from "chai";
 
 describe("Insecure Channel Tests", () => {
     it("AES256-GBC Diffie Hellman X25519", () => {
       const aesWrapper = new AESWrapper();
       const x25519Wrapper = new X25519Wrapper();
-      const alice_keys: X25519SecretPublicKeyResult = x25519Wrapper.generateSecretAndPublicKey();
-      const bob_keys: X25519SecretPublicKeyResult = x25519Wrapper.generateSecretAndPublicKey();
+      const alice_keys: CASx25519SecretPublicKeyResult = x25519Wrapper.generateSecretAndPublicKey();
+      const bob_keys: CASx25519SecretPublicKeyResult = x25519Wrapper.generateSecretAndPublicKey();
       
       const alice_shared_secret = x25519Wrapper.generateSharedSecret(alice_keys.secretKey, bob_keys.publicKey);
       const bob_shared_secret = x25519Wrapper.generateSharedSecret(bob_keys.secretKey, alice_keys.publicKey);
@@ -30,8 +30,8 @@ describe("Insecure Channel Tests", () => {
     it("AES128-GBC Diffie Hellman X25519", () => {
       const aesWrapper = new AESWrapper();
       const x25519Wrapper = new X25519Wrapper();
-      const alice_keys: X25519SecretPublicKeyResult = x25519Wrapper.generateSecretAndPublicKey();
-      const bob_keys: X25519SecretPublicKeyResult = x25519Wrapper.generateSecretAndPublicKey();
+      const alice_keys: CASx25519SecretPublicKeyResult = x25519Wrapper.generateSecretAndPublicKey();
+      const bob_keys: CASx25519SecretPublicKeyResult = x25519Wrapper.generateSecretAndPublicKey();
       
       const alice_shared_secret = x25519Wrapper.generateSharedSecret(alice_keys.secretKey, bob_keys.publicKey);
       const bob_shared_secret = x25519Wrapper.generateSharedSecret(bob_keys.secretKey, alice_keys.publicKey);

Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,8 @@ mod hashers {`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`mod key_exchange {`
`12`		`- pub mod cas_key_exchange;`
`13`	`12`	`pub mod x25519;`
	`13`	`+ pub mod types;`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`mod symmetric {`