Release new version

bower.json

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

dist/compat/openpgp.js

@@ -29663,7 +29663,7 @@ exports.default = {
    * @memberof module:config
    * @property {String} versionstring A version string to be included in armored messages
    */
-  versionstring: "OpenPGP.js v4.4.5",
+  versionstring: "OpenPGP.js v4.4.6",
   /**
    * @memberof module:config
    * @property {String} commentstring A comment string to be included in armored messages
@@ -35212,22 +35212,21 @@ var kdf = function () {
 }();
 
 /**
- * Encrypt and wrap a session key
+ * Generate ECDHE ephemeral key and secret from public key
  *
- * @param  {module:type/oid}        oid          Elliptic curve object identifier
+ * @param  {module:type/oid}        oid                 Elliptic curve object identifier
- * @param  {module:enums.symmetric} cipher_algo  Symmetric cipher to use
+ * @param  {module:enums.symmetric} cipher_algo         Symmetric cipher to use
- * @param  {module:enums.hash}      hash_algo    Hash algorithm to use
+ * @param  {module:enums.hash}      hash_algo           Hash algorithm to use
- * @param  {module:type/mpi}        m            Value derived from session key (RFC 6637)
+ * @param  {Uint8Array}             Q                   Recipient public key
- * @param  {Uint8Array}             Q            Recipient public key
+ * @param  {String}                 fingerprint         Recipient fingerprint
- * @param  {String}                 fingerprint  Recipient fingerprint
+ * @returns {Promise<{V: Uint8Array, Z: Uint8Array}>}   Returns public part of ephemeral key and generated ephemeral secret
- * @returns {Promise<{V: BN, C: BN}>}            Returns ephemeral key and encoded session key
  * @async
  */
 
 
-var encrypt = function () {
+var genPublicEphemeralKey = function () {
-  var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(oid, cipher_algo, hash_algo, m, Q, fingerprint) {
+  var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(oid, cipher_algo, hash_algo, Q, fingerprint) {
-    var curve, param, v, S, Z, C;
+    var curve, param, v, S, V, Z;
     return _regenerator2.default.wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
@@ -35244,16 +35243,13 @@ var encrypt = function () {
 
             Q = curve.keyFromPublic(Q);
             S = v.derive(Q);
-            _context2.next = 10;
+            V = new Uint8Array(v.getPublic());
+            _context2.next = 11;
             return kdf(hash_algo, S, _cipher2.default[cipher_algo].keySize, param);
 
-          case 10:
+          case 11:
             Z = _context2.sent;
-            C = _aes_kw2.default.wrap(Z, m.toString());
+            return _context2.abrupt('return', { V: V, Z: Z });
-            return _context2.abrupt('return', {
-              V: new _bn2.default(v.getPublic()),
-              C: C
-            });
 
           case 13:
           case 'end':
@@ -35263,57 +35259,140 @@ var encrypt = function () {
     }, _callee2, this);
   }));
 
-  return function encrypt(_x5, _x6, _x7, _x8, _x9, _x10) {
+  return function genPublicEphemeralKey(_x5, _x6, _x7, _x8, _x9) {
     return _ref2.apply(this, arguments);
   };
 }();
 
+/**
+ * Encrypt and wrap a session key
+ *
+ * @param  {module:type/oid}        oid          Elliptic curve object identifier
+ * @param  {module:enums.symmetric} cipher_algo  Symmetric cipher to use
+ * @param  {module:enums.hash}      hash_algo    Hash algorithm to use
+ * @param  {module:type/mpi}        m            Value derived from session key (RFC 6637)
+ * @param  {Uint8Array}             Q            Recipient public key
+ * @param  {String}                 fingerprint  Recipient fingerprint
+ * @returns {Promise<{V: BN, C: BN}>}            Returns public part of ephemeral key and encoded session key
+ * @async
+ */
+
+
+var encrypt = function () {
+  var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(oid, cipher_algo, hash_algo, m, Q, fingerprint) {
+    var _ref4, V, Z;
+
+    return _regenerator2.default.wrap(function _callee3$(_context3) {
+      while (1) {
+        switch (_context3.prev = _context3.next) {
+          case 0:
+            _context3.next = 2;
+            return genPublicEphemeralKey(oid, cipher_algo, hash_algo, Q, fingerprint);
+
+          case 2:
+            _ref4 = _context3.sent;
+            V = _ref4.V;
+            Z = _ref4.Z;
+            return _context3.abrupt('return', {
+              V: new _bn2.default(V),
+              C: _aes_kw2.default.wrap(Z, m.toString())
+            });
+
+          case 6:
+          case 'end':
+            return _context3.stop();
+        }
+      }
+    }, _callee3, this);
+  }));
+
+  return function encrypt(_x10, _x11, _x12, _x13, _x14, _x15) {
+    return _ref3.apply(this, arguments);
+  };
+}();
+
+/**
+ * Generate ECDHE secret from private key and public part of ephemeral key
+ *
+ * @param  {module:type/oid}        oid          Elliptic curve object identifier
+ * @param  {module:enums.symmetric} cipher_algo  Symmetric cipher to use
+ * @param  {module:enums.hash}      hash_algo    Hash algorithm to use
+ * @param  {Uint8Array}             V            Public part of ephemeral key
+ * @param  {Uint8Array}             d            Recipient private key
+ * @param  {String}                 fingerprint  Recipient fingerprint
+ * @returns {Promise<Uint8Array>}                Generated ephemeral secret
+ * @async
+ */
+
+
+var genPrivateEphemeralKey = function () {
+  var _ref5 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4(oid, cipher_algo, hash_algo, V, d, fingerprint) {
+    var curve, param, S;
+    return _regenerator2.default.wrap(function _callee4$(_context4) {
+      while (1) {
+        switch (_context4.prev = _context4.next) {
+          case 0:
+            curve = new _curves2.default(oid);
+            param = buildEcdhParam(_enums2.default.publicKey.ecdh, oid, cipher_algo, hash_algo, fingerprint);
+
+            cipher_algo = _enums2.default.read(_enums2.default.symmetric, cipher_algo);
+            V = curve.keyFromPublic(V);
+            d = curve.keyFromPrivate(d);
+            S = d.derive(V);
+            return _context4.abrupt('return', kdf(hash_algo, S, _cipher2.default[cipher_algo].keySize, param));
+
+          case 7:
+          case 'end':
+            return _context4.stop();
+        }
+      }
+    }, _callee4, this);
+  }));
+
+  return function genPrivateEphemeralKey(_x16, _x17, _x18, _x19, _x20, _x21) {
+    return _ref5.apply(this, arguments);
+  };
+}();
+
 /**
  * Decrypt and unwrap the value derived from session key
  *
  * @param  {module:type/oid}        oid          Elliptic curve object identifier
  * @param  {module:enums.symmetric} cipher_algo  Symmetric cipher to use
  * @param  {module:enums.hash}      hash_algo    Hash algorithm to use
- * @param  {BN}                     V            Public part of ephemeral key
+ * @param  {Uint8Array}             V            Public part of ephemeral key
  * @param  {Uint8Array}             C            Encrypted and wrapped value derived from session key
  * @param  {Uint8Array}             d            Recipient private key
  * @param  {String}                 fingerprint  Recipient fingerprint
- * @returns {Promise<Uint8Array>}                Value derived from session
+ * @returns {Promise<BN>}                        Value derived from session
  * @async
  */
 
 
 var decrypt = function () {
-  var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(oid, cipher_algo, hash_algo, V, C, d, fingerprint) {
+  var _ref6 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(oid, cipher_algo, hash_algo, V, C, d, fingerprint) {
-    var curve, param, S, Z;
+    var Z;
-    return _regenerator2.default.wrap(function _callee3$(_context3) {
+    return _regenerator2.default.wrap(function _callee5$(_context5) {
       while (1) {
-        switch (_context3.prev = _context3.next) {
+        switch (_context5.prev = _context5.next) {
           case 0:
-            curve = new _curves2.default(oid);
+            _context5.next = 2;
-            param = buildEcdhParam(_enums2.default.publicKey.ecdh, oid, cipher_algo, hash_algo, fingerprint);
+            return genPrivateEphemeralKey(oid, cipher_algo, hash_algo, V, d, fingerprint);
 
-            cipher_algo = _enums2.default.read(_enums2.default.symmetric, cipher_algo);
+          case 2:
-            V = curve.keyFromPublic(V);
+            Z = _context5.sent;
-            d = curve.keyFromPrivate(d);
+            return _context5.abrupt('return', new _bn2.default(_aes_kw2.default.unwrap(Z, C)));
-            S = d.derive(V);
-            _context3.next = 8;
-            return kdf(hash_algo, S, _cipher2.default[cipher_algo].keySize, param);
 
-          case 8:
+          case 4:
-            Z = _context3.sent;
-            return _context3.abrupt('return', new _bn2.default(_aes_kw2.default.unwrap(Z, C)));
-
-          case 10:
           case 'end':
-            return _context3.stop();
+            return _context5.stop();
         }
       }
-    }, _callee3, this);
+    }, _callee5, this);
   }));
 
-  return function decrypt(_x11, _x12, _x13, _x14, _x15, _x16, _x17) {
+  return function decrypt(_x22, _x23, _x24, _x25, _x26, _x27, _x28) {
-    return _ref3.apply(this, arguments);
+    return _ref6.apply(this, arguments);
   };
 }();
 
@@ -35384,7 +35463,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 function buildEcdhParam(public_algo, oid, cipher_algo, hash_algo, fingerprint) {
   var kdf_params = new _kdf_params2.default([hash_algo, cipher_algo]);
   return _util2.default.concatUint8Array([oid.write(), new Uint8Array([public_algo]), kdf_params.write(), _util2.default.str_to_Uint8Array("Anonymous Sender    "), fingerprint.subarray(0, 20)]);
-}exports.default = { encrypt: encrypt, decrypt: decrypt };
+}exports.default = { encrypt: encrypt, decrypt: decrypt, genPublicEphemeralKey: genPublicEphemeralKey, genPrivateEphemeralKey: genPrivateEphemeralKey };
 
 },{"../../../enums":376,"../../../type/kdf_params":410,"../../../util":415,"../../aes_kw":343,"../../cipher":349,"../../hash":355,"./curves":363,"babel-runtime/helpers/asyncToGenerator":33,"babel-runtime/regenerator":41,"bn.js":42}],365:[function(_dereq_,module,exports){
 'use strict';

dist/compat/openpgp.worker.min.js

@@ -1,2 +1,2 @@
-/*! OpenPGP.js v4.4.5 - 2019-01-15 - this is LGPL licensed code, see LICENSE/our website https://openpgpjs.org/ for more information. */
+/*! OpenPGP.js v4.4.6 - 2019-01-24 - 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

@@ -23761,7 +23761,7 @@ exports.default = {
    * @memberof module:config
    * @property {String} versionstring A version string to be included in armored messages
    */
-  versionstring: "OpenPGP.js v4.4.5",
+  versionstring: "OpenPGP.js v4.4.6",
   /**
    * @memberof module:config
    * @property {String} commentstring A comment string to be included in armored messages
@@ -28023,6 +28023,29 @@ async function kdf(hash_algo, X, length, param) {
   return digest.subarray(0, length);
 }
 
+/**
+ * Generate ECDHE ephemeral key and secret from public key
+ *
+ * @param  {module:type/oid}        oid                 Elliptic curve object identifier
+ * @param  {module:enums.symmetric} cipher_algo         Symmetric cipher to use
+ * @param  {module:enums.hash}      hash_algo           Hash algorithm to use
+ * @param  {Uint8Array}             Q                   Recipient public key
+ * @param  {String}                 fingerprint         Recipient fingerprint
+ * @returns {Promise<{V: Uint8Array, Z: Uint8Array}>}   Returns public part of ephemeral key and generated ephemeral secret
+ * @async
+ */
+async function genPublicEphemeralKey(oid, cipher_algo, hash_algo, Q, fingerprint) {
+  const curve = new _curves2.default(oid);
+  const param = buildEcdhParam(_enums2.default.publicKey.ecdh, oid, cipher_algo, hash_algo, fingerprint);
+  cipher_algo = _enums2.default.read(_enums2.default.symmetric, cipher_algo);
+  const v = await curve.genKeyPair();
+  Q = curve.keyFromPublic(Q);
+  const S = v.derive(Q);
+  const V = new Uint8Array(v.getPublic());
+  const Z = await kdf(hash_algo, S, _cipher2.default[cipher_algo].keySize, param);
+  return { V, Z };
+}
+
 /**
  * Encrypt and wrap a session key
  *
@@ -28032,22 +28055,41 @@ async function kdf(hash_algo, X, length, param) {
  * @param  {module:type/mpi}        m            Value derived from session key (RFC 6637)
  * @param  {Uint8Array}             Q            Recipient public key
  * @param  {String}                 fingerprint  Recipient fingerprint
- * @returns {Promise<{V: BN, C: BN}>}            Returns ephemeral key and encoded session key
+ * @returns {Promise<{V: BN, C: BN}>}            Returns public part of ephemeral key and encoded session key
  * @async
  */
 async function encrypt(oid, cipher_algo, hash_algo, m, Q, fingerprint) {
+  var _ref = await genPublicEphemeralKey(oid, cipher_algo, hash_algo, Q, fingerprint);
+
+  const V = _ref.V,
+        Z = _ref.Z;
+
+  return {
+    V: new _bn2.default(V),
+    C: _aes_kw2.default.wrap(Z, m.toString())
+  };
+}
+
+/**
+ * Generate ECDHE secret from private key and public part of ephemeral key
+ *
+ * @param  {module:type/oid}        oid          Elliptic curve object identifier
+ * @param  {module:enums.symmetric} cipher_algo  Symmetric cipher to use
+ * @param  {module:enums.hash}      hash_algo    Hash algorithm to use
+ * @param  {Uint8Array}             V            Public part of ephemeral key
+ * @param  {Uint8Array}             d            Recipient private key
+ * @param  {String}                 fingerprint  Recipient fingerprint
+ * @returns {Promise<Uint8Array>}                Generated ephemeral secret
+ * @async
+ */
+async function genPrivateEphemeralKey(oid, cipher_algo, hash_algo, V, d, fingerprint) {
   const curve = new _curves2.default(oid);
   const param = buildEcdhParam(_enums2.default.publicKey.ecdh, oid, cipher_algo, hash_algo, fingerprint);
   cipher_algo = _enums2.default.read(_enums2.default.symmetric, cipher_algo);
-  const v = await curve.genKeyPair();
+  V = curve.keyFromPublic(V);
-  Q = curve.keyFromPublic(Q);
+  d = curve.keyFromPrivate(d);
-  const S = v.derive(Q);
+  const S = d.derive(V);
-  const Z = await kdf(hash_algo, S, _cipher2.default[cipher_algo].keySize, param);
+  return kdf(hash_algo, S, _cipher2.default[cipher_algo].keySize, param);
-  const C = _aes_kw2.default.wrap(Z, m.toString());
-  return {
-    V: new _bn2.default(v.getPublic()),
-    C: C
-  };
 }
 
 /**
@@ -28056,25 +28098,19 @@ async function encrypt(oid, cipher_algo, hash_algo, m, Q, fingerprint) {
  * @param  {module:type/oid}        oid          Elliptic curve object identifier
  * @param  {module:enums.symmetric} cipher_algo  Symmetric cipher to use
  * @param  {module:enums.hash}      hash_algo    Hash algorithm to use
- * @param  {BN}                     V            Public part of ephemeral key
+ * @param  {Uint8Array}             V            Public part of ephemeral key
  * @param  {Uint8Array}             C            Encrypted and wrapped value derived from session key
  * @param  {Uint8Array}             d            Recipient private key
  * @param  {String}                 fingerprint  Recipient fingerprint
- * @returns {Promise<Uint8Array>}                Value derived from session
+ * @returns {Promise<BN>}                        Value derived from session
  * @async
  */
 async function decrypt(oid, cipher_algo, hash_algo, V, C, d, fingerprint) {
-  const curve = new _curves2.default(oid);
+  const Z = await genPrivateEphemeralKey(oid, cipher_algo, hash_algo, V, d, fingerprint);
-  const param = buildEcdhParam(_enums2.default.publicKey.ecdh, oid, cipher_algo, hash_algo, fingerprint);
-  cipher_algo = _enums2.default.read(_enums2.default.symmetric, cipher_algo);
-  V = curve.keyFromPublic(V);
-  d = curve.keyFromPrivate(d);
-  const S = d.derive(V);
-  const Z = await kdf(hash_algo, S, _cipher2.default[cipher_algo].keySize, param);
   return new _bn2.default(_aes_kw2.default.unwrap(Z, C));
 }
 
-exports.default = { encrypt, decrypt };
+exports.default = { encrypt, decrypt, genPublicEphemeralKey, genPrivateEphemeralKey };
 
 },{"../../../enums":115,"../../../type/kdf_params":149,"../../../util":154,"../../aes_kw":82,"../../cipher":88,"../../hash":94,"./curves":102,"bn.js":17}],104:[function(require,module,exports){
 'use strict';

dist/openpgp.worker.min.js

@@ -1,2 +1,2 @@
-/*! OpenPGP.js v4.4.5 - 2019-01-15 - this is LGPL licensed code, see LICENSE/our website https://openpgpjs.org/ for more information. */
+/*! OpenPGP.js v4.4.6 - 2019-01-24 - 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.5",
+  "version": "4.4.6",
   "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.5",
+  "version": "4.4.6",
   "license": "LGPL-3.0+",
   "homepage": "https://openpgpjs.org/",
   "engines": {