Release new version

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "openpgp",
-  "version": "4.4.9",
+  "version": "4.4.10",
   "license": "LGPL-3.0+",
   "homepage": "https://openpgpjs.org/",
   "authors": [

dist/compat/openpgp.js

@@ -31057,7 +31057,7 @@ exports.default = {
    * @memberof module:config
    * @property {String} versionstring A version string to be included in armored messages
    */
-  versionstring: "OpenPGP.js v4.4.9",
+  versionstring: "OpenPGP.js v4.4.10",
   /**
    * @memberof module:config
    * @property {String} commentstring A comment string to be included in armored messages
@@ -36588,25 +36588,39 @@ var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
 
 // Key Derivation Function (RFC 6637)
 var kdf = function () {
-  var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(hash_algo, S, length, param, curve, compat) {
-    var len, X, digest;
+  var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(hash_algo, S, length, param, curve) {
+    var stripLeading = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
+    var stripTrailing = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
+    var len, X, i, digest;
     return _regenerator2.default.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            len = compat ? S.byteLength() : curve.curve.curve.p.byteLength();
+            len = curve.curve.curve.p.byteLength();
             // Note: this is not ideal, but the RFC's are unclear
             // https://tools.ietf.org/html/draft-ietf-openpgp-rfc4880bis-02#appendix-B
 
             X = curve.curve.curve.type === 'mont' ? S.toArrayLike(Uint8Array, 'le', len) : S.toArrayLike(Uint8Array, 'be', len);
-            _context.next = 4;
+            i = void 0;
+
+            if (stripLeading) {
+              // Work around old go crypto bug
+              for (i = 0; i < X.length && X[i] === 0; i++) {}
+              X = X.subarray(i);
+            }
+            if (stripTrailing) {
+              // Work around old OpenPGP.js bug
+              for (i = X.length - 1; i >= 0 && X[i] === 0; i--) {}
+              X = X.subarray(0, i + 1);
+            }
+            _context.next = 7;
             return _hash2.default.digest(hash_algo, _util2.default.concatUint8Array([new Uint8Array([0, 0, 0, 1]), X, param]));
 
-          case 4:
+          case 7:
             digest = _context.sent;
             return _context.abrupt('return', digest.subarray(0, length));
 
-          case 6:
+          case 9:
           case 'end':
             return _context.stop();
         }
@@ -36614,7 +36628,7 @@ var kdf = function () {
     }, _callee, this);
   }));
 
-  return function kdf(_x, _x2, _x3, _x4, _x5, _x6) {
+  return function kdf(_x, _x2, _x3, _x4, _x5) {
     return _ref.apply(this, arguments);
   };
 }();
@@ -36655,7 +36669,7 @@ var genPublicEphemeralKey = function () {
     }, _callee2, this);
   }));
 
-  return function genPublicEphemeralKey(_x7, _x8) {
+  return function genPublicEphemeralKey(_x8, _x9) {
     return _ref2.apply(this, arguments);
   };
 }();
@@ -36694,7 +36708,7 @@ var encrypt = function () {
 
             cipher_algo = _enums2.default.read(_enums2.default.symmetric, cipher_algo);
             _context3.next = 10;
-            return kdf(hash_algo, S, _cipher2.default[cipher_algo].keySize, param, curve, false);
+            return kdf(hash_algo, S, _cipher2.default[cipher_algo].keySize, param, curve);
 
           case 10:
             Z = _context3.sent;
@@ -36709,7 +36723,7 @@ var encrypt = function () {
     }, _callee3, this);
   }));
 
-  return function encrypt(_x9, _x10, _x11, _x12, _x13, _x14) {
+  return function encrypt(_x10, _x11, _x12, _x13, _x14, _x15) {
     return _ref3.apply(this, arguments);
   };
 }();
@@ -36743,7 +36757,7 @@ var genPrivateEphemeralKey = function () {
     }, _callee4, this);
   }));
 
-  return function genPrivateEphemeralKey(_x15, _x16, _x17) {
+  return function genPrivateEphemeralKey(_x16, _x17, _x18) {
     return _ref5.apply(this, arguments);
   };
 }();
@@ -36765,8 +36779,7 @@ var genPrivateEphemeralKey = function () {
 
 var decrypt = function () {
   var _ref6 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(oid, cipher_algo, hash_algo, V, C, d, fingerprint) {
-    var curve, S, param, _Z, Z;
-
+    var curve, S, param, err, i, Z;
     return _regenerator2.default.wrap(function _callee5$(_context5) {
       while (1) {
         switch (_context5.prev = _context5.next) {
@@ -36780,35 +36793,46 @@ var decrypt = function () {
             param = buildEcdhParam(_enums2.default.publicKey.ecdh, oid, cipher_algo, hash_algo, fingerprint);
 
             cipher_algo = _enums2.default.read(_enums2.default.symmetric, cipher_algo);
-            _context5.prev = 6;
-            _context5.next = 9;
-            return kdf(hash_algo, S, _cipher2.default[cipher_algo].keySize, param, curve, false);
+            err = void 0;
+            i = 0;
 
-          case 9:
-            _Z = _context5.sent;
-            return _context5.abrupt('return', new _bn2.default(_aes_kw2.default.unwrap(_Z, C)));
+          case 8:
+            if (!(i < 3)) {
+              _context5.next = 22;
+              break;
+            }
 
-          case 13:
-            _context5.prev = 13;
-            _context5.t0 = _context5['catch'](6);
+            _context5.prev = 9;
+            _context5.next = 12;
+            return kdf(hash_algo, S, _cipher2.default[cipher_algo].keySize, param, curve, i === 1, i === 2);
 
-          case 15:
-            _context5.next = 17;
-            return kdf(hash_algo, S, _cipher2.default[cipher_algo].keySize, param, curve, true);
-
-          case 17:
+          case 12:
             Z = _context5.sent;
             return _context5.abrupt('return', new _bn2.default(_aes_kw2.default.unwrap(Z, C)));
 
+          case 16:
+            _context5.prev = 16;
+            _context5.t0 = _context5['catch'](9);
+
+            err = _context5.t0;
+
           case 19:
+            i++;
+            _context5.next = 8;
+            break;
+
+          case 22:
+            throw err;
+
+          case 23:
           case 'end':
             return _context5.stop();
         }
       }
-    }, _callee5, this, [[6, 13]]);
+    }, _callee5, this, [[9, 16]]);
   }));
 
-  return function decrypt(_x18, _x19, _x20, _x21, _x22, _x23, _x24) {
+  return function decrypt(_x19, _x20, _x21, _x22, _x23, _x24, _x25) {
     return _ref6.apply(this, arguments);
   };
 }();

dist/compat/openpgp.worker.min.js

@@ -1,2 +1,2 @@
-/*! OpenPGP.js v4.4.9 - 2019-02-28 - this is LGPL licensed code, see LICENSE/our website https://openpgpjs.org/ for more information. */
+/*! OpenPGP.js v4.4.10 - 2019-03-04 - this is LGPL licensed code, see LICENSE/our website https://openpgpjs.org/ for more information. */
 !function(){return function e(n,r,t){function o(a,f){if(!r[a]){if(!n[a]){var u="function"==typeof require&&require;if(!f&&u)return u(a,!0);if(i)return i(a,!0);var c=new Error("Cannot find module '"+a+"'");throw c.code="MODULE_NOT_FOUND",c}var s=r[a]={exports:{}};n[a][0].call(s.exports,function(e){return o(n[a][1][e]||e)},s,s.exports,e,n,r,t)}return r[a].exports}for(var i="function"==typeof require&&require,a=0;a<t.length;a++)o(t[a]);return o}}()({1:[function(e,n,r){self.window=self,importScripts("openpgp.min.js");var t=window.openpgp,o=[],i=6e4;function a(e){self.postMessage(e,t.util.getTransferables(e.data,!0))}t.crypto.random.randomBuffer.init(i,function(){return o.length||self.postMessage({event:"request-seed",amount:i}),new Promise(function(e){o.push(e)})}),self.onmessage=function(e){var n,r=e.data||{};switch(r.event){case"configure":n=r.config,Object.keys(n).forEach(function(e){t.config[e]=n[e]});break;case"seed-random":!function(e){e instanceof Uint8Array||(e=new Uint8Array(e));t.crypto.random.randomBuffer.set(e)}(r.buf);var i=o;o=[];for(var f=0;f<i.length;f++)i[f]();break;default:!function(e,n,r){if("function"!=typeof t[n])return void a({id:e,event:"method-return",err:"Unknown Worker Event"});r=t.packet.clone.parseClonedPackets(r,n),t.util.restoreStreams(r),t[n](r).then(function(n){a({id:e,event:"method-return",data:t.packet.clone.clonePackets(n)})}).catch(function(n){t.util.print_debug_error(n),a({id:e,event:"method-return",err:n.message,stack:n.stack})})}(r.id,r.event,r.options||{})}}},{}]},{},[1]);

dist/openpgp.js

@@ -24598,7 +24598,7 @@ exports.default = {
    * @memberof module:config
    * @property {String} versionstring A version string to be included in armored messages
    */
-  versionstring: "OpenPGP.js v4.4.9",
+  versionstring: "OpenPGP.js v4.4.10",
   /**
    * @memberof module:config
    * @property {String} commentstring A comment string to be included in armored messages
@@ -28868,11 +28868,22 @@ function buildEcdhParam(public_algo, oid, cipher_algo, hash_algo, fingerprint) {
 }
 
 // Key Derivation Function (RFC 6637)
-async function kdf(hash_algo, S, length, param, curve, compat) {
-  const len = compat ? S.byteLength() : curve.curve.curve.p.byteLength();
+async function kdf(hash_algo, S, length, param, curve, stripLeading = false, stripTrailing = false) {
+  const len = curve.curve.curve.p.byteLength();
   // Note: this is not ideal, but the RFC's are unclear
   // https://tools.ietf.org/html/draft-ietf-openpgp-rfc4880bis-02#appendix-B
-  const X = curve.curve.curve.type === 'mont' ? S.toArrayLike(Uint8Array, 'le', len) : S.toArrayLike(Uint8Array, 'be', len);
+  let X = curve.curve.curve.type === 'mont' ? S.toArrayLike(Uint8Array, 'le', len) : S.toArrayLike(Uint8Array, 'be', len);
+  let i;
+  if (stripLeading) {
+    // Work around old go crypto bug
+    for (i = 0; i < X.length && X[i] === 0; i++);
+    X = X.subarray(i);
+  }
+  if (stripTrailing) {
+    // Work around old OpenPGP.js bug
+    for (i = X.length - 1; i >= 0 && X[i] === 0; i--);
+    X = X.subarray(0, i + 1);
+  }
   const digest = await _hash2.default.digest(hash_algo, _util2.default.concatUint8Array([new Uint8Array([0, 0, 0, 1]), X, param]));
   return digest.subarray(0, length);
 }
@@ -28915,7 +28926,7 @@ async function encrypt(oid, cipher_algo, hash_algo, m, Q, fingerprint) {
 
   const param = buildEcdhParam(_enums2.default.publicKey.ecdh, oid, cipher_algo, hash_algo, fingerprint);
   cipher_algo = _enums2.default.read(_enums2.default.symmetric, cipher_algo);
-  const Z = await kdf(hash_algo, S, _cipher2.default[cipher_algo].keySize, param, curve, false);
+  const Z = await kdf(hash_algo, S, _cipher2.default[cipher_algo].keySize, param, curve);
   const C = _aes_kw2.default.wrap(Z, m.toString());
   return { V, C };
 }
@@ -28953,13 +28964,17 @@ async function decrypt(oid, cipher_algo, hash_algo, V, C, d, fingerprint) {
   const S = await genPrivateEphemeralKey(curve, V, d);
   const param = buildEcdhParam(_enums2.default.publicKey.ecdh, oid, cipher_algo, hash_algo, fingerprint);
   cipher_algo = _enums2.default.read(_enums2.default.symmetric, cipher_algo);
-  try {
-    const Z = await kdf(hash_algo, S, _cipher2.default[cipher_algo].keySize, param, curve, false);
-    return new _bn2.default(_aes_kw2.default.unwrap(Z, C));
-  } catch (e) {}
-  // Work around old OpenPGP.js bug.
-  const Z = await kdf(hash_algo, S, _cipher2.default[cipher_algo].keySize, param, curve, true);
-  return new _bn2.default(_aes_kw2.default.unwrap(Z, C));
+  let err;
+  for (let i = 0; i < 3; i++) {
+    try {
+      // Work around old go crypto bug and old OpenPGP.js bug, respectively.
+      const Z = await kdf(hash_algo, S, _cipher2.default[cipher_algo].keySize, param, curve, i === 1, i === 2);
+      return new _bn2.default(_aes_kw2.default.unwrap(Z, C));
+    } catch (e) {
+      err = e;
+    }
+  }
+  throw err;
 }
 
 exports.default = { encrypt, decrypt, genPublicEphemeralKey, genPrivateEphemeralKey, buildEcdhParam, kdf };

dist/openpgp.worker.min.js

@@ -1,2 +1,2 @@
-/*! OpenPGP.js v4.4.9 - 2019-02-28 - this is LGPL licensed code, see LICENSE/our website https://openpgpjs.org/ for more information. */
+/*! OpenPGP.js v4.4.10 - 2019-03-04 - this is LGPL licensed code, see LICENSE/our website https://openpgpjs.org/ for more information. */
 !function(){return function e(n,r,t){function o(a,f){if(!r[a]){if(!n[a]){var u="function"==typeof require&&require;if(!f&&u)return u(a,!0);if(i)return i(a,!0);var c=new Error("Cannot find module '"+a+"'");throw c.code="MODULE_NOT_FOUND",c}var s=r[a]={exports:{}};n[a][0].call(s.exports,function(e){return o(n[a][1][e]||e)},s,s.exports,e,n,r,t)}return r[a].exports}for(var i="function"==typeof require&&require,a=0;a<t.length;a++)o(t[a]);return o}}()({1:[function(e,n,r){self.window=self,importScripts("openpgp.min.js");var t=window.openpgp,o=[],i=6e4;function a(e){self.postMessage(e,t.util.getTransferables(e.data,!0))}t.crypto.random.randomBuffer.init(i,function(){return o.length||self.postMessage({event:"request-seed",amount:i}),new Promise(function(e){o.push(e)})}),self.onmessage=function(e){var n,r=e.data||{};switch(r.event){case"configure":n=r.config,Object.keys(n).forEach(function(e){t.config[e]=n[e]});break;case"seed-random":!function(e){e instanceof Uint8Array||(e=new Uint8Array(e));t.crypto.random.randomBuffer.set(e)}(r.buf);var i=o;o=[];for(var f=0;f<i.length;f++)i[f]();break;default:!function(e,n,r){if("function"!=typeof t[n])return void a({id:e,event:"method-return",err:"Unknown Worker Event"});r=t.packet.clone.parseClonedPackets(r,n),t.util.restoreStreams(r),t[n](r).then(function(n){a({id:e,event:"method-return",data:t.packet.clone.clonePackets(n)})}).catch(function(n){t.util.print_debug_error(n),a({id:e,event:"method-return",err:n.message,stack:n.stack})})}(r.id,r.event,r.options||{})}}},{}]},{},[1]);

npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "openpgp",
-  "version": "4.4.9",
+  "version": "4.4.10",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

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