Merge branch 'master' into issue-5668-add-thunderbird-attachments-support

Author: martgil

conf/tsconfig.content_scripts.json

@@ -18,7 +18,7 @@
     "paths": {
       "dompurify": ["types/purify.d.ts"],
       "openpgp": ["../node_modules/openpgp/openpgp.d.ts"],
-      "@openpgp/web-stream-tools": ["../node_modules/@openpgp/web-stream-tools/types/index.v4.9.d.ts"],
+      "@openpgp/web-stream-tools": ["../node_modules/@openpgp/web-stream-tools/lib/index.d.ts"],
       "squire-rte": ["../node_modules/squire-rte/dist/types/Squire.d.ts"],
       "undici-types": ["../node_modules/undici-types/index.d.ts", "COMMENT"]
     },

conf/tsconfig.test.json

@@ -12,7 +12,7 @@
     "outDir": "../build/test",
     "skipLibCheck": true,
     "paths": {
-      "@openpgp/web-stream-tools": ["../node_modules/@openpgp/web-stream-tools/types/index.v4.9.d.ts", "../build/streams/streams.js"]
+      "@openpgp/web-stream-tools": ["../node_modules/@openpgp/web-stream-tools/lib/index.d.ts", "../build/generic-extension-wip/lib/streams_common.js"]
     }
   },
   "files": [

conf/webpack.config.js

@@ -2,23 +2,44 @@
 //bundle the web version of @openpgp/web-stream-tools for content script
 const path = require('path');
 
-module.exports = {
-  mode: 'production',
-  entry: {
-    main: '../build/generic-extension-wip/lib/streams/streams.js',
-  },
-  output: {
-    library: {
-      name: 'Stream',
-      type: 'var',
+module.exports = [
+  {
+    mode: 'production',
+    entry: {
+      main: '../build/generic-extension-wip/lib/streams/streams.js',
+    },
+    output: {
+      library: {
+        name: 'Stream',
+        type: 'var',
+      },
+      path: path.resolve('../build/generic-extension-wip/lib'),
+      filename: 'streams_web.js', // <--- Will be compiled to this single file
+    },
+    resolve: {
+      fallback: {
+        stream: false,
+      },
+      extensions: ['.js'],
     },
-    path: path.resolve('../build/generic-extension-wip/lib'),
-    filename: 'streams_web.js', // <--- Will be compiled to this single file
   },
-  resolve: {
-    fallback: {
-      stream: false,
+  {
+    mode: 'production',
+    entry: {
+      main: '../build/generic-extension-wip/lib/streams/streams.js',
+    },
+    output: {
+      library: {
+        type: 'commonjs',
+      },
+      path: path.resolve('../build/generic-extension-wip/lib'),
+      filename: 'streams_common.js', // <--- Will be compiled to this single file
+    },
+    resolve: {
+      fallback: {
+        stream: false,
+      },
+      extensions: ['.js'],
     },
-    extensions: ['.js'],
   },
-};
+];

extension/js/common/core/crypto/pgp/openpgp-key.ts

@@ -445,7 +445,7 @@ export class OpenPGPKey {
     const opt: OpenPGP.KeyOptions = { userIDs, passphrase };
     if (variant === 'curve25519') {
       opt.type = 'ecc';
-      opt.curve = 'curve25519';
+      opt.curve = 'curve25519Legacy';
     } else if (variant === 'rsa2048') {
       opt.type = 'rsa';
       opt.rsaBits = 2048;
@@ -744,6 +744,7 @@ export class OpenPGPKey {
         // todo: we can make it faster by manually collecting expirations from signatures?
         ...(await Promise.all(key.subkeys.map(async subkey => OpenPGPKey.getExpirationAsDateOrUndefined(await subkey.getExpirationTime()))))
           .filter(Boolean)
+
           // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
           .map(expirationTime => expirationTime!.getTime())
           .filter(expiration => !primaryKeyExpiration || expiration < primaryKeyExpiration)

extension/js/common/core/crypto/pgp/pgp-armor.ts

@@ -165,6 +165,6 @@ export class PgpArmor {
   }
 
   public static armor(messagetype: OpenPGP.enums.armor, body: object): string {
-    return opgp.armor(messagetype, body, undefined, undefined, undefined, opgp.config);
+    return opgp.armor(messagetype, body, undefined, undefined, undefined, false, opgp.config);
   }
 }