From f0268ccb15e34761909c11530aff61f4d0910a02 Mon Sep 17 00:00:00 2001
From: Ivan Pizhenko <IvanPizhenko@users.noreply.github.com>
Date: Mon, 11 Apr 2022 22:22:25 +0300
Subject: [PATCH 1/3] Change key type into key family

---
 extension/chrome/settings/index.ts                 | 2 +-
 extension/chrome/settings/setup.htm                | 2 +-
 extension/js/common/core/crypto/key.ts             | 8 ++++----
 extension/js/common/core/crypto/pgp/msg-util.ts    | 2 +-
 extension/js/common/core/crypto/smime/smime-key.ts | 2 +-
 extension/js/common/ui/key-import-ui.ts            | 2 +-
 test/source/tests/unit-node.ts                     | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/extension/chrome/settings/index.ts b/extension/chrome/settings/index.ts
index eb907398d7b..6d3391d5fa6 100644
--- a/extension/chrome/settings/index.ts
+++ b/extension/chrome/settings/index.ts
@@ -434,7 +434,7 @@ View.run(class SettingsView extends View {
           await PassphraseStore.set('session', this.acctEmail!, { longid }, undefined);
           this.reload(true);
         } else {
-          Catch.report(`unexpected key type: ${family}`);
+          Catch.report(`unexpected key family: ${family}`);
         }
       }));
     }
diff --git a/extension/chrome/settings/setup.htm b/extension/chrome/settings/setup.htm
index bb61f2a4a9f..b5975755c30 100644
--- a/extension/chrome/settings/setup.htm
+++ b/extension/chrome/settings/setup.htm
@@ -147,7 +147,7 @@ <h1>Set Up FlowCrypt</h1>
 
       <div class="line left">
         <label>
-          Encryption key type:
+          Encryption key family:
           <select class="key_type" data-test="input-step2bmanualcreate-key-type">
             <option value="curve25519">ECC Curve25519</option>
             <option value="rsa2048">RSA 2048bit</option>
diff --git a/extension/js/common/core/crypto/key.ts b/extension/js/common/core/crypto/key.ts
index 14578c5feac..a250437d4be 100644
--- a/extension/js/common/core/crypto/key.ts
+++ b/extension/js/common/core/crypto/key.ts
@@ -349,7 +349,7 @@ export class KeyUtil {
     } else if (key.family === 'x509') {
       return await SmimeKey.decryptKey(key, passphrase, optionalBehaviorFlag);
     } else {
-      throw new Error(`KeyUtil.decrypt does not support key type ${key.family}`);
+      throw new Error(`KeyUtil.decrypt does not support key family ${key.family}`);
     }
   };
 
@@ -359,7 +359,7 @@ export class KeyUtil {
     } else if (key.family === 'x509') {
       return await SmimeKey.encryptKey(key, passphrase);
     } else {
-      throw new Error(`KeyUtil.encrypt does not support key type ${key.family}`);
+      throw new Error(`KeyUtil.encrypt does not support key family ${key.family}`);
     }
   };
 
@@ -367,7 +367,7 @@ export class KeyUtil {
     if (privateKey.family === 'openpgp') {
       return await OpenPGPKey.reformatKey(privateKey, passphrase, userIds, expireSeconds);
     } else {
-      throw new Error(`KeyUtil.reformatKey does not support key type ${privateKey.family}`);
+      throw new Error(`KeyUtil.reformatKey does not support key family ${privateKey.family}`);
     }
   };
 
@@ -375,7 +375,7 @@ export class KeyUtil {
     if (key.family === 'openpgp') {
       return await OpenPGPKey.revoke(key);
     } else {
-      throw new Error(`KeyUtil.revoke does not support key type ${key.family}`);
+      throw new Error(`KeyUtil.revoke does not support key family ${key.family}`);
     }
   };
 
