add private key validation test

.semaphore/semaphore.yml

@@ -30,6 +30,10 @@ blocks:
           - cache restore && make dependencies && cache store
           - mv ~/appium-env ~/git/flowcrypt-ios/appium/.env
           - sem-version node 16 && cache restore appium-npm && cd ./appium && npm i && cd .. && cache store appium-npm appium/node_modules
+          # temporary disabled because of https://github.com/ios-control/simctl/issues/30
+          # - brew install ideviceinstaller
+          # - npm install ios-deploy -g --unsafe-perm=true --allow-root
+          # - npm install ios-sim -g --unsafe-perm=true --allow-root
       jobs:
         - name: Appium UI tests
           commands:

Core/.gitignore

@@ -2,3 +2,4 @@
 build/*
 tmp/*
 node_modules
+/test.sh

Core/package.json

@@ -4,13 +4,15 @@
   "description": "TypeScript core for FlowCrypt iOS internal use",
   "dependencies": {
     "encoding-japanese": "^1.0.30",
+    "openpgp": "^5.1.0",
     "sanitize-html": "2.6.1",
+    "@openpgp/web-stream-tools": "^0.0.9",
     "zxcvbn": "4.4.2"
   },
   "devDependencies": {
     "@types/chai": "4.3.0",
     "@types/encoding-japanese": "^1.0.18",
-    "@types/node": "^17.0.14",
+    "@types/node": "^17.0.18",
     "@types/node-cleanup": "2.1.2",
     "ava": "4.0.1",
     "babel-loader": "8.2.3",
@@ -41,4 +43,4 @@
   "license": "SEE LICENSE IN <LICENSE>",
   "private": true,
   "homepage": "https://flowcrypt.com"
-}
+}

Core/source/core/pgp-armor.ts

@@ -5,10 +5,10 @@
 import { Buf } from './buf';
 import { ReplaceableMsgBlockType } from './msg-block';
 import { Str } from './common';
-import { openpgp } from './pgp';
+import { CleartextMessage, Data, Message, readCleartextMessage, readMessage } from 'openpgp';
 
-export type PreparedForDecrypt = { isArmored: boolean, isCleartext: true, message: OpenPGP.cleartext.CleartextMessage }
-  | { isArmored: boolean, isCleartext: false, message: OpenPGP.message.Message };
+export type PreparedForDecrypt = { isArmored: boolean, isCleartext: true, message: CleartextMessage }
+  | { isArmored: boolean, isCleartext: false, message: Message<Data> };
 
 type CryptoArmorHeaderDefinitions = { readonly [type in ReplaceableMsgBlockType | 'null' | 'signature']: CryptoArmorHeaderDefinition; };
 type CryptoArmorHeaderDefinition = { begin: string, middle?: string, end: string | RegExp, replace: boolean };
@@ -83,11 +83,23 @@ export class PgpArmor {
     const isArmoredSignedOnly = utfChunk.includes(PgpArmor.headers('signedMsg').begin);
     const isArmored = isArmoredEncrypted || isArmoredSignedOnly;
     if (isArmoredSignedOnly) {
-      return { isArmored, isCleartext: true, message: await openpgp.cleartext.readArmored(new Buf(encrypted).toUtfStr()) };
+      return {
+        isArmored,
+        isCleartext: true,
+        message: await readCleartextMessage({cleartextMessage: (new Buf(encrypted)).toUtfStr()})
+      };
     } else if (isArmoredEncrypted) {
-      return { isArmored, isCleartext: false, message: await openpgp.message.readArmored(new Buf(encrypted).toUtfStr()) };
+      return {
+        isArmored,
+        isCleartext: false,
+        message: await readMessage({armoredMessage: (new Buf(encrypted)).toUtfStr()})
+      };
     } else if (encrypted instanceof Uint8Array) {
-      return { isArmored, isCleartext: false, message: await openpgp.message.read(encrypted) };
+      return {
+        isArmored,
+        isCleartext: false,
+        message: await readMessage({binaryMessage: encrypted})
+      };
     }
     throw new Error('Message does not have armor headers');
   }