@protontech/openpgp 6.1.1-patch.3 → 6.1.1-patch.4

package/dist/node/openpgp.mjs

@@ -1,4 +1,4 @@
-/*! OpenPGP.js v6.1.1-patch.3 - 2025-06-18 - this is LGPL licensed code, see LICENSE/our website https://openpgpjs.org/ for more information. */
+/*! OpenPGP.js v6.1.1-patch.4 - 2025-07-14 - 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 : {};
 
 import { createRequire } from 'module';
@@ -1720,7 +1720,7 @@ var config = {
    * @memberof module:config
    * @property {String} versionString A version string to be included in armored messages
    */
-  versionString: 'OpenPGP.js 6.1.1-patch.3',
+  versionString: 'OpenPGP.js 6.1.1-patch.4',
   /**
    * @memberof module:config
    * @property {String} commentString A comment string to be included in armored messages
@@ -6923,7 +6923,15 @@ async function generate$a(algo) {
     case enums.publicKey.ed25519:
       try {
         const webCrypto = util.getWebCrypto();
-        const webCryptoKey = await webCrypto.generateKey('Ed25519', true, ['sign', 'verify']);
+        const webCryptoKey = await webCrypto.generateKey('Ed25519', true, ['sign', 'verify'])
+          .catch(err => {
+            if (err.name === 'OperationError') { // Temporary (hopefully) fix for WebKit on Linux
+              const newErr = new Error('Unexpected key generation issue');
+              newErr.name = 'NotSupportedError';
+              throw newErr;
+            }
+            throw err;
+          });
 
         const privateKey = await webCrypto.exportKey('jwk', webCryptoKey.privateKey);
         const publicKey = await webCrypto.exportKey('jwk', webCryptoKey.publicKey);
@@ -6933,7 +6941,7 @@ async function generate$a(algo) {
           seed: b64ToUint8Array(privateKey.d, true)
         };
       } catch (err) {
-        if (err.name !== 'NotSupportedError' && err.name !== 'OperationError') { // Temporary (hopefully) fix for WebKit on Linux
+        if (err.name !== 'NotSupportedError') {
           throw err;
         }
         const seed = getRandomBytes(getPayloadSize$1(algo));
@@ -8351,11 +8359,25 @@ async function generate$9(algo) {
     case enums.publicKey.x25519:
       try {
         const webCrypto = util.getWebCrypto();
-        const webCryptoKey = await webCrypto.generateKey('X25519', true, ['deriveKey', 'deriveBits']);
+        const webCryptoKey = await webCrypto.generateKey('X25519', true, ['deriveKey', 'deriveBits'])
+          .catch(err => {
+            if (err.name === 'OperationError') { // Temporary (hopefully) fix for WebKit on Linux
+              const newErr = new Error('Unexpected key generation issue');
+              newErr.name = 'NotSupportedError';
+              throw newErr;
+            }
+            throw err;
+          });
 
         const privateKey = await webCrypto.exportKey('jwk', webCryptoKey.privateKey);
         const publicKey = await webCrypto.exportKey('jwk', webCryptoKey.publicKey);
 
+        if (privateKey.x !== publicKey.x) { // Weird issue with Webkit on Linux: https://bugs.webkit.org/show_bug.cgi?id=289693
+          const err = new Error('Unexpected mismatching public point');
+          err.name = 'NotSupportedError';
+          throw err;
+        }
+
         return {
           A: new Uint8Array(b64ToUint8Array(publicKey.x)),
           k: b64ToUint8Array(privateKey.d)
@@ -8513,15 +8535,29 @@ async function generateEphemeralEncryptionMaterial(algo, recipientA) {
     case enums.publicKey.x25519:
       try {
         const webCrypto = util.getWebCrypto();
+        const ephemeralKeyPair = await webCrypto.generateKey('X25519', true, ['deriveKey', 'deriveBits'])
+          .catch(err => {
+            if (err.name === 'OperationError') { // Temporary (hopefully) fix for WebKit on Linux
+              const newErr = new Error('Unexpected key generation issue');
+              newErr.name = 'NotSupportedError';
+              throw newErr;
+            }
+            throw err;
+          });
+        const ephemeralPublicKeyJwt = await webCrypto.exportKey('jwk', ephemeralKeyPair.publicKey);
+        const ephemeralPrivateKeyJwt = await webCrypto.exportKey('jwk', ephemeralKeyPair.privateKey);
+        if (ephemeralPrivateKeyJwt.x !== ephemeralPublicKeyJwt.x) { // Weird issue with Webkit on Linux: https://bugs.webkit.org/show_bug.cgi?id=289693
+          const err = new Error('Unexpected mismatching public point');
+          err.name = 'NotSupportedError';
+          throw err;
+        }
         const jwk = publicKeyToJWK(algo, recipientA);
-        const ephemeralKeyPair = await webCrypto.generateKey('X25519', true, ['deriveKey', 'deriveBits']);
         const recipientPublicKey = await webCrypto.importKey('jwk', jwk, 'X25519', false, []);
         const sharedSecretBuffer = await webCrypto.deriveBits(
           { name: 'X25519', public: recipientPublicKey },
           ephemeralKeyPair.privateKey,
           getPayloadSize(algo) * 8 // in bits
         );
-        const ephemeralPublicKeyJwt = await webCrypto.exportKey('jwk', ephemeralKeyPair.publicKey);
         return {
           sharedSecret: new Uint8Array(sharedSecretBuffer),
           ephemeralPublicKey: new Uint8Array(b64ToUint8Array(ephemeralPublicKeyJwt.x))

package/dist/openpgp.js

@@ -1,4 +1,4 @@
-/*! OpenPGP.js v6.1.1-patch.3 - 2025-06-18 - this is LGPL licensed code, see LICENSE/our website https://openpgpjs.org/ for more information. */
+/*! OpenPGP.js v6.1.1-patch.4 - 2025-07-14 - this is LGPL licensed code, see LICENSE/our website https://openpgpjs.org/ for more information. */
 var openpgp = (function (exports) {
   'use strict';
 
@@ -1719,7 +1719,7 @@ var openpgp = (function (exports) {
      * @memberof module:config
      * @property {String} versionString A version string to be included in armored messages
      */
-    versionString: 'OpenPGP.js 6.1.1-patch.3',
+    versionString: 'OpenPGP.js 6.1.1-patch.4',
     /**
      * @memberof module:config
      * @property {String} commentString A comment string to be included in armored messages
@@ -6916,7 +6916,15 @@ var openpgp = (function (exports) {
       case enums.publicKey.ed25519:
         try {
           const webCrypto = util.getWebCrypto();
-          const webCryptoKey = await webCrypto.generateKey('Ed25519', true, ['sign', 'verify']);
+          const webCryptoKey = await webCrypto.generateKey('Ed25519', true, ['sign', 'verify'])
+            .catch(err => {
+              if (err.name === 'OperationError') { // Temporary (hopefully) fix for WebKit on Linux
+                const newErr = new Error('Unexpected key generation issue');
+                newErr.name = 'NotSupportedError';
+                throw newErr;
+              }
+              throw err;
+            });
 
           const privateKey = await webCrypto.exportKey('jwk', webCryptoKey.privateKey);
           const publicKey = await webCrypto.exportKey('jwk', webCryptoKey.publicKey);
@@ -6926,7 +6934,7 @@ var openpgp = (function (exports) {
             seed: b64ToUint8Array(privateKey.d, true)
           };
         } catch (err) {
-          if (err.name !== 'NotSupportedError' && err.name !== 'OperationError') { // Temporary (hopefully) fix for WebKit on Linux
+          if (err.name !== 'NotSupportedError') {
             throw err;
           }
           const seed = getRandomBytes(getPayloadSize$1(algo));
@@ -8344,11 +8352,25 @@ var openpgp = (function (exports) {
       case enums.publicKey.x25519:
         try {
           const webCrypto = util.getWebCrypto();
-          const webCryptoKey = await webCrypto.generateKey('X25519', true, ['deriveKey', 'deriveBits']);
+          const webCryptoKey = await webCrypto.generateKey('X25519', true, ['deriveKey', 'deriveBits'])
+            .catch(err => {
+              if (err.name === 'OperationError') { // Temporary (hopefully) fix for WebKit on Linux
+                const newErr = new Error('Unexpected key generation issue');
+                newErr.name = 'NotSupportedError';
+                throw newErr;
+              }
+              throw err;
+            });
 
           const privateKey = await webCrypto.exportKey('jwk', webCryptoKey.privateKey);
           const publicKey = await webCrypto.exportKey('jwk', webCryptoKey.publicKey);
 
+          if (privateKey.x !== publicKey.x) { // Weird issue with Webkit on Linux: https://bugs.webkit.org/show_bug.cgi?id=289693
+            const err = new Error('Unexpected mismatching public point');
+            err.name = 'NotSupportedError';
+            throw err;
+          }
+
           return {
             A: new Uint8Array(b64ToUint8Array(publicKey.x)),
             k: b64ToUint8Array(privateKey.d)
@@ -8506,15 +8528,29 @@ var openpgp = (function (exports) {
       case enums.publicKey.x25519:
         try {
           const webCrypto = util.getWebCrypto();
+          const ephemeralKeyPair = await webCrypto.generateKey('X25519', true, ['deriveKey', 'deriveBits'])
+            .catch(err => {
+              if (err.name === 'OperationError') { // Temporary (hopefully) fix for WebKit on Linux
+                const newErr = new Error('Unexpected key generation issue');
+                newErr.name = 'NotSupportedError';
+                throw newErr;
+              }
+              throw err;
+            });
+          const ephemeralPublicKeyJwt = await webCrypto.exportKey('jwk', ephemeralKeyPair.publicKey);
+          const ephemeralPrivateKeyJwt = await webCrypto.exportKey('jwk', ephemeralKeyPair.privateKey);
+          if (ephemeralPrivateKeyJwt.x !== ephemeralPublicKeyJwt.x) { // Weird issue with Webkit on Linux: https://bugs.webkit.org/show_bug.cgi?id=289693
+            const err = new Error('Unexpected mismatching public point');
+            err.name = 'NotSupportedError';
+            throw err;
+          }
           const jwk = publicKeyToJWK(algo, recipientA);
-          const ephemeralKeyPair = await webCrypto.generateKey('X25519', true, ['deriveKey', 'deriveBits']);
           const recipientPublicKey = await webCrypto.importKey('jwk', jwk, 'X25519', false, []);
           const sharedSecretBuffer = await webCrypto.deriveBits(
             { name: 'X25519', public: recipientPublicKey },
             ephemeralKeyPair.privateKey,
             getPayloadSize(algo) * 8 // in bits
           );
-          const ephemeralPublicKeyJwt = await webCrypto.exportKey('jwk', ephemeralKeyPair.publicKey);
           return {
             sharedSecret: new Uint8Array(sharedSecretBuffer),
             ephemeralPublicKey: new Uint8Array(b64ToUint8Array(ephemeralPublicKeyJwt.x))