suzanne.soy/fork-openpgpjs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Release new version

Browse Source
This commit is contained in:
Daniel Huigens 2020-04-15 11:34:10 +02:00
parent 9b51349ce3
commit 04fb053fc8
15 changed files with 158 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bower.json
View File

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

83
dist/compat/openpgp.js vendored
View File

@ -1,4 +1,4 @@
/*! OpenPGP.js v4.10.1 - 2020-02-27 - this is LGPL licensed code, see LICENSE/our website https://openpgpjs.org/ for more information. */
/*! OpenPGP.js v4.10.2 - 2020-04-15 - this is LGPL licensed code, see LICENSE/our website https://openpgpjs.org/ for more information. */
(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.openpgp = f()}})(function(){var define,module,exports;return (function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(_dereq_,module,exports){
(function (global){
"use strict";
@ -31127,7 +31127,7 @@ function CleartextMessage(text, signature) {
return new CleartextMessage(text, signature);
}
// normalize EOL to canonical form <CR><LF>
this.text = _util2.default.canonicalizeEOL(_util2.default.removeTrailingSpaces(text));
this.text = _util2.default.removeTrailingSpaces(text).replace(/\r\n/g, '\n').replace(/[\r\n]/g, '\r\n');
if (signature && !(signature instanceof _signature.Signature)) {
throw new Error('Invalid signature input');
}
@ -31267,7 +31267,7 @@ CleartextMessage.prototype.verifyDetached = function (signature, keys) {
*/
CleartextMessage.prototype.getText = function () {
// normalize end of line to \n
return _util2.default.nativeEOL(this.text);
return this.text.replace(/\r\n/g, '\n');
};
/**
@ -31493,7 +31493,7 @@ exports.default = {
* @memberof module:config
* @property {String} versionstring A version string to be included in armored messages
*/
versionstring: "OpenPGP.js v4.10.1",
versionstring: "OpenPGP.js v4.10.2",
/**
* @memberof module:config
* @property {String} commentstring A comment string to be included in armored messages
@ -42026,7 +42026,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
*/
function HKP(keyServerBaseUrl) {
this._baseUrl = keyServerBaseUrl || _config2.default.keyserver;
this._fetch = typeof global !== 'undefined' ? global.fetch : _dereq_('node-fetch');
this._fetch = typeof global.fetch === 'function' ? global.fetch : _dereq_('node-fetch');
}
/**
@ -51998,7 +51998,7 @@ Literal.prototype.getText = function () {
if (this.text === null || _util2.default.isStream(this.text)) {
// Assume that this.text has been read
this.text = _util2.default.nativeEOL(_util2.default.decode_utf8(this.getBytes(clone)));
this.text = _util2.default.decode_utf8(_util2.default.nativeEOL(this.getBytes(clone)));
}
return this.text;
};
@ -52023,8 +52023,8 @@ Literal.prototype.getBytes = function () {
var clone = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
if (this.data === null) {
// normalize EOL to \r\n and encode UTF8
this.data = _util2.default.encode_utf8(_util2.default.canonicalizeEOL(this.text));
// encode UTF8 and normalize EOL to \r\n
this.data = _util2.default.canonicalizeEOL(_util2.default.encode_utf8(this.text));
}
if (clone) {
return _webStreamTools2.default.passiveClone(this.data);
@ -55464,11 +55464,9 @@ Signature.prototype.toSign = function (type, data) {
case t.text:
{
var text = data.getText(true);
var bytes = data.getBytes(true);
// normalize EOL to \r\n
text = _util2.default.canonicalizeEOL(text);
// encode UTF8
return _util2.default.encode_utf8(text);
return _util2.default.canonicalizeEOL(bytes);
}
case t.standalone:
return new Uint8Array(0);
@ -55492,9 +55490,9 @@ Signature.prototype.toSign = function (type, data) {
throw new Error('Either a userId or userAttribute packet needs to be ' + 'supplied for certification.');
}
var bytes = _packet.write();
var _bytes = _packet.write();
return _util2.default.concat([this.toSign(t.key, data), new Uint8Array([tag]), _util2.default.writeNumber(bytes.length, 4), bytes]);
return _util2.default.concat([this.toSign(t.key, data), new Uint8Array([tag]), _util2.default.writeNumber(_bytes.length, 4), _bytes]);
}
case t.subkey_binding:
case t.subkey_revocation:
@ -58521,6 +58519,10 @@ Object.defineProperty(exports, "__esModule", {
value: true
});
var _from = _dereq_('babel-runtime/core-js/array/from');
var _from2 = _interopRequireDefault(_from);
var _typeof2 = _dereq_('babel-runtime/helpers/typeof');
var _typeof3 = _interopRequireDefault(_typeof2);
@ -59315,30 +59317,51 @@ exports.default = {
},
/**
* Normalize line endings to \r\n
* Normalize line endings to <CR><LF>
* Support any encoding where CR=0x0D, LF=0x0A
*/
canonicalizeEOL: function canonicalizeEOL(text) {
return _webStreamTools2.default.transform(_util2.default.nativeEOL(text), function (value) {
return value.replace(/\r/g, "\n").replace(/\n/g, "\r\n");
canonicalizeEOL: function canonicalizeEOL(data) {
var CR = 13;
var LF = 10;
return _webStreamTools2.default.transform(_util2.default.nativeEOL(data, true), function (bytes) {
var normalized = [];
for (var i = 0; i < bytes.length; i++) {
var x = bytes[i];
if (x === LF || x === CR) {
normalized.push(CR, LF);
} else {
normalized.push(x);
}
}
return new Uint8Array(normalized);
});
},
/**
* Convert line endings from canonicalized \r\n to native \n
* Convert line endings from canonicalized <CR><LF> to native <LF>
* Support any encoding where CR=0x0D, LF=0x0A
*/
nativeEOL: function nativeEOL(text) {
var lastChar = '';
return _webStreamTools2.default.transform(text, function (value) {
value = lastChar + value;
if (value[value.length - 1] === '\r') {
lastChar = '\r';
value = value.slice(0, -1);
nativeEOL: function nativeEOL(data) {
var CR = 13;
var LF = 10;
var carryOverCR = false;
return _webStreamTools2.default.transform(data, function (bytes) {
bytes = carryOverCR ? [CR].concat((0, _from2.default)(bytes)) : (0, _from2.default)(bytes);
if (bytes[bytes.length - 1] === CR) {
carryOverCR = true;
bytes.pop();
} else {
lastChar = '';
carryOverCR = false;
}
return value.replace(/\r\n/g, '\n');
return new Uint8Array(bytes.filter(function (x, i, xs) {
return x !== CR || i < xs.length - 1 && xs[i + 1] !== LF;
}));
}, function () {
return lastChar;
return new Uint8Array(carryOverCR ? [CR] : []);
});
},
@ -59431,7 +59454,7 @@ exports.default = {
*/
}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
},{"./config":350,"./encoding/base64":383,"./util":429,"babel-runtime/core-js/object/entries":25,"babel-runtime/core-js/promise":31,"babel-runtime/helpers/asyncToGenerator":35,"babel-runtime/helpers/slicedToArray":40,"babel-runtime/helpers/typeof":42,"babel-runtime/regenerator":43,"email-addresses":302,"web-stream-tools":345}],430:[function(_dereq_,module,exports){
},{"./config":350,"./encoding/base64":383,"./util":429,"babel-runtime/core-js/array/from":16,"babel-runtime/core-js/object/entries":25,"babel-runtime/core-js/promise":31,"babel-runtime/helpers/asyncToGenerator":35,"babel-runtime/helpers/slicedToArray":40,"babel-runtime/helpers/typeof":42,"babel-runtime/regenerator":43,"email-addresses":302,"web-stream-tools":345}],430:[function(_dereq_,module,exports){
(function (global){
'use strict';

4
dist/compat/openpgp.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/compat/openpgp.worker.js vendored
View File

@ -1,4 +1,4 @@
/*! OpenPGP.js v4.10.1 - 2020-02-27 - this is LGPL licensed code, see LICENSE/our website https://openpgpjs.org/ for more information. */
/*! OpenPGP.js v4.10.2 - 2020-04-15 - this is LGPL licensed code, see LICENSE/our website https://openpgpjs.org/ for more information. */
(function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
(function (global){
// GPG4Browsers - An OpenPGP implementation in javascript

2
dist/compat/openpgp.worker.min.js vendored
View File

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

71
dist/lightweight/openpgp.js vendored
View File

@ -1,4 +1,4 @@
/*! OpenPGP.js v4.10.1 - 2020-02-27 - this is LGPL licensed code, see LICENSE/our website https://openpgpjs.org/ for more information. */
/*! OpenPGP.js v4.10.2 - 2020-04-15 - this is LGPL licensed code, see LICENSE/our website https://openpgpjs.org/ for more information. */
(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.openpgp = f()}})(function(){var define,module,exports;return (function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
(function (global){
"use strict";
@ -20335,7 +20335,7 @@ function CleartextMessage(text, signature) {
return new CleartextMessage(text, signature);
}
// normalize EOL to canonical form <CR><LF>
this.text = _util2.default.canonicalizeEOL(_util2.default.removeTrailingSpaces(text));
this.text = _util2.default.removeTrailingSpaces(text).replace(/\r\n/g, '\n').replace(/[\r\n]/g, '\r\n');
if (signature && !(signature instanceof _signature.Signature)) {
throw new Error('Invalid signature input');
}
@ -20416,7 +20416,7 @@ CleartextMessage.prototype.verifyDetached = function (signature, keys, date = ne
*/
CleartextMessage.prototype.getText = function () {
// normalize end of line to \n
return _util2.default.nativeEOL(this.text);
return this.text.replace(/\r\n/g, '\n');
};
/**
@ -20665,7 +20665,7 @@ exports.default = {
* @memberof module:config
* @property {String} versionstring A version string to be included in armored messages
*/
versionstring: "OpenPGP.js v4.10.1",
versionstring: "OpenPGP.js v4.10.2",
/**
* @memberof module:config
* @property {String} commentstring A comment string to be included in armored messages
@ -28146,7 +28146,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
*/
function HKP(keyServerBaseUrl) {
this._baseUrl = keyServerBaseUrl || _config2.default.keyserver;
this._fetch = typeof global !== 'undefined' ? global.fetch : require('node-fetch');
this._fetch = typeof global.fetch === 'function' ? global.fetch : require('node-fetch');
}
/**
@ -33437,7 +33437,7 @@ Literal.prototype.setText = function (text, format = 'utf8') {
Literal.prototype.getText = function (clone = false) {
if (this.text === null || _util2.default.isStream(this.text)) {
// Assume that this.text has been read
this.text = _util2.default.nativeEOL(_util2.default.decode_utf8(this.getBytes(clone)));
this.text = _util2.default.decode_utf8(_util2.default.nativeEOL(this.getBytes(clone)));
}
return this.text;
};
@ -33460,8 +33460,8 @@ Literal.prototype.setBytes = function (bytes, format) {
*/
Literal.prototype.getBytes = function (clone = false) {
if (this.data === null) {
// normalize EOL to \r\n and encode UTF8
this.data = _util2.default.encode_utf8(_util2.default.canonicalizeEOL(this.text));
// encode UTF8 and normalize EOL to \r\n
this.data = _util2.default.canonicalizeEOL(_util2.default.encode_utf8(this.text));
}
if (clone) {
return _webStreamTools2.default.passiveClone(this.data);
@ -36009,11 +36009,9 @@ Signature.prototype.toSign = function (type, data) {
case t.text:
{
let text = data.getText(true);
const bytes = data.getBytes(true);
// normalize EOL to \r\n
text = _util2.default.canonicalizeEOL(text);
// encode UTF8
return _util2.default.encode_utf8(text);
return _util2.default.canonicalizeEOL(bytes);
}
case t.standalone:
return new Uint8Array(0);
@ -38846,27 +38844,48 @@ exports.default = {
},
/**
* Normalize line endings to \r\n
* Normalize line endings to <CR><LF>
* Support any encoding where CR=0x0D, LF=0x0A
*/
canonicalizeEOL: function canonicalizeEOL(text) {
return _webStreamTools2.default.transform(_util2.default.nativeEOL(text), value => value.replace(/\r/g, "\n").replace(/\n/g, "\r\n"));
canonicalizeEOL: function canonicalizeEOL(data) {
const CR = 13;
const LF = 10;
return _webStreamTools2.default.transform(_util2.default.nativeEOL(data, true), bytes => {
const normalized = [];
for (let i = 0; i < bytes.length; i++) {
const x = bytes[i];
if (x === LF || x === CR) {
normalized.push(CR, LF);
} else {
normalized.push(x);
}
}
return new Uint8Array(normalized);
});
},
/**
* Convert line endings from canonicalized \r\n to native \n
* Convert line endings from canonicalized <CR><LF> to native <LF>
* Support any encoding where CR=0x0D, LF=0x0A
*/
nativeEOL: function nativeEOL(text) {
let lastChar = '';
return _webStreamTools2.default.transform(text, value => {
value = lastChar + value;
if (value[value.length - 1] === '\r') {
lastChar = '\r';
value = value.slice(0, -1);
nativeEOL: function nativeEOL(data) {
const CR = 13;
const LF = 10;
let carryOverCR = false;
return _webStreamTools2.default.transform(data, bytes => {
bytes = carryOverCR ? [CR].concat(Array.from(bytes)) : Array.from(bytes);
if (bytes[bytes.length - 1] === CR) {
carryOverCR = true;
bytes.pop();
} else {
lastChar = '';
carryOverCR = false;
}
return value.replace(/\r\n/g, '\n');
}, () => lastChar);
return new Uint8Array(bytes.filter((x, i, xs) => x !== CR || i < xs.length - 1 && xs[i + 1] !== LF));
}, () => new Uint8Array(carryOverCR ? [CR] : []));
},
/**

4
dist/lightweight/openpgp.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/lightweight/openpgp.worker.js vendored
View File

@ -1,4 +1,4 @@
/*! OpenPGP.js v4.10.1 - 2020-02-27 - this is LGPL licensed code, see LICENSE/our website https://openpgpjs.org/ for more information. */
/*! OpenPGP.js v4.10.2 - 2020-04-15 - this is LGPL licensed code, see LICENSE/our website https://openpgpjs.org/ for more information. */
(function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
(function (global){
// GPG4Browsers - An OpenPGP implementation in javascript

2
dist/lightweight/openpgp.worker.min.js vendored
View File

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

71
dist/openpgp.js vendored
View File

@ -1,4 +1,4 @@
/*! OpenPGP.js v4.10.1 - 2020-02-27 - this is LGPL licensed code, see LICENSE/our website https://openpgpjs.org/ for more information. */
/*! OpenPGP.js v4.10.2 - 2020-04-15 - this is LGPL licensed code, see LICENSE/our website https://openpgpjs.org/ for more information. */
(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.openpgp = f()}})(function(){var define,module,exports;return (function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
(function (global){
"use strict";
@ -24722,7 +24722,7 @@ function CleartextMessage(text, signature) {
return new CleartextMessage(text, signature);
}
// normalize EOL to canonical form <CR><LF>
this.text = _util2.default.canonicalizeEOL(_util2.default.removeTrailingSpaces(text));
this.text = _util2.default.removeTrailingSpaces(text).replace(/\r\n/g, '\n').replace(/[\r\n]/g, '\r\n');
if (signature && !(signature instanceof _signature.Signature)) {
throw new Error('Invalid signature input');
}
@ -24803,7 +24803,7 @@ CleartextMessage.prototype.verifyDetached = function (signature, keys, date = ne
*/
CleartextMessage.prototype.getText = function () {
// normalize end of line to \n
return _util2.default.nativeEOL(this.text);
return this.text.replace(/\r\n/g, '\n');
};
/**
@ -25052,7 +25052,7 @@ exports.default = {
* @memberof module:config
* @property {String} versionstring A version string to be included in armored messages
*/
versionstring: "OpenPGP.js v4.10.1",
versionstring: "OpenPGP.js v4.10.2",
/**
* @memberof module:config
* @property {String} commentstring A comment string to be included in armored messages
@ -32533,7 +32533,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
*/
function HKP(keyServerBaseUrl) {
this._baseUrl = keyServerBaseUrl || _config2.default.keyserver;
this._fetch = typeof global !== 'undefined' ? global.fetch : require('node-fetch');
this._fetch = typeof global.fetch === 'function' ? global.fetch : require('node-fetch');
}
/**
@ -37824,7 +37824,7 @@ Literal.prototype.setText = function (text, format = 'utf8') {
Literal.prototype.getText = function (clone = false) {
if (this.text === null || _util2.default.isStream(this.text)) {
// Assume that this.text has been read
this.text = _util2.default.nativeEOL(_util2.default.decode_utf8(this.getBytes(clone)));
this.text = _util2.default.decode_utf8(_util2.default.nativeEOL(this.getBytes(clone)));
}
return this.text;
};
@ -37847,8 +37847,8 @@ Literal.prototype.setBytes = function (bytes, format) {
*/
Literal.prototype.getBytes = function (clone = false) {
if (this.data === null) {
// normalize EOL to \r\n and encode UTF8
this.data = _util2.default.encode_utf8(_util2.default.canonicalizeEOL(this.text));
// encode UTF8 and normalize EOL to \r\n
this.data = _util2.default.canonicalizeEOL(_util2.default.encode_utf8(this.text));
}
if (clone) {
return _webStreamTools2.default.passiveClone(this.data);
@ -40396,11 +40396,9 @@ Signature.prototype.toSign = function (type, data) {
case t.text:
{
let text = data.getText(true);
const bytes = data.getBytes(true);
// normalize EOL to \r\n
text = _util2.default.canonicalizeEOL(text);
// encode UTF8
return _util2.default.encode_utf8(text);
return _util2.default.canonicalizeEOL(bytes);
}
case t.standalone:
return new Uint8Array(0);
@ -43233,27 +43231,48 @@ exports.default = {
},
/**
* Normalize line endings to \r\n
* Normalize line endings to <CR><LF>
* Support any encoding where CR=0x0D, LF=0x0A
*/
canonicalizeEOL: function canonicalizeEOL(text) {
return _webStreamTools2.default.transform(_util2.default.nativeEOL(text), value => value.replace(/\r/g, "\n").replace(/\n/g, "\r\n"));
canonicalizeEOL: function canonicalizeEOL(data) {
const CR = 13;
const LF = 10;
return _webStreamTools2.default.transform(_util2.default.nativeEOL(data, true), bytes => {
const normalized = [];
for (let i = 0; i < bytes.length; i++) {
const x = bytes[i];
if (x === LF || x === CR) {
normalized.push(CR, LF);
} else {
normalized.push(x);
}
}
return new Uint8Array(normalized);
});
},
/**
* Convert line endings from canonicalized \r\n to native \n
* Convert line endings from canonicalized <CR><LF> to native <LF>
* Support any encoding where CR=0x0D, LF=0x0A
*/
nativeEOL: function nativeEOL(text) {
let lastChar = '';
return _webStreamTools2.default.transform(text, value => {
value = lastChar + value;
if (value[value.length - 1] === '\r') {
lastChar = '\r';
value = value.slice(0, -1);
nativeEOL: function nativeEOL(data) {
const CR = 13;
const LF = 10;
let carryOverCR = false;
return _webStreamTools2.default.transform(data, bytes => {
bytes = carryOverCR ? [CR].concat(Array.from(bytes)) : Array.from(bytes);
if (bytes[bytes.length - 1] === CR) {
carryOverCR = true;
bytes.pop();
} else {
lastChar = '';
carryOverCR = false;
}
return value.replace(/\r\n/g, '\n');
}, () => lastChar);
return new Uint8Array(bytes.filter((x, i, xs) => x !== CR || i < xs.length - 1 && xs[i + 1] !== LF));
}, () => new Uint8Array(carryOverCR ? [CR] : []));
},
/**

4
dist/openpgp.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/openpgp.worker.js vendored
View File

@ -1,4 +1,4 @@
/*! OpenPGP.js v4.10.1 - 2020-02-27 - this is LGPL licensed code, see LICENSE/our website https://openpgpjs.org/ for more information. */
/*! OpenPGP.js v4.10.2 - 2020-04-15 - this is LGPL licensed code, see LICENSE/our website https://openpgpjs.org/ for more information. */
(function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
(function (global){
// GPG4Browsers - An OpenPGP implementation in javascript

2
dist/openpgp.worker.min.js vendored
View File

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

2
package-lock.json generated
View File

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

2
package.json
View File

@ -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.10.1",
"version": "4.10.2",
"license": "LGPL-3.0+",
"homepage": "https://openpgpjs.org/",
"engines": {