@protontech/openpgp 5.11.1-0 → 5.11.2-0

package/dist/openpgp.mjs

@@ -1,4 +1,4 @@
-/*! OpenPGP.js v5.11.1-0 - 2024-02-14 - this is LGPL licensed code, see LICENSE/our website https://openpgpjs.org/ for more information. */
+/*! OpenPGP.js v5.11.2-0 - 2024-04-12 - this is LGPL licensed code, see LICENSE/our website https://openpgpjs.org/ for more information. */
 const globalThis = typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 
 const doneWritingPromise = Symbol('doneWritingPromise');
@@ -2950,7 +2950,7 @@ var config = {
    * @memberof module:config
    * @property {String} versionString A version string to be included in armored messages
    */
-  versionString: 'OpenPGP.js 5.11.1-0',
+  versionString: 'OpenPGP.js 5.11.2-0',
   /**
    * @memberof module:config
    * @property {String} commentString A comment string to be included in armored messages
@@ -12570,8 +12570,15 @@ async function encrypt$1(data, n, e) {
  * @async
  */
 async function decrypt$1(data, n, e, d, p, q, u, randomPayload) {
-  if (util.getNodeCrypto()) {
-    return nodeDecrypt$1(data, n, e, d, p, q, u, randomPayload);
+  // Node v18.19.1, 20.11.1 and 21.6.2 have disabled support for PKCS#1 decryption,
+  // and we want to avoid checking the error type to decide if the random payload
+  // should indeed be returned.
+  if (util.getNodeCrypto() && !randomPayload) {
+    try {
+      return await nodeDecrypt$1(data, n, e, d, p, q, u);
+    } catch (err) {
+      util.printDebugError(err);
+    }
   }
   return bnDecrypt(data, n, e, d, p, q, u, randomPayload);
 }
@@ -12873,7 +12880,7 @@ async function bnEncrypt(data, n, e) {
   return data.modExp(e, n).toUint8Array('be', n.byteLength());
 }
 
-async function nodeDecrypt$1(data, n, e, d, p, q, u, randomPayload) {
+async function nodeDecrypt$1(data, n, e, d, p, q, u) {
   const { default: BN } = await Promise.resolve().then(function () { return bn$1; });
 
   const pBNum = new BN(p);
@@ -12907,9 +12914,6 @@ async function nodeDecrypt$1(data, n, e, d, p, q, u, randomPayload) {
   try {
     return new Uint8Array(nodeCrypto$6.privateDecrypt(key, data));
   } catch (err) {
-    if (randomPayload) {
-      return randomPayload;
-    }
     throw new Error('Decryption error');
   }
 }
@@ -16425,9 +16429,26 @@ class Argon2OutOfMemoryError extends Error {
 let loadArgonWasmModule;
 let argon2Promise;
 // reload wasm module above this treshold, to deallocated used memory
-const ARGON2_WASM_MEMORY_THRESHOLD_RELOAD = 2 << 19;
+// (cannot be declared as a simple `static` field as its not supported by Safari 14)
+let ARGON2_WASM_MEMORY_THRESHOLD_RELOAD = 2 << 19;
 
 class Argon2S2K {
+  static get ARGON2_WASM_MEMORY_THRESHOLD_RELOAD() {
+    return ARGON2_WASM_MEMORY_THRESHOLD_RELOAD;
+  }
+
+  static set ARGON2_WASM_MEMORY_THRESHOLD_RELOAD(memoryThreshold) {
+    ARGON2_WASM_MEMORY_THRESHOLD_RELOAD = memoryThreshold;
+  }
+
+  static reloadWasmModule() {
+    if (!loadArgonWasmModule) return;
+
+    // it will be awaited if needed at the next `produceKey` invocation
+    argon2Promise = loadArgonWasmModule();
+    argon2Promise.catch(() => {});
+  }
+
   /**
   * @param {Object} [config] - Full configuration, defaults to openpgp.config
   */
@@ -16515,10 +16536,8 @@ class Argon2S2K {
       });
 
       // a lot of memory was used, reload to deallocate
-      if (decodedM > ARGON2_WASM_MEMORY_THRESHOLD_RELOAD) {
-        // it will be awaited if needed at the next `produceKey` invocation
-        argon2Promise = loadArgonWasmModule();
-        argon2Promise.catch(() => {});
+      if (decodedM > Argon2S2K.ARGON2_WASM_MEMORY_THRESHOLD_RELOAD) {
+        Argon2S2K.reloadWasmModule();
       }
       return hash;
     } catch (e) {

package/openpgp.d.ts

@@ -925,6 +925,8 @@ export namespace enums {
 }
 
 export declare class Argon2S2K {
+  static reloadWasmModule(): void;
+  static ARGON2_WASM_MEMORY_THRESHOLD_RELOAD: number;
   constructor(config: Config);
   salt: Uint8Array;
   /** @throws Argon2OutOfMemoryError */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@protontech/openpgp",
   "description": "OpenPGP.js is a Javascript implementation of the OpenPGP protocol. This is defined in RFC 4880.",
-  "version": "5.11.1-0",
+  "version": "5.11.2-0",
   "license": "LGPL-3.0+",
   "homepage": "https://openpgpjs.org/",
   "engines": {