Switch to standardized version of ML-KEM

ProtonMail · Sep 13, 2024 · 845fe08 · 845fe08
1 parent 48a938c
commit 845fe08
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 36 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -66,7 +66,7 @@
     "@noble/curves": "^1.6.0",
     "@noble/ed25519": "^1.7.3",
     "@noble/hashes": "^1.5.0",
-    "@openpgp/crystals-kyber-js": "^1.1.1",
+    "@noble/post-quantum": "^0.2.0",
     "@openpgp/jsdoc": "^3.6.11",
     "@openpgp/seek-bzip": "^1.0.5-git",
     "@openpgp/tweetnacl": "^1.0.4-1",

diff --git a/src/crypto/public_key/post_quantum/kem/ml_kem.js b/src/crypto/public_key/post_quantum/kem/ml_kem.js
@@ -4,9 +4,8 @@ import util from '../../../../util';
 export async function generate(algo) {
   switch (algo) {
     case enums.publicKey.pqc_mlkem_x25519: {
-      const { MlKem768 } = await import('@openpgp/crystals-kyber-js');
-      const kyberInstance = new MlKem768();
-      const [encapsulationKey, decapsulationKey] = await kyberInstance.generateKeyPair();
+      const { ml_kem768 } = await import('@noble/post-quantum/ml-kem');
+      const { publicKey: encapsulationKey, secretKey: decapsulationKey } = ml_kem768.keygen();
 
       return { mlkemPublicKey: encapsulationKey, mlkemSecretKey: decapsulationKey };
     }
@@ -18,9 +17,8 @@ export async function generate(algo) {
 export async function encaps(algo, mlkemRecipientPublicKey) {
   switch (algo) {
     case enums.publicKey.pqc_mlkem_x25519: {
-      const { MlKem768 } = await import('@openpgp/crystals-kyber-js');
-      const kyberInstance = new MlKem768();
-      const [mlkemCipherText, mlkemKeyShare] = await kyberInstance.encap(mlkemRecipientPublicKey);
+      const { ml_kem768 } = await import('@noble/post-quantum/ml-kem');
+      const { cipherText: mlkemCipherText, sharedSecret: mlkemKeyShare } = ml_kem768.encapsulate(mlkemRecipientPublicKey);
 
       return { mlkemCipherText, mlkemKeyShare };
     }
@@ -32,9 +30,8 @@ export async function encaps(algo, mlkemRecipientPublicKey) {
 export async function decaps(algo, mlkemCipherText, mlkemSecretKey) {
   switch (algo) {
     case enums.publicKey.pqc_mlkem_x25519: {
-      const { MlKem768 } = await import('@openpgp/crystals-kyber-js');
-      const kyberInstance = new MlKem768();
-      const mlkemKeyShare = await kyberInstance.decap(mlkemCipherText, mlkemSecretKey);
+      const { ml_kem768 } = await import('@noble/post-quantum/ml-kem');
+      const mlkemKeyShare = ml_kem768.decapsulate(mlkemCipherText, mlkemSecretKey);
 
       return mlkemKeyShare;
     }