diff --git a/extension/js/common/core/crypto/pgp/msg-util.ts b/extension/js/common/core/crypto/pgp/msg-util.ts
index bf6d98b5add..ab175685812 100644
--- a/extension/js/common/core/crypto/pgp/msg-util.ts
+++ b/extension/js/common/core/crypto/pgp/msg-util.ts
@@ -212,7 +212,7 @@ export class MsgUtil {
   public static encryptMessage: PgpMsgMethod.Encrypt = async ({ pubkeys, signingPrv, pwd, data, filename, armor, date }) => {
     const keyTypes = new Set(pubkeys.map(k => k.family));
     if (keyTypes.has('openpgp') && keyTypes.has('x509')) {
-      throw new Error('Mixed key types are not allowed: ' + [...keyTypes]);
+      throw new Error('Mixed key families are not allowed: ' + [...keyTypes]);
     }
     const input = { pubkeys, signingPrv, pwd, data, filename, armor, date };
     if (keyTypes.has('x509')) {
diff --git a/extension/js/common/core/crypto/smime/smime-key.ts b/extension/js/common/core/crypto/smime/smime-key.ts
index 442a4b032a1..c85502af921 100644
--- a/extension/js/common/core/crypto/smime/smime-key.ts
+++ b/extension/js/common/core/crypto/smime/smime-key.ts
@@ -374,7 +374,7 @@ export class SmimeKey {
       }
       throw new UnreportableError("Certificate doesn't match the private key");
     }
-    throw new UnreportableError("This key type is not supported");
+    throw new UnreportableError("This key family is not supported");
     /* todo: edwards25519
     const derivedPublicKey = forge.pki.ed25519.publicKeyFromPrivateKey({ privateKey: privateKey as forge.pki.ed25519.BinaryBuffer });
     Buffer.from(derivedPublicKey).compare(Buffer.from(certificate.publicKey as forge.pki.ed25519.NativeBuffer)) === 0;
diff --git a/extension/js/common/ui/key-import-ui.ts b/extension/js/common/ui/key-import-ui.ts
index ef8d6b9f3a1..0555ca12554 100644
--- a/extension/js/common/ui/key-import-ui.ts
+++ b/extension/js/common/ui/key-import-ui.ts
@@ -242,7 +242,7 @@ export class KeyImportUi {
   private normalize = async (type: KeyBlockType, armored: string): Promise<{ normalized: string }> => {
     // non-OpenPGP keys are considered to be always normalized
     // TODO: PgpKey.normalize depends on OpenPGP.key.Key objects, when this is resolved
-    // this check for key type should be moved to PgpKey.normalize function.
+    // this check for key family should be moved to PgpKey.normalize function.
     if (KeyUtil.getKeyFamily(armored) !== 'openpgp') {
       return { normalized: armored };
     }
diff --git a/test/source/tests/unit-node.ts b/test/source/tests/unit-node.ts
index 8f907c33822..02e636d6187 100644
--- a/test/source/tests/unit-node.ts
+++ b/test/source/tests/unit-node.ts
@@ -244,7 +244,7 @@ WeNYP84Yjw6OFSHdi2W0VojRGhxm7PZCMqswN/XaBg==
       await t.throwsAsync(() => KeyUtil.parse(httpsCert), { instanceOf: UnreportableError, message: 'This S/MIME x.509 certificate has an invalid recipient email: news.ycombinator.com' });
     });
 
-    ava.default('[unit][KeyUtil.parse] Unknown key type parsing fails', async t => {
+    ava.default('[unit][KeyUtil.parse] Unknown key family parsing fails', async t => {
       await t.throwsAsync(() => KeyUtil.parse('dummy string for unknown key'), { instanceOf: Error, message: 'Key type is unknown, expecting OpenPGP or x509 S/MIME' });
     });
 

From 24990d7653d62fb7cf83f17f6d96ad83fd770b35 Mon Sep 17 00:00:00 2001
From: Ivan Pizhenko <IvanPizhenko@users.noreply.github.com>
Date: Mon, 11 Apr 2022 22:38:44 +0300
Subject: [PATCH 2/3] fix setup.html

---
 extension/chrome/settings/setup.htm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/chrome/settings/setup.htm b/extension/chrome/settings/setup.htm
index b5975755c30..bb61f2a4a9f 100644
--- a/extension/chrome/settings/setup.htm
+++ b/extension/chrome/settings/setup.htm
@@ -147,7 +147,7 @@ <h1>Set Up FlowCrypt</h1>
 
       <div class="line left">
         <label>
-          Encryption key family:
+          Encryption key type:
           <select class="key_type" data-test="input-step2bmanualcreate-key-type">
             <option value="curve25519">ECC Curve25519</option>
             <option value="rsa2048">RSA 2048bit</option>

From 4493434ce4bf6c084e97c97e7cbc9540a5fe2b5c Mon Sep 17 00:00:00 2001
From: Ivan Pizhenko <IvanPizhenko@users.noreply.github.com>
Date: Thu, 14 Apr 2022 00:15:48 +0300
Subject: [PATCH 3/3] Rename keyType into keyFamilies

---
 extension/js/common/core/crypto/pgp/msg-util.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/extension/js/common/core/crypto/pgp/msg-util.ts b/extension/js/common/core/crypto/pgp/msg-util.ts
index ab175685812..ba51745cdf6 100644
--- a/extension/js/common/core/crypto/pgp/msg-util.ts
+++ b/extension/js/common/core/crypto/pgp/msg-util.ts
@@ -210,12 +210,12 @@ export class MsgUtil {
   };
 
   public static encryptMessage: PgpMsgMethod.Encrypt = async ({ pubkeys, signingPrv, pwd, data, filename, armor, date }) => {
-    const keyTypes = new Set(pubkeys.map(k => k.family));
-    if (keyTypes.has('openpgp') && keyTypes.has('x509')) {
-      throw new Error('Mixed key families are not allowed: ' + [...keyTypes]);
+    const keyFamilies = new Set(pubkeys.map(k => k.family));
+    if (keyFamilies.has('openpgp') && keyFamilies.has('x509')) {
+      throw new Error('Mixed key families are not allowed: ' + [...keyFamilies]);
     }
     const input = { pubkeys, signingPrv, pwd, data, filename, armor, date };
-    if (keyTypes.has('x509')) {
+    if (keyFamilies.has('x509')) {
       return await SmimeKey.encryptMessage(input);
     }
     return await OpenPGPKey.encryptMessage(input);