@protontech/openpgp 5.3.1 → 5.4.0

package/dist/node/openpgp.mjs

@@ -1,4 +1,4 @@
-/*! OpenPGP.js v5.3.1 - 2022-07-12 - this is LGPL licensed code, see LICENSE/our website https://openpgpjs.org/ for more information. */
+/*! OpenPGP.js v5.4.0 - 2022-08-08 - 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 buffer from 'buffer';
@@ -2007,12 +2007,12 @@ const util = {
   },
 
   /**
-   * Remove trailing spaces and tabs from each line
+   * Remove trailing spaces, carriage returns and tabs from each line
    */
   removeTrailingSpaces: function(text) {
     return text.split('\n').map(line => {
       let i = line.length - 1;
-      for (; i >= 0 && (line[i] === ' ' || line[i] === '\t'); i--);
+      for (; i >= 0 && (line[i] === ' ' || line[i] === '\t' || line[i] === '\r'); i--);
       return line.substr(0, i + 1);
     }).join('\n');
   },
@@ -2890,7 +2890,7 @@ var defaultConfig = {
    * @memberof module:config
    * @property {String} versionString A version string to be included in armored messages
    */
-  versionString: 'OpenPGP.js 5.3.1',
+  versionString: 'OpenPGP.js 5.4.0',
   /**
    * @memberof module:config
    * @property {String} commentString A comment string to be included in armored messages
@@ -14300,16 +14300,17 @@ function parsePrivateKeyParams(algo, bytes, publicParams) {
     }
     case enums.publicKey.hmac: {
       const { cipher: algo } = publicParams;
-      const keySize = hash.getHashByteLength(algo);
+      const keySize = hash.getHashByteLength(algo.getValue());
       const hashSeed = bytes.subarray(read, read + 32); read += 32;
-      const key = bytes.subarray(read, read + keySize); read += keySize;
-      return { read, privateParams: { key, hashSeed } };
+      const keyMaterial = bytes.subarray(read, read + keySize); read += keySize;
+      return { read, privateParams: { hashSeed, keyMaterial } };
     }
     case enums.publicKey.aead: {
       const { cipher: algo } = publicParams;
+      const hashSeed = bytes.subarray(read, read + 32); read += 32;
       const { keySize } = getCipher(algo.getValue());
       const keyMaterial = bytes.subarray(read, read + keySize); read += keySize;
-      return { read, privateParams: { keyMaterial } };
+      return { read, privateParams: { hashSeed, keyMaterial } };
     }
     default:
       throw new UnsupportedError('Unknown public key encryption algorithm.');
@@ -14355,13 +14356,12 @@ function parseEncSessionKeyParams(algo, bytes) {
     //       - An authentication tag generated by the AEAD mode.
     case enums.publicKey.aead: {
       const aeadMode = new AEADEnum(); read += aeadMode.read(bytes.subarray(read));
-      const { tagLength, ivLength } = getAEADMode(aeadMode.getValue());
+      const { ivLength } = getAEADMode(aeadMode.getValue());
 
       const iv = bytes.subarray(read, read + ivLength); read += ivLength;
       const c = new ShortByteString(); read += c.read(bytes.subarray(read));
-      const t = bytes.subarray(read, read + tagLength);
 
-      return { aeadMode, iv, c, t };
+      return { aeadMode, iv, c };
     }
     default:
       throw new UnsupportedError('Unknown public key encryption algorithm.');
@@ -14455,8 +14455,8 @@ async function createSymmetricParams(key, algo) {
   const bindingHash = await hash.sha256(seed);
   return {
     privateParams: {
-      keyMaterial: key,
-      hashSeed: seed
+      hashSeed: seed,
+      keyMaterial: key
     },
     publicParams: {
       cipher: algo,
@@ -14509,14 +14509,14 @@ async function validateParams$6(algo, publicParams, privateParams) {
     }
     case enums.publicKey.hmac: {
       const { cipher: algo, digest } = publicParams;
-      const { keyMaterial, hashSeed } = privateParams;
-      const keySize = hash.getHashByteLength(algo);
+      const { hashSeed, keyMaterial } = privateParams;
+      const keySize = hash.getHashByteLength(algo.getValue());
       return keySize === keyMaterial.length &&
         util.equalsUint8Array(digest, await hash.sha256(hashSeed));
     }
     case enums.publicKey.aead: {
       const { cipher: algo, digest } = publicParams;
-      const { keyMaterial, hashSeed } = privateParams;
+      const { hashSeed, keyMaterial } = privateParams;
       const { keySize } = getCipher(algo.getValue());
       return keySize === keyMaterial.length &&
         util.equalsUint8Array(digest, await hash.sha256(hashSeed));
@@ -30500,7 +30500,7 @@ class CleartextMessage {
    * @param {Signature} signature - The detached signature or an empty signature for unsigned messages
    */
   constructor(text, signature) {
-    // normalize EOL to canonical form <CR><LF>
+    // remove trailing whitespace and normalize EOL to canonical form <CR><LF>
     this.text = util.removeTrailingSpaces(text).replace(/\r?\n/g, '\r\n');
     if (signature && !(signature instanceof Signature)) {
       throw new Error('Invalid signature input');
@@ -30901,7 +30901,7 @@ async function encryptKey({ privateKey, passphrase, config, ...rest }) {
 
 
 /**
- * Encrypts a message using public keys, passwords or both at once. At least one of `encryptionKeys` or `passwords`
+ * Encrypts a message using public keys, passwords or both at once. At least one of `encryptionKeys`, `passwords` or `sessionKeys`
  *   must be specified. If signing keys are specified, those will be used to sign the message.
  * @param {Object} options
  * @param {Message} options.message - Message to be encrypted as created by {@link createMessage}
@@ -31216,6 +31216,10 @@ async function encryptSessionKey({ data, algorithm, aeadAlgorithm, encryptionKey
   if (rest.publicKeys) throw new Error('The `publicKeys` option has been removed from openpgp.encryptSessionKey, pass `encryptionKeys` instead');
   const unknownOptions = Object.keys(rest); if (unknownOptions.length > 0) throw new Error(`Unknown option: ${unknownOptions.join(', ')}`);
 
+  if ((!encryptionKeys || encryptionKeys.length === 0) && (!passwords || passwords.length === 0)) {
+    throw new Error('No encryption keys or passwords provided.');
+  }
+
   try {
     const message = await Message.encryptSessionKey(data, algorithm, aeadAlgorithm, encryptionKeys, passwords, wildcard, encryptionKeyIDs, date, encryptionUserIDs, config);
     return formatObject(message, format, config);

package/dist/openpgp.js

@@ -1,4 +1,4 @@
-/*! OpenPGP.js v5.3.1 - 2022-07-12 - this is LGPL licensed code, see LICENSE/our website https://openpgpjs.org/ for more information. */
+/*! OpenPGP.js v5.4.0 - 2022-08-08 - this is LGPL licensed code, see LICENSE/our website https://openpgpjs.org/ for more information. */
 var openpgp = (function (exports) {
   'use strict';
 
@@ -2004,12 +2004,12 @@ var openpgp = (function (exports) {
     },
 
     /**
-     * Remove trailing spaces and tabs from each line
+     * Remove trailing spaces, carriage returns and tabs from each line
      */
     removeTrailingSpaces: function(text) {
       return text.split('\n').map(line => {
         let i = line.length - 1;
-        for (; i >= 0 && (line[i] === ' ' || line[i] === '\t'); i--);
+        for (; i >= 0 && (line[i] === ' ' || line[i] === '\t' || line[i] === '\r'); i--);
         return line.substr(0, i + 1);
       }).join('\n');
     },
@@ -2887,7 +2887,7 @@ var openpgp = (function (exports) {
      * @memberof module:config
      * @property {String} versionString A version string to be included in armored messages
      */
-    versionString: 'OpenPGP.js 5.3.1',
+    versionString: 'OpenPGP.js 5.4.0',
     /**
      * @memberof module:config
      * @property {String} commentString A comment string to be included in armored messages
@@ -14291,16 +14291,17 @@ var openpgp = (function (exports) {
       }
       case enums.publicKey.hmac: {
         const { cipher: algo } = publicParams;
-        const keySize = hash.getHashByteLength(algo);
+        const keySize = hash.getHashByteLength(algo.getValue());
         const hashSeed = bytes.subarray(read, read + 32); read += 32;
-        const key = bytes.subarray(read, read + keySize); read += keySize;
-        return { read, privateParams: { key, hashSeed } };
+        const keyMaterial = bytes.subarray(read, read + keySize); read += keySize;
+        return { read, privateParams: { hashSeed, keyMaterial } };
       }
       case enums.publicKey.aead: {
         const { cipher: algo } = publicParams;
+        const hashSeed = bytes.subarray(read, read + 32); read += 32;
         const { keySize } = getCipher(algo.getValue());
         const keyMaterial = bytes.subarray(read, read + keySize); read += keySize;
-        return { read, privateParams: { keyMaterial } };
+        return { read, privateParams: { hashSeed, keyMaterial } };
       }
       default:
         throw new UnsupportedError('Unknown public key encryption algorithm.');
@@ -14346,13 +14347,12 @@ var openpgp = (function (exports) {
       //       - An authentication tag generated by the AEAD mode.
       case enums.publicKey.aead: {
         const aeadMode = new AEADEnum(); read += aeadMode.read(bytes.subarray(read));
-        const { tagLength, ivLength } = getAEADMode(aeadMode.getValue());
+        const { ivLength } = getAEADMode(aeadMode.getValue());
 
         const iv = bytes.subarray(read, read + ivLength); read += ivLength;
         const c = new ShortByteString(); read += c.read(bytes.subarray(read));
-        const t = bytes.subarray(read, read + tagLength);
 
-        return { aeadMode, iv, c, t };
+        return { aeadMode, iv, c };
       }
       default:
         throw new UnsupportedError('Unknown public key encryption algorithm.');
@@ -14446,8 +14446,8 @@ var openpgp = (function (exports) {
     const bindingHash = await hash.sha256(seed);
     return {
       privateParams: {
-        keyMaterial: key,
-        hashSeed: seed
+        hashSeed: seed,
+        keyMaterial: key
       },
       publicParams: {
         cipher: algo,
@@ -14500,14 +14500,14 @@ var openpgp = (function (exports) {
       }
       case enums.publicKey.hmac: {
         const { cipher: algo, digest } = publicParams;
-        const { keyMaterial, hashSeed } = privateParams;
-        const keySize = hash.getHashByteLength(algo);
+        const { hashSeed, keyMaterial } = privateParams;
+        const keySize = hash.getHashByteLength(algo.getValue());
         return keySize === keyMaterial.length &&
           util.equalsUint8Array(digest, await hash.sha256(hashSeed));
       }
       case enums.publicKey.aead: {
         const { cipher: algo, digest } = publicParams;
-        const { keyMaterial, hashSeed } = privateParams;
+        const { hashSeed, keyMaterial } = privateParams;
         const { keySize } = getCipher(algo.getValue());
         return keySize === keyMaterial.length &&
           util.equalsUint8Array(digest, await hash.sha256(hashSeed));
@@ -30491,7 +30491,7 @@ var openpgp = (function (exports) {
      * @param {Signature} signature - The detached signature or an empty signature for unsigned messages
      */
     constructor(text, signature) {
-      // normalize EOL to canonical form <CR><LF>
+      // remove trailing whitespace and normalize EOL to canonical form <CR><LF>
       this.text = util.removeTrailingSpaces(text).replace(/\r?\n/g, '\r\n');
       if (signature && !(signature instanceof Signature)) {
         throw new Error('Invalid signature input');
@@ -30892,7 +30892,7 @@ var openpgp = (function (exports) {
 
 
   /**
-   * Encrypts a message using public keys, passwords or both at once. At least one of `encryptionKeys` or `passwords`
+   * Encrypts a message using public keys, passwords or both at once. At least one of `encryptionKeys`, `passwords` or `sessionKeys`
    *   must be specified. If signing keys are specified, those will be used to sign the message.
    * @param {Object} options
    * @param {Message} options.message - Message to be encrypted as created by {@link createMessage}
@@ -31207,6 +31207,10 @@ var openpgp = (function (exports) {
     if (rest.publicKeys) throw new Error('The `publicKeys` option has been removed from openpgp.encryptSessionKey, pass `encryptionKeys` instead');
     const unknownOptions = Object.keys(rest); if (unknownOptions.length > 0) throw new Error(`Unknown option: ${unknownOptions.join(', ')}`);
 
+    if ((!encryptionKeys || encryptionKeys.length === 0) && (!passwords || passwords.length === 0)) {
+      throw new Error('No encryption keys or passwords provided.');
+    }
+
     try {
       const message = await Message.encryptSessionKey(data, algorithm, aeadAlgorithm, encryptionKeys, passwords, wildcard, encryptionKeyIDs, date, encryptionUserIDs, config);
       return formatObject(message, format, config);