Switch build system to rollup
Also, default to minimized builds.
This commit is contained in:
Daniel Huigens
parent
c48070def6
commit
0e33e641af
|
|
@ -13,6 +13,7 @@ module.exports = {
|
|||
],
|
||||
|
||||
"globals": { // TODO are all these necessary?
|
||||
"globalThis": true,
|
||||
"console": true,
|
||||
"Promise": true,
|
||||
"importScripts": true,
|
||||
|
|
|
|||
2
.gitignore
vendored
2
.gitignore
vendored
|
|
@ -1,10 +1,8 @@
|
|||
.DS_Store
|
||||
node_modules/
|
||||
npm*
|
||||
src/compression/
|
||||
test/lib/
|
||||
dist/
|
||||
openpgp.store/
|
||||
doc/
|
||||
browserify-cache*.json
|
||||
.nyc_output/
|
||||
|
|
|
|||
172
Gruntfile.js
172
Gruntfile.js
|
|
@ -3,98 +3,8 @@ module.exports = function(grunt) {
|
|||
const version = grunt.option('release');
|
||||
const fs = require('fs');
|
||||
|
||||
// Project configuration.
|
||||
const dev = !!grunt.option('dev');
|
||||
const compat = !!grunt.option('compat');
|
||||
const lightweight = !!grunt.option('lightweight');
|
||||
const plugins = compat ? [
|
||||
"transform-async-to-generator",
|
||||
"syntax-async-functions",
|
||||
"transform-regenerator",
|
||||
"transform-runtime"
|
||||
] : [];
|
||||
const presets = [[require.resolve('babel-preset-env'), {
|
||||
targets: {
|
||||
browsers: compat ? [
|
||||
'IE >= 11',
|
||||
'Safari >= 9',
|
||||
'Last 2 Chrome versions',
|
||||
'Last 2 Firefox versions',
|
||||
'Last 2 Edge versions'
|
||||
] : [
|
||||
'Last 2 Chrome versions',
|
||||
'Last 2 Firefox versions',
|
||||
'Last 2 Safari versions',
|
||||
'Last 2 Edge versions'
|
||||
]
|
||||
}
|
||||
}]];
|
||||
grunt.initConfig({
|
||||
pkg: grunt.file.readJSON('package.json'),
|
||||
browserify: {
|
||||
openpgp: {
|
||||
files: {
|
||||
'dist/openpgp.js': ['./src/index.js']
|
||||
},
|
||||
options: {
|
||||
browserifyOptions: {
|
||||
fullPaths: dev,
|
||||
debug: dev,
|
||||
standalone: 'openpgp'
|
||||
},
|
||||
cacheFile: 'browserify-cache' + (compat ? '-compat' : '') + (lightweight ? '-lightweight' : '') + '.json',
|
||||
// Don't bundle these packages with openpgp.js
|
||||
external: ['crypto', 'zlib', 'node-localstorage', 'node-fetch', 'asn1.js', 'stream', 'buffer'].concat(
|
||||
compat ? [] : [
|
||||
'whatwg-fetch',
|
||||
'core-js/fn/array/fill',
|
||||
'core-js/fn/array/find',
|
||||
'core-js/fn/array/includes',
|
||||
'core-js/fn/array/from',
|
||||
'core-js/fn/promise',
|
||||
'core-js/fn/typed/uint8-array',
|
||||
'core-js/fn/string/repeat',
|
||||
'core-js/fn/symbol',
|
||||
'core-js/fn/object/assign'
|
||||
],
|
||||
lightweight ? [
|
||||
'elliptic',
|
||||
'elliptic.min.js'
|
||||
] : []
|
||||
),
|
||||
transform: [
|
||||
["babelify", {
|
||||
global: true,
|
||||
// Only babelify web-streams-polyfill, web-stream-tools, asmcrypto, email-addresses and seek-bzip in node_modules
|
||||
only: /^(?:.*\/node_modules\/web-streams-polyfill\/|.*\/node_modules\/web-stream-tools\/|.*\/node_modules\/asmcrypto\.js\/|.*\/node_modules\/email-addresses\/|.*\/node_modules\/seek-bzip\/|(?!.*\/node_modules\/)).*$/,
|
||||
ignore: ['*.min.js'],
|
||||
plugins,
|
||||
presets
|
||||
}]
|
||||
],
|
||||
plugin: ['browserify-derequire']
|
||||
}
|
||||
},
|
||||
unittests: {
|
||||
files: {
|
||||
'test/lib/unittests-bundle.js': ['./test/unittests.js']
|
||||
},
|
||||
options: {
|
||||
cacheFile: 'browserify-cache-unittests.json',
|
||||
external: ['buffer', 'openpgp', '../../dist/openpgp', '../../../dist/openpgp'],
|
||||
transform: [
|
||||
["babelify", {
|
||||
global: true,
|
||||
// Only babelify chai-as-promised in node_modules
|
||||
only: /^(?:.*\/node_modules\/chai-as-promised\/|(?!.*\/node_modules\/)).*$/,
|
||||
ignore: ['*.min.js'],
|
||||
plugins,
|
||||
presets
|
||||
}]
|
||||
]
|
||||
}
|
||||
}
|
||||
},
|
||||
nyc: {
|
||||
cover: {
|
||||
options: {
|
||||
|
|
@ -112,65 +22,6 @@ module.exports = function(grunt) {
|
|||
}
|
||||
}
|
||||
},
|
||||
replace: {
|
||||
openpgp: {
|
||||
src: ['dist/openpgp.js'],
|
||||
dest: ['dist/openpgp.js'],
|
||||
replacements: [{
|
||||
from: /OpenPGP.js VERSION/g,
|
||||
to: 'OpenPGP.js v<%= pkg.version %>'
|
||||
}]
|
||||
},
|
||||
lightweight_build: {
|
||||
src: ['dist/openpgp.js'],
|
||||
overwrite: true,
|
||||
replacements: [
|
||||
{
|
||||
from: "externalIndutnyElliptic: false",
|
||||
to: "externalIndutnyElliptic: true"
|
||||
}
|
||||
]
|
||||
},
|
||||
indutny_global: {
|
||||
src: ['dist/elliptic.min.js'],
|
||||
overwrite: true,
|
||||
replacements: [
|
||||
{
|
||||
from: 'b.elliptic=a()',
|
||||
to: 'b.openpgp.elliptic=a()'
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
terser: {
|
||||
openpgp: {
|
||||
files: {
|
||||
'dist/openpgp.min.js' : ['dist/openpgp.js']
|
||||
},
|
||||
options: {
|
||||
output: {
|
||||
comments: `/^!/`
|
||||
},
|
||||
sourceMap: dev ? {
|
||||
content: 'inline',
|
||||
url: 'inline'
|
||||
} : {},
|
||||
safari10: true
|
||||
}
|
||||
}
|
||||
},
|
||||
header: {
|
||||
openpgp: {
|
||||
options: {
|
||||
text: '/*! OpenPGP.js v<%= pkg.version %> - ' +
|
||||
'<%= grunt.template.today("yyyy-mm-dd") %> - ' +
|
||||
'this is LGPL licensed code, see LICENSE/our website <%= pkg.homepage %> for more information. */'
|
||||
},
|
||||
files: {
|
||||
'dist/openpgp.js': 'dist/openpgp.js'
|
||||
}
|
||||
}
|
||||
},
|
||||
jsbeautifier: {
|
||||
files: ['src/**/*.js'],
|
||||
options: {
|
||||
|
|
@ -232,7 +83,7 @@ module.exports = function(grunt) {
|
|||
expand: true,
|
||||
flatten: true,
|
||||
src: ['./node_modules/elliptic/dist/elliptic.min.js'],
|
||||
dest: 'dist/'
|
||||
dest: 'dist/lightweight/'
|
||||
}
|
||||
},
|
||||
clean: {
|
||||
|
|
@ -253,23 +104,10 @@ module.exports = function(grunt) {
|
|||
base: '.'
|
||||
}
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
src: {
|
||||
files: ['src/**/*.js'],
|
||||
tasks: lightweight ? ['browserify:openpgp', 'replace:lightweight_build'] : ['browserify:openpgp']
|
||||
},
|
||||
test: {
|
||||
files: ['test/*.js', 'test/crypto/**/*.js', 'test/general/**/*.js', 'test/worker/**/*.js'],
|
||||
tasks: ['browserify:unittests']
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
// Load the plugin(s)
|
||||
grunt.loadNpmTasks('grunt-browserify');
|
||||
grunt.loadNpmTasks('grunt-terser');
|
||||
grunt.loadNpmTasks('grunt-header');
|
||||
grunt.loadNpmTasks('grunt-text-replace');
|
||||
grunt.loadNpmTasks('grunt-jsbeautifier');
|
||||
grunt.loadNpmTasks('grunt-jsdoc');
|
||||
|
|
@ -316,14 +154,6 @@ module.exports = function(grunt) {
|
|||
|
||||
// Build tasks
|
||||
grunt.registerTask('version', ['replace:openpgp']);
|
||||
grunt.registerTask('build', function() {
|
||||
if (lightweight) {
|
||||
grunt.task.run(['copy:indutny_elliptic', 'browserify:openpgp', 'replace:lightweight_build', 'replace:indutny_global', 'version', 'header', 'terser']);
|
||||
return;
|
||||
}
|
||||
grunt.task.run(['browserify:openpgp', 'version', 'header', 'terser']);
|
||||
}
|
||||
);
|
||||
grunt.registerTask('documentation', ['jsdoc']);
|
||||
grunt.registerTask('default', ['build']);
|
||||
// Test/Dev tasks
|
||||
|
|
|
|||
4712
package-lock.json
generated
4712
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
55
package.json
55
package.json
|
|
@ -13,7 +13,12 @@
|
|||
"gpg",
|
||||
"openpgp"
|
||||
],
|
||||
"main": "dist/openpgp.js",
|
||||
"main": "dist/node/openpgp.min.js",
|
||||
"module": "dist/node/openpgp.min.mjs",
|
||||
"browser": {
|
||||
"./dist/node/openpgp.min.js": "./dist/openpgp.min.js",
|
||||
"./dist/node/openpgp.min.mjs": "./dist/openpgp.min.mjs"
|
||||
},
|
||||
"directories": {
|
||||
"lib": "src"
|
||||
},
|
||||
|
|
@ -25,64 +30,54 @@
|
|||
"test/crypto"
|
||||
],
|
||||
"scripts": {
|
||||
"build": "grunt build --compat copy:openpgp_compat && grunt build --lightweight copy:openpgp_lightweight clean:js && grunt build",
|
||||
"prepare": "grunt clean:cache && npm run build",
|
||||
"build": "rollup --config --sourcemap",
|
||||
"prepare": "npm run build",
|
||||
"test": "grunt test",
|
||||
"lint": "eslint src"
|
||||
},
|
||||
"devDependencies": {
|
||||
"babel-core": "^6.26.3",
|
||||
"babel-plugin-syntax-async-functions": "^6.13.0",
|
||||
"babel-plugin-transform-async-to-generator": "^6.24.1",
|
||||
"babel-plugin-transform-regenerator": "^6.26.0",
|
||||
"babel-plugin-transform-remove-strict-mode": "0.0.2",
|
||||
"babel-plugin-transform-runtime": "^6.23.0",
|
||||
"babel-polyfill": "^6.26.0",
|
||||
"babel-preset-env": "^1.7.0",
|
||||
"babel-preset-es2015-mod": "^6.6.0",
|
||||
"babel-preset-es3": "^1.0.1",
|
||||
"babelify": "^8.0.0",
|
||||
"browserify-derequire": "^0.9.4",
|
||||
"@mattiasbuelens/web-streams-adapter": "0.1.0-alpha.5",
|
||||
"@rollup/plugin-commonjs": "^11.1.0",
|
||||
"@rollup/plugin-node-resolve": "^7.1.3",
|
||||
"@rollup/plugin-replace": "^2.3.2",
|
||||
"asmcrypto.js": "github:openpgpjs/asmcrypto#475cffa5ccb2cf2556427056679414acf3610d1b",
|
||||
"bn.js": "^4.11.8",
|
||||
"buffer": "^5.0.8",
|
||||
"chai": "^4.1.2",
|
||||
"chai-as-promised": "^7.1.1",
|
||||
"core-js": "^2.5.3",
|
||||
"elliptic": "github:openpgpjs/elliptic#ab7d8268c60b6abeb175841c578c224ac5b2d279",
|
||||
"email-addresses": "3.1.0",
|
||||
"eslint": "^4.17.0",
|
||||
"eslint-config-airbnb": "^16.1.0",
|
||||
"eslint-config-airbnb-base": "^12.1.0",
|
||||
"eslint-plugin-import": "^2.8.0",
|
||||
"eslint-plugin-chai-friendly": "^0.5.0",
|
||||
"eslint-plugin-import": "^2.8.0",
|
||||
"grunt": "^1.1.0",
|
||||
"grunt-browserify": "^5.3.0",
|
||||
"grunt-contrib-clean": "~1.1.0",
|
||||
"grunt-contrib-connect": "~1.0.2",
|
||||
"grunt-contrib-copy": "~1.0.0",
|
||||
"grunt-contrib-watch": "^1.1.0",
|
||||
"grunt-header": "^1.1.0",
|
||||
"grunt-jsbeautifier": "^0.2.13",
|
||||
"grunt-jsdoc": "^2.2.1",
|
||||
"grunt-mocha-test": "^0.13.3",
|
||||
"grunt-simple-nyc": "^3.0.1",
|
||||
"grunt-terser": "^0.1.0",
|
||||
"grunt-text-replace": "~0.4.0",
|
||||
"gruntify-eslint": "^4.0.0",
|
||||
"hash.js": "^1.1.3",
|
||||
"mocha": "^5.0.0",
|
||||
"nyc": "^14.1.1",
|
||||
"pako": "^1.0.6",
|
||||
"rollup": "^2.7.2",
|
||||
"rollup-plugin-terser": "^5.3.0",
|
||||
"seek-bzip": "github:openpgpjs/seek-bzip#6187fc025851d35c4e104a25ea15a10b9b8d6f7d",
|
||||
"sinon": "^4.3.0",
|
||||
"text-encoding-utf-8": "^1.0.2",
|
||||
"whatwg-fetch": "^2.0.3",
|
||||
"asmcrypto.js": "github:openpgpjs/asmcrypto#475cffa5ccb2cf2556427056679414acf3610d1b",
|
||||
"bn.js": "^4.11.8",
|
||||
"buffer": "^5.0.8",
|
||||
"elliptic": "github:openpgpjs/elliptic#ab7d8268c60b6abeb175841c578c224ac5b2d279",
|
||||
"hash.js": "^1.1.3",
|
||||
"pako": "^1.0.6",
|
||||
"seek-bzip": "github:openpgpjs/seek-bzip#6187fc025851d35c4e104a25ea15a10b9b8d6f7d",
|
||||
"tweetnacl": "github:openpgpjs/tweetnacl-js#3dae25bd3eaa77173f3405676b595721dde92eec",
|
||||
"web-stream-tools": "github:openpgpjs/web-stream-tools#699d88c8d8f78d1513769e16cf557929c97bf83c",
|
||||
"email-addresses": "3.1.0"
|
||||
"web-stream-tools": "github:openpgpjs/web-stream-tools#b70529205ecaa41139311e874bdab0f8a9358a94",
|
||||
"whatwg-fetch": "^2.0.3"
|
||||
},
|
||||
"dependencies": {
|
||||
"@mattiasbuelens/web-streams-adapter": "0.1.0-alpha.3",
|
||||
"asn1.js": "^5.0.0",
|
||||
"node-fetch": "^2.1.2",
|
||||
"node-localstorage": "~1.3.0"
|
||||
|
|
|
|||
128
rollup.config.js
Normal file
128
rollup.config.js
Normal file
|
|
@ -0,0 +1,128 @@
|
|||
import { builtinModules } from 'module';
|
||||
|
||||
import resolve from '@rollup/plugin-node-resolve';
|
||||
import commonjs from '@rollup/plugin-commonjs';
|
||||
import replace from '@rollup/plugin-replace';
|
||||
import { terser } from "rollup-plugin-terser";
|
||||
|
||||
import pkg from './package.json';
|
||||
|
||||
const nodeDependencies = Object.keys(pkg.dependencies);
|
||||
|
||||
const compat = [
|
||||
'whatwg-fetch',
|
||||
'core-js/fn/array/fill',
|
||||
'core-js/fn/array/find',
|
||||
'core-js/fn/array/includes',
|
||||
'core-js/fn/array/from',
|
||||
'core-js/fn/promise',
|
||||
'core-js/fn/typed/uint8-array',
|
||||
'core-js/fn/string/repeat',
|
||||
'core-js/fn/symbol',
|
||||
'core-js/fn/object/assign'
|
||||
];
|
||||
|
||||
const banner =
|
||||
`/*! OpenPGP.js v${pkg.version} - ` +
|
||||
`${new Date().toISOString().split('T')[0]} - ` +
|
||||
`this is LGPL licensed code, see LICENSE/our website ${pkg.homepage} for more information. */`;
|
||||
|
||||
const terserOptions = {
|
||||
ecma: 2017,
|
||||
compress: {
|
||||
unsafe: true
|
||||
}
|
||||
};
|
||||
|
||||
export default [
|
||||
{
|
||||
input: 'src/index.js',
|
||||
output: [
|
||||
{ file: 'dist/openpgp.js', format: 'iife', name: pkg.name, banner },
|
||||
{ file: 'dist/openpgp.min.js', format: 'iife', name: pkg.name, banner, plugins: [terser(terserOptions)] },
|
||||
{ file: 'dist/openpgp.mjs', format: 'es', banner },
|
||||
{ file: 'dist/openpgp.min.mjs', format: 'es', banner, plugins: [terser(terserOptions)] }
|
||||
],
|
||||
plugins: [
|
||||
resolve({
|
||||
browser: true
|
||||
}),
|
||||
commonjs({
|
||||
ignore: builtinModules.concat(nodeDependencies).concat(compat)
|
||||
}),
|
||||
replace({
|
||||
'OpenPGP.js VERSION': `OpenPGP.js ${pkg.version}`,
|
||||
'require(': 'void(',
|
||||
delimiters: ['', '']
|
||||
})
|
||||
]
|
||||
},
|
||||
{
|
||||
input: 'src/index.js',
|
||||
external: builtinModules.concat(nodeDependencies),
|
||||
output: [
|
||||
{ file: 'dist/node/openpgp.js', format: 'cjs', name: pkg.name, banner },
|
||||
{ file: 'dist/node/openpgp.min.js', format: 'cjs', name: pkg.name, banner, plugins: [terser(terserOptions)] },
|
||||
{ file: 'dist/node/openpgp.mjs', format: 'es', banner },
|
||||
{ file: 'dist/node/openpgp.min.mjs', format: 'es', banner, plugins: [terser(terserOptions)] }
|
||||
],
|
||||
plugins: [
|
||||
resolve(),
|
||||
commonjs({
|
||||
ignore: compat
|
||||
}),
|
||||
replace({
|
||||
'OpenPGP.js VERSION': `OpenPGP.js ${pkg.version}`,
|
||||
})
|
||||
]
|
||||
},
|
||||
{
|
||||
input: 'src/index.js',
|
||||
output: [
|
||||
{ file: 'dist/lightweight/openpgp.js', format: 'iife', name: pkg.name, banner },
|
||||
{ file: 'dist/lightweight/openpgp.min.js', format: 'iife', name: pkg.name, banner, plugins: [terser(terserOptions)] },
|
||||
{ file: 'dist/lightweight/openpgp.mjs', format: 'es', banner },
|
||||
{ file: 'dist/lightweight/openpgp.min.mjs', format: 'es', banner, plugins: [terser(terserOptions)] }
|
||||
],
|
||||
plugins: [
|
||||
resolve({
|
||||
browser: true
|
||||
}),
|
||||
commonjs({
|
||||
ignore: builtinModules.concat(nodeDependencies).concat(compat).concat('elliptic')
|
||||
}),
|
||||
replace({
|
||||
'OpenPGP.js VERSION': `OpenPGP.js ${pkg.version}`,
|
||||
'externalIndutnyElliptic: false': 'externalIndutnyElliptic: true',
|
||||
'require(': 'void(',
|
||||
delimiters: ['', '']
|
||||
})
|
||||
]
|
||||
},
|
||||
{
|
||||
input: 'node_modules/elliptic/dist/elliptic.min.js',
|
||||
output: [
|
||||
{ file: 'dist/lightweight/elliptic.min.js', format: 'es' }
|
||||
],
|
||||
plugins: [
|
||||
replace({
|
||||
'b.elliptic=a()': 'b.openpgp.elliptic=a()',
|
||||
delimiters: ['', '']
|
||||
})
|
||||
]
|
||||
},
|
||||
{
|
||||
input: 'test/unittests.js',
|
||||
output: [
|
||||
{ file: 'test/lib/unittests-bundle.js', format: 'iife' },
|
||||
],
|
||||
plugins: [
|
||||
resolve({
|
||||
browser: true
|
||||
}),
|
||||
commonjs({
|
||||
ignore: builtinModules.concat(nodeDependencies).concat(compat).concat(['../..', '../../..'])
|
||||
})
|
||||
]
|
||||
}
|
||||
];
|
||||
|
|
@ -24,7 +24,6 @@
|
|||
|
||||
import { loadScript, dl } from '../../../lightweight_helper';
|
||||
import config from '../../../config';
|
||||
import util from '../../../util';
|
||||
|
||||
export function keyFromPrivate(indutnyCurve, priv) {
|
||||
const keyPair = indutnyCurve.keyPair({ priv: priv });
|
||||
|
|
@ -63,10 +62,6 @@ function loadElliptic() {
|
|||
if (!config.externalIndutnyElliptic) {
|
||||
return require('elliptic');
|
||||
}
|
||||
if (util.detectNode()) {
|
||||
// eslint-disable-next-line
|
||||
return require(config.indutnyEllipticPath);
|
||||
}
|
||||
if (!ellipticPromise) {
|
||||
ellipticPromise = loadEllipticPromise().catch(e => {
|
||||
ellipticPromise = undefined;
|
||||
|
|
|
|||
|
|
@ -2,12 +2,9 @@
|
|||
* @fileoverview Old browser polyfills
|
||||
* All are listed as dev dependencies because Node does not need them
|
||||
* and for browser babel will take care of it
|
||||
* @requires util
|
||||
* @module polyfills
|
||||
*/
|
||||
|
||||
import util from './util';
|
||||
|
||||
if (typeof global !== 'undefined') {
|
||||
/********************************************************************
|
||||
* NOTE: This list is duplicated in Gruntfile.js, *
|
||||
|
|
@ -50,7 +47,7 @@ if (typeof global !== 'undefined') {
|
|||
}
|
||||
|
||||
if (typeof TextEncoder === 'undefined') {
|
||||
const nodeUtil = util.nodeRequire('util') || {};
|
||||
const nodeUtil = require('util') || {};
|
||||
global.TextEncoder = nodeUtil.TextEncoder;
|
||||
global.TextDecoder = nodeUtil.TextDecoder;
|
||||
}
|
||||
|
|
|
|||
26
src/util.js
26
src/util.js
|
|
@ -519,22 +519,6 @@ export default {
|
|||
typeof global.process.versions === 'object';
|
||||
},
|
||||
|
||||
/**
|
||||
* Get native Node.js module
|
||||
* @param {String} The module to require
|
||||
* @returns {Object} The required module or 'undefined'
|
||||
*/
|
||||
nodeRequire: function(module) {
|
||||
if (!util.detectNode()) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Requiring the module dynamically allows us to access the native node module.
|
||||
// otherwise, it gets replaced with the browserified version
|
||||
// eslint-disable-next-line import/no-dynamic-require
|
||||
return require(module);
|
||||
},
|
||||
|
||||
/**
|
||||
* Get native Node.js crypto api. The default configuration is to use
|
||||
* the api when available. But it can also be deactivated with config.useNative
|
||||
|
|
@ -545,7 +529,7 @@ export default {
|
|||
return;
|
||||
}
|
||||
|
||||
return util.nodeRequire('crypto');
|
||||
return require('crypto');
|
||||
},
|
||||
|
||||
getNodeZlib: function() {
|
||||
|
|
@ -553,7 +537,7 @@ export default {
|
|||
return;
|
||||
}
|
||||
|
||||
return util.nodeRequire('zlib');
|
||||
return require('zlib');
|
||||
},
|
||||
|
||||
/**
|
||||
|
|
@ -562,16 +546,16 @@ export default {
|
|||
* @returns {Function} The Buffer constructor or 'undefined'
|
||||
*/
|
||||
getNodeBuffer: function() {
|
||||
return (util.nodeRequire('buffer') || {}).Buffer;
|
||||
return (require('buffer') || {}).Buffer;
|
||||
},
|
||||
|
||||
getNodeStream: function() {
|
||||
return (util.nodeRequire('stream') || {}).Readable;
|
||||
return (require('stream') || {}).Readable;
|
||||
},
|
||||
|
||||
getHardwareConcurrency: function() {
|
||||
if (util.detectNode()) {
|
||||
const os = util.nodeRequire('os');
|
||||
const os = require('os');
|
||||
return os.cpus().length;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../../dist/openpgp');
|
||||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../..');
|
||||
|
||||
const expect = require('chai').expect;
|
||||
|
||||
describe('AES Key Wrap and Unwrap', function () {
|
||||
module.exports = () => describe('AES Key Wrap and Unwrap', function () {
|
||||
const test_vectors = [
|
||||
[
|
||||
"128 bits of Key Data with a 128-bit KEK",
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../../../dist/openpgp');
|
||||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../../..');
|
||||
|
||||
const chai = require('chai');
|
||||
|
||||
const { expect } = chai;
|
||||
|
||||
describe('AES Rijndael cipher test with test vectors from ecb_tbl.txt', function() {
|
||||
module.exports = () => describe('AES Rijndael cipher test with test vectors from ecb_tbl.txt', function() {
|
||||
function test_aes(input, key, output) {
|
||||
const aes = new openpgp.crypto.cipher.aes128(new Uint8Array(key));
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../../../dist/openpgp');
|
||||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../../..');
|
||||
|
||||
const chai = require('chai');
|
||||
|
||||
const { util } = openpgp;
|
||||
const { expect } = chai;
|
||||
|
||||
it('Blowfish cipher test with test vectors from https://www.schneier.com/code/vectors.txt', function(done) {
|
||||
module.exports = () => it('Blowfish cipher test with test vectors from https://www.schneier.com/code/vectors.txt', function(done) {
|
||||
function test_bf(input, key, output) {
|
||||
const blowfish = new openpgp.crypto.cipher.blowfish(util.uint8ArrayToStr(key));
|
||||
const result = util.uint8ArrayToStr(blowfish.encrypt(input));
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../../../dist/openpgp');
|
||||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../../..');
|
||||
|
||||
const chai = require('chai');
|
||||
|
||||
const { util } = openpgp;
|
||||
const { expect } = chai;
|
||||
|
||||
it('CAST-128 cipher test with test vectors from RFC2144', function (done) {
|
||||
module.exports = () => it('CAST-128 cipher test with test vectors from RFC2144', function (done) {
|
||||
function test_cast(input, key, output) {
|
||||
const cast5 = new openpgp.crypto.cipher.cast5(key);
|
||||
const result = util.uint8ArrayToStr(cast5.encrypt(input));
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../../../dist/openpgp');
|
||||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../../..');
|
||||
|
||||
const chai = require('chai');
|
||||
|
||||
const { util } = openpgp;
|
||||
const { expect } = chai;
|
||||
|
||||
describe('TripleDES (EDE) cipher test with test vectors from NIST SP 800-20', function() {
|
||||
module.exports = () => describe('TripleDES (EDE) cipher test with test vectors from NIST SP 800-20', function() {
|
||||
// see https://csrc.nist.gov/publications/nistpubs/800-20/800-20.pdf
|
||||
const key = new Uint8Array([1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1]);
|
||||
const testvectors = [[[0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00],[0x95,0xF8,0xA5,0xE5,0xDD,0x31,0xD9,0x00]],
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
describe('Cipher', function () {
|
||||
require('./aes.js');
|
||||
require('./blowfish.js');
|
||||
require('./cast5.js');
|
||||
require('./des.js');
|
||||
require('./twofish.js');
|
||||
module.exports = () => describe('Cipher', function () {
|
||||
require('./aes.js')();
|
||||
require('./blowfish.js')();
|
||||
require('./cast5.js')();
|
||||
require('./des.js')();
|
||||
require('./twofish.js')();
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../../../dist/openpgp');
|
||||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../../..');
|
||||
|
||||
const chai = require('chai');
|
||||
|
||||
const { util } = openpgp;
|
||||
const { expect } = chai;
|
||||
|
||||
it('Twofish with test vectors from https://www.schneier.com/code/ecb_ival.txt', function(done) {
|
||||
module.exports = () => it('Twofish with test vectors from https://www.schneier.com/code/ecb_ival.txt', function(done) {
|
||||
function tfencrypt(block, key) {
|
||||
const tf = new openpgp.crypto.cipher.twofish(util.strToUint8Array(key));
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../../dist/openpgp');
|
||||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../..');
|
||||
|
||||
const chai = require('chai');
|
||||
chai.use(require('chai-as-promised'));
|
||||
|
||||
const expect = chai.expect;
|
||||
|
||||
describe('API functional testing', function() {
|
||||
module.exports = () => describe('API functional testing', function() {
|
||||
const util = openpgp.util;
|
||||
const crypto = openpgp.crypto;
|
||||
const RSApubMPIstrs = [
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
// Adapted from https://github.com/artjomb/cryptojs-extension/blob/8c61d159/test/eax.js
|
||||
|
||||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../../dist/openpgp');
|
||||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../..');
|
||||
|
||||
const chai = require('chai');
|
||||
chai.use(require('chai-as-promised'));
|
||||
|
|
@ -123,28 +123,30 @@ function testAESEAX() {
|
|||
});
|
||||
}
|
||||
|
||||
describe('Symmetric AES-EAX (native)', function() {
|
||||
let useNativeVal;
|
||||
beforeEach(function() {
|
||||
useNativeVal = openpgp.config.useNative;
|
||||
openpgp.config.useNative = true;
|
||||
});
|
||||
afterEach(function() {
|
||||
openpgp.config.useNative = useNativeVal;
|
||||
module.exports = () => {
|
||||
describe('Symmetric AES-EAX (native)', function() {
|
||||
let useNativeVal;
|
||||
beforeEach(function() {
|
||||
useNativeVal = openpgp.config.useNative;
|
||||
openpgp.config.useNative = true;
|
||||
});
|
||||
afterEach(function() {
|
||||
openpgp.config.useNative = useNativeVal;
|
||||
});
|
||||
|
||||
testAESEAX();
|
||||
});
|
||||
|
||||
testAESEAX();
|
||||
});
|
||||
describe('Symmetric AES-EAX (asm.js fallback)', function() {
|
||||
let useNativeVal;
|
||||
beforeEach(function() {
|
||||
useNativeVal = openpgp.config.useNative;
|
||||
openpgp.config.useNative = false;
|
||||
});
|
||||
afterEach(function() {
|
||||
openpgp.config.useNative = useNativeVal;
|
||||
});
|
||||
|
||||
describe('Symmetric AES-EAX (asm.js fallback)', function() {
|
||||
let useNativeVal;
|
||||
beforeEach(function() {
|
||||
useNativeVal = openpgp.config.useNative;
|
||||
openpgp.config.useNative = false;
|
||||
testAESEAX();
|
||||
});
|
||||
afterEach(function() {
|
||||
openpgp.config.useNative = useNativeVal;
|
||||
});
|
||||
|
||||
testAESEAX();
|
||||
});
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../../dist/openpgp');
|
||||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../..');
|
||||
const chai = require('chai');
|
||||
const elliptic_data = require('./elliptic_data');
|
||||
|
||||
|
|
@ -7,7 +7,7 @@ chai.use(require('chai-as-promised'));
|
|||
const expect = chai.expect;
|
||||
const key_data = elliptic_data.key_data;
|
||||
/* eslint-disable no-invalid-this */
|
||||
describe('ECDH key exchange @lightweight', function () {
|
||||
module.exports = () => describe('ECDH key exchange @lightweight', function () {
|
||||
const elliptic_curves = openpgp.crypto.publicKey.elliptic;
|
||||
const decrypt_message = function (oid, hash, cipher, priv, pub, ephemeral, data, fingerprint) {
|
||||
if (openpgp.util.isString(data)) {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../../dist/openpgp');
|
||||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../..');
|
||||
const chai = require('chai');
|
||||
|
||||
const elliptic_data = require('./elliptic_data');
|
||||
|
|
@ -8,7 +8,7 @@ chai.use(require('chai-as-promised'));
|
|||
const expect = chai.expect;
|
||||
const key_data = elliptic_data.key_data;
|
||||
/* eslint-disable no-invalid-this */
|
||||
describe('Elliptic Curve Cryptography @lightweight', function () {
|
||||
module.exports = () => describe('Elliptic Curve Cryptography @lightweight', function () {
|
||||
const elliptic_curves = openpgp.crypto.publicKey.elliptic;
|
||||
|
||||
const signature_data = {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
describe('Hash', function () {
|
||||
require('./md5.js');
|
||||
require('./ripemd.js');
|
||||
require('./sha.js');
|
||||
module.exports = () => describe('Hash', function () {
|
||||
require('./md5.js')();
|
||||
require('./ripemd.js')();
|
||||
require('./sha.js')();
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../../../dist/openpgp');
|
||||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../../..');
|
||||
|
||||
const chai = require('chai');
|
||||
|
||||
|
|
@ -6,7 +6,7 @@ const { util } = openpgp;
|
|||
const md5 = openpgp.crypto.hash.md5;
|
||||
const { expect } = chai;
|
||||
|
||||
it('MD5 with test vectors from RFC 1321', async function() {
|
||||
module.exports = () => it('MD5 with test vectors from RFC 1321', async function() {
|
||||
expect(util.strToHex(util.uint8ArrayToStr(await md5(util.strToUint8Array(''))), 'MD5("") = d41d8cd98f00b204e9800998ecf8427e')).to.equal('d41d8cd98f00b204e9800998ecf8427e');
|
||||
expect(util.strToHex(util.uint8ArrayToStr(await md5(util.strToUint8Array('abc'))), 'MD5("a") = 0cc175b9c0f1b6a831c399e269772661')).to.equal('900150983cd24fb0d6963f7d28e17f72');
|
||||
expect(util.strToHex(util.uint8ArrayToStr(await md5(util.strToUint8Array('message digest'))), 'MD5("message digest") = f96b697d7cb7938d525a2f31aaf161d0')).to.equal('f96b697d7cb7938d525a2f31aaf161d0');
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../../../dist/openpgp');
|
||||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../../..');
|
||||
|
||||
const chai = require('chai');
|
||||
|
||||
|
|
@ -6,7 +6,7 @@ const { util } = openpgp;
|
|||
const rmdString = openpgp.crypto.hash.ripemd;
|
||||
const { expect } = chai;
|
||||
|
||||
it("RIPE-MD 160 bits with test vectors from https://homes.esat.kuleuven.be/~bosselae/ripemd160.html", async function() {
|
||||
module.exports = () => it("RIPE-MD 160 bits with test vectors from https://homes.esat.kuleuven.be/~bosselae/ripemd160.html", async function() {
|
||||
expect(util.strToHex(util.uint8ArrayToStr(await rmdString(util.strToUint8Array(''))), 'RMDstring("") = 9c1185a5c5e9fc54612808977ee8f548b2258d31')).to.equal('9c1185a5c5e9fc54612808977ee8f548b2258d31');
|
||||
expect(util.strToHex(util.uint8ArrayToStr(await rmdString(util.strToUint8Array('a'))), 'RMDstring("a") = 0bdc9d2d256b3ee9daae347be6f4dc835a467ffe')).to.equal('0bdc9d2d256b3ee9daae347be6f4dc835a467ffe');
|
||||
expect(util.strToHex(util.uint8ArrayToStr(await rmdString(util.strToUint8Array('abc'))), 'RMDstring("abc") = 8eb208f7e05d987a9b044a8e98c6b087f15a0bfc')).to.equal('8eb208f7e05d987a9b044a8e98c6b087f15a0bfc');
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../../../dist/openpgp');
|
||||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../../..');
|
||||
|
||||
const chai = require('chai');
|
||||
|
||||
|
|
@ -6,7 +6,7 @@ const { util } = openpgp;
|
|||
const { hash } = openpgp.crypto;
|
||||
const { expect } = chai;
|
||||
|
||||
it('SHA* with test vectors from NIST FIPS 180-2', async function() {
|
||||
module.exports = () => it('SHA* with test vectors from NIST FIPS 180-2', async function() {
|
||||
expect(util.strToHex(util.uint8ArrayToStr(await hash.sha1(util.strToUint8Array('abc'))), 'hash.sha1("abc") = a9993e364706816aba3e25717850c26c9cd0d89d')).to.equal('a9993e364706816aba3e25717850c26c9cd0d89d');
|
||||
expect(util.strToHex(util.uint8ArrayToStr(await hash.sha1(util.strToUint8Array('abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq'))), 'hash.sha1("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq") = 84983e441c3bd26ebaae4aa1f95129e5e54670f1')).to.equal('84983e441c3bd26ebaae4aa1f95129e5e54670f1');
|
||||
expect(util.strToHex(util.uint8ArrayToStr(await hash.sha224(util.strToUint8Array('abc'))), 'hash.sha224("abc") = 23097d223405d8228642a477bda255b32aadbce4bda0b3f7e36c9da7')).to.equal('23097d223405d8228642a477bda255b32aadbce4bda0b3f7e36c9da7');
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
describe('Crypto', function () {
|
||||
require('./cipher');
|
||||
require('./hash');
|
||||
require('./random.js');
|
||||
require('./crypto.js');
|
||||
require('./elliptic.js');
|
||||
require('./ecdh.js');
|
||||
require('./pkcs5.js');
|
||||
require('./aes_kw.js');
|
||||
require('./eax.js');
|
||||
require('./ocb.js');
|
||||
require('./rsa.js');
|
||||
module.exports = () => describe('Crypto', function () {
|
||||
require('./cipher')();
|
||||
require('./hash')();
|
||||
require('./random.js')();
|
||||
require('./crypto.js')();
|
||||
require('./elliptic.js')();
|
||||
require('./ecdh.js')();
|
||||
require('./pkcs5.js')();
|
||||
require('./aes_kw.js')();
|
||||
require('./eax.js')();
|
||||
require('./ocb.js')();
|
||||
require('./rsa.js')();
|
||||
require('./validate.js');
|
||||
});
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
// Adapted from https://github.com/artjomb/cryptojs-extension/blob/8c61d159/test/eax.js
|
||||
|
||||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../../dist/openpgp');
|
||||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../..');
|
||||
|
||||
const chai = require('chai');
|
||||
chai.use(require('chai-as-promised'));
|
||||
|
||||
const expect = chai.expect;
|
||||
|
||||
describe('Symmetric AES-OCB', function() {
|
||||
module.exports = () => describe('Symmetric AES-OCB', function() {
|
||||
it('Passes all test vectors', async function() {
|
||||
const K = '000102030405060708090A0B0C0D0E0F';
|
||||
const keyBytes = openpgp.util.hexToUint8Array(K);
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../../dist/openpgp');
|
||||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../..');
|
||||
|
||||
const expect = require('chai').expect;
|
||||
|
||||
describe('PKCS5 padding', function() {
|
||||
module.exports = () => describe('PKCS5 padding', function() {
|
||||
function repeat(pattern, count) {
|
||||
let result = '';
|
||||
for (let k = 0; k < count; ++k) {
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../../dist/openpgp');
|
||||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../..');
|
||||
|
||||
const chai = require('chai');
|
||||
|
||||
const { expect } = chai;
|
||||
|
||||
describe('Random Buffer', function() {
|
||||
module.exports = () => describe('Random Buffer', function() {
|
||||
let randomBuffer;
|
||||
|
||||
before(function() {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../../dist/openpgp');
|
||||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../..');
|
||||
const chai = require('chai');
|
||||
|
||||
chai.use(require('chai-as-promised'));
|
||||
|
|
@ -8,7 +8,7 @@ const expect = chai.expect;
|
|||
/* eslint-disable no-unused-expressions */
|
||||
/* eslint-disable no-invalid-this */
|
||||
const native = openpgp.util.getWebCrypto() || openpgp.util.getNodeCrypto();
|
||||
(!native ? describe.skip : describe)('basic RSA cryptography with native crypto', function () {
|
||||
module.exports = () => (!native ? describe.skip : describe)('basic RSA cryptography with native crypto', function () {
|
||||
it('generate rsa key', async function() {
|
||||
const bits = openpgp.util.getWebCryptoAll() ? 2048 : 1024;
|
||||
const keyObject = await openpgp.crypto.publicKey.rsa.generate(bits, "10001");
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../../dist/openpgp');
|
||||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../..');
|
||||
|
||||
const chai = require('chai');
|
||||
|
||||
const { expect } = chai;
|
||||
|
||||
describe("ASCII armor", function() {
|
||||
module.exports = () => describe("ASCII armor", function() {
|
||||
|
||||
function getArmor(headers, signatureHeaders) {
|
||||
return ['-----BEGIN PGP SIGNED MESSAGE-----']
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/* globals tryTests: true */
|
||||
|
||||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../../dist/openpgp');
|
||||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../..');
|
||||
|
||||
const chai = require('chai');
|
||||
chai.use(require('chai-as-promised'));
|
||||
|
|
@ -8,7 +8,7 @@ const input = require('./testInputs.js');
|
|||
|
||||
const expect = chai.expect;
|
||||
|
||||
(openpgp.config.ci ? describe.skip : describe)('Brainpool Cryptography @lightweight', function () {
|
||||
module.exports = () => (openpgp.config.ci ? describe.skip : describe)('Brainpool Cryptography @lightweight', function () {
|
||||
//only x25519 crypto is fully functional in lightbuild
|
||||
if (!openpgp.config.useIndutnyElliptic && !openpgp.util.getNodeCrypto()) {
|
||||
before(function() {
|
||||
|
|
@ -271,6 +271,10 @@ EJ4QcD/oQ6x1M/8X/iKQCtxZP8RnlrbH7ExkNON5s5g=
|
|||
expect(result.signatures).to.have.length(1);
|
||||
expect(result.signatures[0].valid).to.be.true;
|
||||
});
|
||||
|
||||
tryTests('Brainpool Omnibus Tests @lightweight', omnibus, {
|
||||
if: openpgp.config.useIndutnyElliptic || openpgp.util.getNodeCrypto()
|
||||
});
|
||||
});
|
||||
|
||||
function omnibus() {
|
||||
|
|
@ -335,8 +339,4 @@ function omnibus() {
|
|||
});
|
||||
}
|
||||
|
||||
tryTests('Brainpool Omnibus Tests @lightweight', omnibus, {
|
||||
if: !openpgp.config.ci && (openpgp.config.useIndutnyElliptic || openpgp.util.getNodeCrypto())
|
||||
});
|
||||
|
||||
// TODO find test vectors
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../../dist/openpgp');
|
||||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../..');
|
||||
|
||||
const chai = require('chai');
|
||||
chai.use(require('chai-as-promised'));
|
||||
|
|
@ -40,7 +40,7 @@ Xg==
|
|||
}
|
||||
};
|
||||
|
||||
describe('Decrypt and decompress message tests', function () {
|
||||
module.exports = () => describe('Decrypt and decompress message tests', function () {
|
||||
|
||||
function runTest(key, test) {
|
||||
it(`Decrypts message compressed with ${key}`, async function () {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/* globals tryTests: true */
|
||||
|
||||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../../dist/openpgp');
|
||||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../..');
|
||||
|
||||
const chai = require('chai');
|
||||
chai.use(require('chai-as-promised'));
|
||||
|
|
@ -8,7 +8,7 @@ const input = require('./testInputs.js');
|
|||
|
||||
const expect = chai.expect;
|
||||
|
||||
describe('Elliptic Curve Cryptography for NIST P-256,P-384,P-521 curves @lightweight', function () {
|
||||
module.exports = () => describe('Elliptic Curve Cryptography for NIST P-256,P-384,P-521 curves @lightweight', function () {
|
||||
function omnibus() {
|
||||
it('Omnibus NIST P-256 Test', function () {
|
||||
const options = { userIds: {name: "Hi", email: "hi@hel.lo"}, curve: "p256" };
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
/* globals tryTests: true */
|
||||
|
||||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../../dist/openpgp');
|
||||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../..');
|
||||
|
||||
const chai = require('chai');
|
||||
chai.use(require('chai-as-promised'));
|
||||
|
||||
const expect = chai.expect;
|
||||
|
||||
describe('Elliptic Curve Cryptography for secp256k1 curve @lightweight', function () {
|
||||
module.exports = () => describe('Elliptic Curve Cryptography for secp256k1 curve @lightweight', function () {
|
||||
if (!openpgp.config.useIndutnyElliptic && !openpgp.util.getNodeCrypto()) {
|
||||
before(function() {
|
||||
this.skip();
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../../dist/openpgp');
|
||||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../..');
|
||||
|
||||
const chai = require('chai');
|
||||
|
||||
const { expect } = chai;
|
||||
|
||||
describe.skip('HKP unit tests', function() {
|
||||
module.exports = () => describe.skip('HKP unit tests', function() {
|
||||
this.timeout(60000);
|
||||
|
||||
let hkp;
|
||||
|
|
|
|||
|
|
@ -1,19 +1,19 @@
|
|||
describe('General', function () {
|
||||
require('./util.js');
|
||||
require('./armor.js');
|
||||
require('./packet.js');
|
||||
require('./keyring.js');
|
||||
require('./signature.js');
|
||||
require('./key.js');
|
||||
require('./openpgp.js');
|
||||
require('./hkp.js');
|
||||
require('./wkd.js');
|
||||
require('./oid.js');
|
||||
require('./ecc_nist.js');
|
||||
require('./ecc_secp256k1.js');
|
||||
require('./x25519.js');
|
||||
require('./brainpool.js');
|
||||
require('./decompression.js');
|
||||
require('./streaming.js');
|
||||
module.exports = () => describe('General', function () {
|
||||
require('./util.js')();
|
||||
require('./armor.js')();
|
||||
require('./packet.js')();
|
||||
require('./keyring.js')();
|
||||
require('./signature.js')();
|
||||
require('./key.js')();
|
||||
require('./openpgp.js')();
|
||||
require('./hkp.js')();
|
||||
require('./wkd.js')();
|
||||
require('./oid.js')();
|
||||
require('./ecc_nist.js')();
|
||||
require('./ecc_secp256k1.js')();
|
||||
require('./x25519.js')();
|
||||
require('./brainpool.js')();
|
||||
require('./decompression.js')();
|
||||
require('./streaming.js')();
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/* globals tryTests: true */
|
||||
|
||||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../../dist/openpgp');
|
||||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../..');
|
||||
|
||||
const stub = require('sinon/lib/sinon/stub');
|
||||
const chai = require('chai');
|
||||
|
|
@ -2529,15 +2529,19 @@ function versionSpecificTests() {
|
|||
});
|
||||
}
|
||||
|
||||
describe('Key', function() {
|
||||
module.exports = () => describe('Key', function() {
|
||||
let rsaGenStub;
|
||||
let v5KeysVal;
|
||||
let aeadProtectVal;
|
||||
let rsaGenValue = openpgp.crypto.publicKey.rsa.generate(openpgp.util.getWebCryptoAll() ? 2048 : 512, "10001");
|
||||
let rsaGenValue = {
|
||||
512: openpgp.crypto.publicKey.rsa.generate(512, "10001"),
|
||||
1024: openpgp.crypto.publicKey.rsa.generate(1024, "10001"),
|
||||
2048: openpgp.crypto.publicKey.rsa.generate(2048, "10001")
|
||||
};
|
||||
|
||||
beforeEach(function() {
|
||||
rsaGenStub = stub(openpgp.crypto.publicKey.rsa, 'generate');
|
||||
rsaGenStub.returns(rsaGenValue);
|
||||
rsaGenStub.callsFake(N => rsaGenValue[N]);
|
||||
});
|
||||
|
||||
afterEach(function() {
|
||||
|
|
@ -3314,187 +3318,188 @@ VYGdb3eNlV8CfoEC
|
|||
await k.encrypt('pass');
|
||||
})()).to.be.rejectedWith('Key packet is already encrypted');
|
||||
});
|
||||
});
|
||||
|
||||
describe('addSubkey functionality testing', function(){
|
||||
let rsaBits;
|
||||
let rsaOpt = {};
|
||||
if (openpgp.util.getWebCryptoAll()) {
|
||||
rsaBits = 2048;
|
||||
rsaOpt = { rsaBits: rsaBits };
|
||||
}
|
||||
it('create and add a new rsa subkey to stored rsa key', async function() {
|
||||
const privateKey = await openpgp.key.readArmored(priv_key_rsa);
|
||||
await privateKey.decrypt('hello world');
|
||||
const total = privateKey.subKeys.length;
|
||||
let newPrivateKey = await privateKey.addSubkey(rsaOpt);
|
||||
const armoredKey = newPrivateKey.armor();
|
||||
newPrivateKey = await openpgp.key.readArmored(armoredKey);
|
||||
const subKey = newPrivateKey.subKeys[total];
|
||||
expect(subKey).to.exist;
|
||||
expect(newPrivateKey.subKeys.length).to.be.equal(total+1);
|
||||
const subkeyN = subKey.keyPacket.params[0];
|
||||
const pkN = privateKey.primaryKey.params[0];
|
||||
expect(subkeyN.byteLength()).to.be.equal(rsaBits ? (rsaBits / 8) : pkN.byteLength());
|
||||
expect(subKey.getAlgorithmInfo().algorithm).to.be.equal('rsaEncryptSign');
|
||||
expect(subKey.getAlgorithmInfo().rsaBits).to.be.equal(rsaBits || privateKey.getAlgorithmInfo().rsaBits);
|
||||
await subKey.verify(newPrivateKey.primaryKey);
|
||||
});
|
||||
|
||||
it('should throw when trying to encrypt a subkey separately from key', async function() {
|
||||
const privateKey = await openpgp.key.readArmored(priv_key_rsa);
|
||||
await privateKey.decrypt('hello world');
|
||||
const opt = { rsaBits: rsaBits, passphrase: 'subkey passphrase'};
|
||||
await expect(privateKey.addSubkey(opt)).to.be.rejectedWith('Subkey could not be encrypted here, please encrypt whole key');
|
||||
});
|
||||
|
||||
it('encrypt and decrypt key with added subkey', async function() {
|
||||
const privateKey = await openpgp.key.readArmored(priv_key_rsa);
|
||||
await privateKey.decrypt('hello world');
|
||||
const total = privateKey.subKeys.length;
|
||||
let newPrivateKey = await privateKey.addSubkey(rsaOpt);
|
||||
newPrivateKey = await openpgp.key.readArmored(newPrivateKey.armor());
|
||||
await newPrivateKey.encrypt('12345678');
|
||||
const armoredKey = newPrivateKey.armor();
|
||||
let importedPrivateKey = await openpgp.key.readArmored(armoredKey);
|
||||
await importedPrivateKey.decrypt('12345678');
|
||||
const subKey = importedPrivateKey.subKeys[total];
|
||||
expect(subKey).to.exist;
|
||||
expect(importedPrivateKey.subKeys.length).to.be.equal(total+1);
|
||||
await subKey.verify(importedPrivateKey.primaryKey);
|
||||
});
|
||||
|
||||
it('create and add a new ec subkey to a ec key', async function() {
|
||||
const userId = 'test <a@b.com>';
|
||||
const opt = {curve: 'curve25519', userIds: [userId], subkeys:[]};
|
||||
const privateKey = (await openpgp.generateKey(opt)).key;
|
||||
const total = privateKey.subKeys.length;
|
||||
const opt2 = {curve: 'curve25519', userIds: [userId], sign: true};
|
||||
let newPrivateKey = await privateKey.addSubkey(opt2);
|
||||
const subKey1 = newPrivateKey.subKeys[total];
|
||||
await newPrivateKey.encrypt('12345678');
|
||||
const armoredKey = newPrivateKey.armor();
|
||||
newPrivateKey = await openpgp.key.readArmored(armoredKey);
|
||||
await newPrivateKey.decrypt('12345678');
|
||||
const subKey = newPrivateKey.subKeys[total];
|
||||
expect(subKey.isDecrypted()).to.be.true;
|
||||
expect(subKey1.getKeyId().toHex()).to.be.equal(subKey.getKeyId().toHex());
|
||||
expect(subKey).to.exist;
|
||||
expect(newPrivateKey.subKeys.length).to.be.equal(total+1);
|
||||
const subkeyOid = subKey.keyPacket.params[0];
|
||||
const pkOid = privateKey.primaryKey.params[0];
|
||||
expect(subkeyOid.getName()).to.be.equal(pkOid.getName());
|
||||
expect(subKey.getAlgorithmInfo().algorithm).to.be.equal('eddsa');
|
||||
await subKey.verify(privateKey.primaryKey);
|
||||
});
|
||||
|
||||
it('create and add a new ec subkey to a rsa key', async function() {
|
||||
const privateKey = await openpgp.key.readArmored(priv_key_rsa);
|
||||
await privateKey.decrypt('hello world');
|
||||
const total = privateKey.subKeys.length;
|
||||
const opt2 = {curve: 'curve25519'};
|
||||
let newPrivateKey = await privateKey.addSubkey(opt2);
|
||||
const armoredKey = newPrivateKey.armor();
|
||||
newPrivateKey = await openpgp.key.readArmored(armoredKey);
|
||||
const subKey = newPrivateKey.subKeys[total];
|
||||
expect(subKey).to.exist;
|
||||
expect(newPrivateKey.subKeys.length).to.be.equal(total+1);
|
||||
expect(subKey.keyPacket.params[0].getName()).to.be.equal(openpgp.enums.curve.curve25519);
|
||||
expect(subKey.getAlgorithmInfo().algorithm).to.be.equal('ecdh');
|
||||
await subKey.verify(privateKey.primaryKey);
|
||||
});
|
||||
|
||||
it('sign/verify data with the new subkey correctly using curve25519', async function() {
|
||||
const userId = 'test <a@b.com>';
|
||||
const opt = {curve: 'curve25519', userIds: [userId], subkeys:[]};
|
||||
const privateKey = (await openpgp.generateKey(opt)).key;
|
||||
const total = privateKey.subKeys.length;
|
||||
const opt2 = {sign: true};
|
||||
let newPrivateKey = await privateKey.addSubkey(opt2);
|
||||
const armoredKey = newPrivateKey.armor();
|
||||
newPrivateKey = await openpgp.key.readArmored(armoredKey);
|
||||
const subKey = newPrivateKey.subKeys[total];
|
||||
const subkeyOid = subKey.keyPacket.params[0];
|
||||
const pkOid = newPrivateKey.primaryKey.params[0];
|
||||
expect(subkeyOid.getName()).to.be.equal(pkOid.getName());
|
||||
expect(subKey.getAlgorithmInfo().algorithm).to.be.equal('eddsa');
|
||||
await subKey.verify(newPrivateKey.primaryKey);
|
||||
expect(await newPrivateKey.getSigningKey()).to.be.equal(subKey);
|
||||
const signed = await openpgp.sign({message: openpgp.message.fromText('the data to signed'), privateKeys: newPrivateKey, armor:false});
|
||||
const message = await openpgp.message.read(signed);
|
||||
const { signatures } = await openpgp.verify({message, publicKeys: [newPrivateKey.toPublic()]});
|
||||
expect(signatures).to.exist;
|
||||
expect(signatures.length).to.be.equal(1);
|
||||
expect(signatures[0].keyid.toHex()).to.be.equal(subKey.getKeyId().toHex());
|
||||
expect(await signatures[0].verified).to.be.true;
|
||||
});
|
||||
|
||||
it('encrypt/decrypt data with the new subkey correctly using curve25519', async function() {
|
||||
const userId = 'test <a@b.com>';
|
||||
const vData = 'the data to encrypted!';
|
||||
const opt = {curve: 'curve25519', userIds: [userId], subkeys:[]};
|
||||
const privateKey = (await openpgp.generateKey(opt)).key;
|
||||
const total = privateKey.subKeys.length;
|
||||
let newPrivateKey = await privateKey.addSubkey();
|
||||
const armoredKey = newPrivateKey.armor();
|
||||
newPrivateKey = await openpgp.key.readArmored(armoredKey);
|
||||
const subKey = newPrivateKey.subKeys[total];
|
||||
const publicKey = newPrivateKey.toPublic();
|
||||
await subKey.verify(newPrivateKey.primaryKey);
|
||||
expect(await newPrivateKey.getEncryptionKey()).to.be.equal(subKey);
|
||||
const encrypted = await openpgp.encrypt({message: openpgp.message.fromText(vData), publicKeys: publicKey, armor:false});
|
||||
expect(encrypted).to.be.exist;
|
||||
const message = await openpgp.message.read(encrypted);
|
||||
const pkSessionKeys = message.packets.filterByTag(openpgp.enums.packet.publicKeyEncryptedSessionKey);
|
||||
expect(pkSessionKeys).to.exist;
|
||||
expect(pkSessionKeys.length).to.be.equal(1);
|
||||
expect(pkSessionKeys[0].publicKeyId.toHex()).to.be.equals(subKey.keyPacket.getKeyId().toHex());
|
||||
const decrypted = await openpgp.decrypt({message, privateKeys: newPrivateKey})
|
||||
expect(decrypted).to.exist;
|
||||
expect(decrypted.data).to.be.equal(vData);
|
||||
});
|
||||
|
||||
it('sign/verify data with the new subkey correctly using rsa', async function() {
|
||||
const privateKey = await openpgp.key.readArmored(priv_key_rsa);
|
||||
await privateKey.decrypt('hello world');
|
||||
const total = privateKey.subKeys.length;
|
||||
const opt2 = { sign: true, rsaBits: rsaBits };
|
||||
let newPrivateKey = await privateKey.addSubkey(opt2);
|
||||
const armoredKey = newPrivateKey.armor();
|
||||
newPrivateKey = await openpgp.key.readArmored(armoredKey);
|
||||
const subKey = newPrivateKey.subKeys[total];
|
||||
expect(subKey.getAlgorithmInfo().algorithm).to.be.equal('rsaEncryptSign');
|
||||
await subKey.verify(newPrivateKey.primaryKey);
|
||||
expect(await newPrivateKey.getSigningKey()).to.be.equal(subKey);
|
||||
const signed = await openpgp.sign({message: openpgp.message.fromText('the data to signed'), privateKeys: newPrivateKey, armor:false});
|
||||
const message = await openpgp.message.read(signed);
|
||||
const { signatures } = await openpgp.verify({message, publicKeys: [newPrivateKey.toPublic()]});
|
||||
expect(signatures).to.exist;
|
||||
expect(signatures.length).to.be.equal(1);
|
||||
expect(signatures[0].keyid.toHex()).to.be.equal(subKey.getKeyId().toHex());
|
||||
expect(await signatures[0].verified).to.be.true;
|
||||
});
|
||||
|
||||
it('encrypt/decrypt data with the new subkey correctly using rsa', async function() {
|
||||
const privateKey = await openpgp.key.readArmored(priv_key_rsa);
|
||||
await privateKey.decrypt('hello world');
|
||||
const total = privateKey.subKeys.length;
|
||||
let newPrivateKey = await privateKey.addSubkey(rsaOpt);
|
||||
const armoredKey = newPrivateKey.armor();
|
||||
newPrivateKey = await openpgp.key.readArmored(armoredKey);
|
||||
const subKey = newPrivateKey.subKeys[total];
|
||||
const publicKey = newPrivateKey.toPublic();
|
||||
const vData = 'the data to encrypted!';
|
||||
expect(await newPrivateKey.getEncryptionKey()).to.be.equal(subKey);
|
||||
const encrypted = await openpgp.encrypt({message: openpgp.message.fromText(vData), publicKeys: publicKey, armor:false});
|
||||
expect(encrypted).to.be.exist;
|
||||
const message = await openpgp.message.read(encrypted);
|
||||
const pkSessionKeys = message.packets.filterByTag(openpgp.enums.packet.publicKeyEncryptedSessionKey);
|
||||
expect(pkSessionKeys).to.exist;
|
||||
expect(pkSessionKeys.length).to.be.equal(1);
|
||||
expect(pkSessionKeys[0].publicKeyId.toHex()).to.be.equals(subKey.keyPacket.getKeyId().toHex());
|
||||
const decrypted = await openpgp.decrypt({message, privateKeys: newPrivateKey})
|
||||
expect(decrypted).to.exist;
|
||||
expect(decrypted.data).to.be.equal(vData);
|
||||
});
|
||||
|
||||
describe('addSubkey functionality testing', function() {
|
||||
let rsaBits;
|
||||
let rsaOpt = {};
|
||||
if (openpgp.util.getWebCryptoAll()) {
|
||||
rsaBits = 2048;
|
||||
rsaOpt = { rsaBits: rsaBits };
|
||||
}
|
||||
it('create and add a new rsa subkey to stored rsa key', async function() {
|
||||
const privateKey = await openpgp.key.readArmored(priv_key_rsa);
|
||||
await privateKey.decrypt('hello world');
|
||||
const total = privateKey.subKeys.length;
|
||||
let newPrivateKey = await privateKey.addSubkey(rsaOpt);
|
||||
const armoredKey = newPrivateKey.armor();
|
||||
newPrivateKey = await openpgp.key.readArmored(armoredKey);
|
||||
const subKey = newPrivateKey.subKeys[total];
|
||||
expect(subKey).to.exist;
|
||||
expect(newPrivateKey.subKeys.length).to.be.equal(total+1);
|
||||
const subkeyN = subKey.keyPacket.params[0];
|
||||
const pkN = privateKey.primaryKey.params[0];
|
||||
expect(subkeyN.byteLength()).to.be.equal(rsaBits ? (rsaBits / 8) : pkN.byteLength());
|
||||
expect(subKey.getAlgorithmInfo().algorithm).to.be.equal('rsaEncryptSign');
|
||||
expect(subKey.getAlgorithmInfo().rsaBits).to.be.equal(rsaBits || privateKey.getAlgorithmInfo().rsaBits);
|
||||
await subKey.verify(newPrivateKey.primaryKey);
|
||||
});
|
||||
|
||||
it('should throw when trying to encrypt a subkey separately from key', async function() {
|
||||
const privateKey = await openpgp.key.readArmored(priv_key_rsa);
|
||||
await privateKey.decrypt('hello world');
|
||||
const opt = { rsaBits: rsaBits, passphrase: 'subkey passphrase'};
|
||||
await expect(privateKey.addSubkey(opt)).to.be.rejectedWith('Subkey could not be encrypted here, please encrypt whole key');
|
||||
});
|
||||
|
||||
it('encrypt and decrypt key with added subkey', async function() {
|
||||
const privateKey = await openpgp.key.readArmored(priv_key_rsa);
|
||||
await privateKey.decrypt('hello world');
|
||||
const total = privateKey.subKeys.length;
|
||||
let newPrivateKey = await privateKey.addSubkey(rsaOpt);
|
||||
newPrivateKey = await openpgp.key.readArmored(newPrivateKey.armor());
|
||||
await newPrivateKey.encrypt('12345678');
|
||||
const armoredKey = newPrivateKey.armor();
|
||||
let importedPrivateKey = await openpgp.key.readArmored(armoredKey);
|
||||
await importedPrivateKey.decrypt('12345678');
|
||||
const subKey = importedPrivateKey.subKeys[total];
|
||||
expect(subKey).to.exist;
|
||||
expect(importedPrivateKey.subKeys.length).to.be.equal(total+1);
|
||||
await subKey.verify(importedPrivateKey.primaryKey);
|
||||
});
|
||||
|
||||
it('create and add a new ec subkey to a ec key', async function() {
|
||||
const userId = 'test <a@b.com>';
|
||||
const opt = {curve: 'curve25519', userIds: [userId], subkeys:[]};
|
||||
const privateKey = (await openpgp.generateKey(opt)).key;
|
||||
const total = privateKey.subKeys.length;
|
||||
const opt2 = {curve: 'curve25519', userIds: [userId], sign: true};
|
||||
let newPrivateKey = await privateKey.addSubkey(opt2);
|
||||
const subKey1 = newPrivateKey.subKeys[total];
|
||||
await newPrivateKey.encrypt('12345678');
|
||||
const armoredKey = newPrivateKey.armor();
|
||||
newPrivateKey = await openpgp.key.readArmored(armoredKey);
|
||||
await newPrivateKey.decrypt('12345678');
|
||||
const subKey = newPrivateKey.subKeys[total];
|
||||
expect(subKey.isDecrypted()).to.be.true;
|
||||
expect(subKey1.getKeyId().toHex()).to.be.equal(subKey.getKeyId().toHex());
|
||||
expect(subKey).to.exist;
|
||||
expect(newPrivateKey.subKeys.length).to.be.equal(total+1);
|
||||
const subkeyOid = subKey.keyPacket.params[0];
|
||||
const pkOid = privateKey.primaryKey.params[0];
|
||||
expect(subkeyOid.getName()).to.be.equal(pkOid.getName());
|
||||
expect(subKey.getAlgorithmInfo().algorithm).to.be.equal('eddsa');
|
||||
await subKey.verify(privateKey.primaryKey);
|
||||
});
|
||||
|
||||
it('create and add a new ec subkey to a rsa key', async function() {
|
||||
const privateKey = await openpgp.key.readArmored(priv_key_rsa);
|
||||
await privateKey.decrypt('hello world');
|
||||
const total = privateKey.subKeys.length;
|
||||
const opt2 = {curve: 'curve25519'};
|
||||
let newPrivateKey = await privateKey.addSubkey(opt2);
|
||||
const armoredKey = newPrivateKey.armor();
|
||||
newPrivateKey = await openpgp.key.readArmored(armoredKey);
|
||||
const subKey = newPrivateKey.subKeys[total];
|
||||
expect(subKey).to.exist;
|
||||
expect(newPrivateKey.subKeys.length).to.be.equal(total+1);
|
||||
expect(subKey.keyPacket.params[0].getName()).to.be.equal(openpgp.enums.curve.curve25519);
|
||||
expect(subKey.getAlgorithmInfo().algorithm).to.be.equal('ecdh');
|
||||
await subKey.verify(privateKey.primaryKey);
|
||||
});
|
||||
|
||||
it('sign/verify data with the new subkey correctly using curve25519', async function() {
|
||||
const userId = 'test <a@b.com>';
|
||||
const opt = {curve: 'curve25519', userIds: [userId], subkeys:[]};
|
||||
const privateKey = (await openpgp.generateKey(opt)).key;
|
||||
const total = privateKey.subKeys.length;
|
||||
const opt2 = {sign: true};
|
||||
let newPrivateKey = await privateKey.addSubkey(opt2);
|
||||
const armoredKey = newPrivateKey.armor();
|
||||
newPrivateKey = await openpgp.key.readArmored(armoredKey);
|
||||
const subKey = newPrivateKey.subKeys[total];
|
||||
const subkeyOid = subKey.keyPacket.params[0];
|
||||
const pkOid = newPrivateKey.primaryKey.params[0];
|
||||
expect(subkeyOid.getName()).to.be.equal(pkOid.getName());
|
||||
expect(subKey.getAlgorithmInfo().algorithm).to.be.equal('eddsa');
|
||||
await subKey.verify(newPrivateKey.primaryKey);
|
||||
expect(await newPrivateKey.getSigningKey()).to.be.equal(subKey);
|
||||
const signed = await openpgp.sign({message: openpgp.message.fromText('the data to signed'), privateKeys: newPrivateKey, armor:false});
|
||||
const message = await openpgp.message.read(signed);
|
||||
const { signatures } = await openpgp.verify({message, publicKeys: [newPrivateKey.toPublic()]});
|
||||
expect(signatures).to.exist;
|
||||
expect(signatures.length).to.be.equal(1);
|
||||
expect(signatures[0].keyid.toHex()).to.be.equal(subKey.getKeyId().toHex());
|
||||
expect(await signatures[0].verified).to.be.true;
|
||||
});
|
||||
|
||||
it('encrypt/decrypt data with the new subkey correctly using curve25519', async function() {
|
||||
const userId = 'test <a@b.com>';
|
||||
const vData = 'the data to encrypted!';
|
||||
const opt = {curve: 'curve25519', userIds: [userId], subkeys:[]};
|
||||
const privateKey = (await openpgp.generateKey(opt)).key;
|
||||
const total = privateKey.subKeys.length;
|
||||
let newPrivateKey = await privateKey.addSubkey();
|
||||
const armoredKey = newPrivateKey.armor();
|
||||
newPrivateKey = await openpgp.key.readArmored(armoredKey);
|
||||
const subKey = newPrivateKey.subKeys[total];
|
||||
const publicKey = newPrivateKey.toPublic();
|
||||
await subKey.verify(newPrivateKey.primaryKey);
|
||||
expect(await newPrivateKey.getEncryptionKey()).to.be.equal(subKey);
|
||||
const encrypted = await openpgp.encrypt({message: openpgp.message.fromText(vData), publicKeys: publicKey, armor:false});
|
||||
expect(encrypted).to.be.exist;
|
||||
const message = await openpgp.message.read(encrypted);
|
||||
const pkSessionKeys = message.packets.filterByTag(openpgp.enums.packet.publicKeyEncryptedSessionKey);
|
||||
expect(pkSessionKeys).to.exist;
|
||||
expect(pkSessionKeys.length).to.be.equal(1);
|
||||
expect(pkSessionKeys[0].publicKeyId.toHex()).to.be.equals(subKey.keyPacket.getKeyId().toHex());
|
||||
const decrypted = await openpgp.decrypt({message, privateKeys: newPrivateKey})
|
||||
expect(decrypted).to.exist;
|
||||
expect(decrypted.data).to.be.equal(vData);
|
||||
});
|
||||
|
||||
it('sign/verify data with the new subkey correctly using rsa', async function() {
|
||||
const privateKey = await openpgp.key.readArmored(priv_key_rsa);
|
||||
await privateKey.decrypt('hello world');
|
||||
const total = privateKey.subKeys.length;
|
||||
const opt2 = { sign: true, rsaBits: rsaBits };
|
||||
let newPrivateKey = await privateKey.addSubkey(opt2);
|
||||
const armoredKey = newPrivateKey.armor();
|
||||
newPrivateKey = await openpgp.key.readArmored(armoredKey);
|
||||
const subKey = newPrivateKey.subKeys[total];
|
||||
expect(subKey.getAlgorithmInfo().algorithm).to.be.equal('rsaEncryptSign');
|
||||
await subKey.verify(newPrivateKey.primaryKey);
|
||||
expect(await newPrivateKey.getSigningKey()).to.be.equal(subKey);
|
||||
const signed = await openpgp.sign({message: openpgp.message.fromText('the data to signed'), privateKeys: newPrivateKey, armor:false});
|
||||
const message = await openpgp.message.read(signed);
|
||||
const { signatures } = await openpgp.verify({message, publicKeys: [newPrivateKey.toPublic()]});
|
||||
expect(signatures).to.exist;
|
||||
expect(signatures.length).to.be.equal(1);
|
||||
expect(signatures[0].keyid.toHex()).to.be.equal(subKey.getKeyId().toHex());
|
||||
expect(await signatures[0].verified).to.be.true;
|
||||
});
|
||||
|
||||
it('encrypt/decrypt data with the new subkey correctly using rsa', async function() {
|
||||
const privateKey = await openpgp.key.readArmored(priv_key_rsa);
|
||||
await privateKey.decrypt('hello world');
|
||||
const total = privateKey.subKeys.length;
|
||||
let newPrivateKey = await privateKey.addSubkey(rsaOpt);
|
||||
const armoredKey = newPrivateKey.armor();
|
||||
newPrivateKey = await openpgp.key.readArmored(armoredKey);
|
||||
const subKey = newPrivateKey.subKeys[total];
|
||||
const publicKey = newPrivateKey.toPublic();
|
||||
const vData = 'the data to encrypted!';
|
||||
expect(await newPrivateKey.getEncryptionKey()).to.be.equal(subKey);
|
||||
const encrypted = await openpgp.encrypt({message: openpgp.message.fromText(vData), publicKeys: publicKey, armor:false});
|
||||
expect(encrypted).to.be.exist;
|
||||
const message = await openpgp.message.read(encrypted);
|
||||
const pkSessionKeys = message.packets.filterByTag(openpgp.enums.packet.publicKeyEncryptedSessionKey);
|
||||
expect(pkSessionKeys).to.exist;
|
||||
expect(pkSessionKeys.length).to.be.equal(1);
|
||||
expect(pkSessionKeys[0].publicKeyId.toHex()).to.be.equals(subKey.keyPacket.getKeyId().toHex());
|
||||
const decrypted = await openpgp.decrypt({message, privateKeys: newPrivateKey})
|
||||
expect(decrypted).to.exist;
|
||||
expect(decrypted.data).to.be.equal(vData);
|
||||
});
|
||||
});
|
||||
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../../dist/openpgp');
|
||||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../..');
|
||||
|
||||
const chai = require('chai');
|
||||
|
||||
|
|
@ -6,7 +6,7 @@ const { expect } = chai;
|
|||
|
||||
const keyring = new openpgp.Keyring();
|
||||
|
||||
describe("Keyring", async function() {
|
||||
module.exports = () => describe("Keyring", async function() {
|
||||
const user = 'whiteout.test@t-online.de';
|
||||
const passphrase = 'asdf';
|
||||
const keySize = 512;
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../../dist/openpgp');
|
||||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../..');
|
||||
|
||||
const expect = require('chai').expect;
|
||||
|
||||
describe('Oid tests', function() {
|
||||
module.exports = () => describe('Oid tests', function() {
|
||||
const OID = openpgp.OID;
|
||||
const util = openpgp.util;
|
||||
const p256_oid = new Uint8Array([0x2A, 0x86, 0x48, 0xCE, 0x3D, 0x03, 0x01, 0x07]);
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/* globals tryTests: true */
|
||||
|
||||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../../dist/openpgp');
|
||||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../..');
|
||||
|
||||
const spy = require('sinon/lib/sinon/spy');
|
||||
const stub = require('sinon/lib/sinon/stub');
|
||||
|
|
@ -483,7 +483,7 @@ function withCompression(tests) {
|
|||
});
|
||||
}
|
||||
|
||||
describe('OpenPGP.js public api tests', function() {
|
||||
module.exports = () => describe('OpenPGP.js public api tests', function() {
|
||||
|
||||
let rsaGenStub;
|
||||
let rsaGenValue = openpgp.crypto.publicKey.rsa.generate(openpgp.util.getWebCryptoAll() ? 2048 : 512, "10001");
|
||||
|
|
@ -582,53 +582,27 @@ describe('OpenPGP.js public api tests', function() {
|
|||
});
|
||||
|
||||
describe('generateKey - unit tests', function() {
|
||||
let keyGenStub;
|
||||
let keyObjStub;
|
||||
let getWebCryptoAllStub;
|
||||
|
||||
beforeEach(function() {
|
||||
keyObjStub = {
|
||||
armor: function() {
|
||||
return 'priv_key';
|
||||
},
|
||||
toPublic: function() {
|
||||
return {
|
||||
armor: function() {
|
||||
return 'pub_key';
|
||||
}
|
||||
};
|
||||
},
|
||||
getRevocationCertificate: function() {}
|
||||
};
|
||||
keyGenStub = stub(openpgp.key, 'generate');
|
||||
keyGenStub.returns(resolves(keyObjStub));
|
||||
getWebCryptoAllStub = stub(openpgp.util, 'getWebCryptoAll');
|
||||
});
|
||||
|
||||
afterEach(function() {
|
||||
keyGenStub.restore();
|
||||
getWebCryptoAllStub.restore();
|
||||
});
|
||||
|
||||
it('should have default params set', function() {
|
||||
const now = openpgp.util.normalizeDate(new Date());
|
||||
const opt = {
|
||||
userIds: { name: 'Test User', email: 'text@example.com' },
|
||||
passphrase: 'secret',
|
||||
date: now,
|
||||
subkeys: []
|
||||
date: now
|
||||
};
|
||||
return openpgp.generateKey(opt).then(function(newKey) {
|
||||
expect(keyGenStub.withArgs({
|
||||
userIds: [{ name: 'Test User', email: 'text@example.com' }],
|
||||
passphrase: 'secret',
|
||||
rsaBits: null,
|
||||
keyExpirationTime: 0,
|
||||
curve: "curve25519",
|
||||
date: now,
|
||||
subkeys: []
|
||||
}).calledOnce).to.be.true;
|
||||
return openpgp.generateKey(opt).then(async function(newKey) {
|
||||
expect(newKey.key).to.exist;
|
||||
expect(newKey.key.users.length).to.equal(1);
|
||||
expect(newKey.key.users[0].userId.name).to.equal('Test User');
|
||||
expect(newKey.key.users[0].userId.email).to.equal('text@example.com');
|
||||
expect(newKey.key.getAlgorithmInfo().rsaBits).to.equal(undefined);
|
||||
expect(newKey.key.getAlgorithmInfo().curve).to.equal('ed25519');
|
||||
expect(+newKey.key.getCreationTime()).to.equal(+now);
|
||||
expect(await newKey.key.getExpirationTime()).to.equal(Infinity);
|
||||
expect(newKey.key.subKeys.length).to.equal(1);
|
||||
expect(newKey.key.subKeys[0].getAlgorithmInfo().rsaBits).to.equal(undefined);
|
||||
expect(newKey.key.subKeys[0].getAlgorithmInfo().curve).to.equal('curve25519');
|
||||
expect(+newKey.key.subKeys[0].getCreationTime()).to.equal(+now);
|
||||
expect(await newKey.key.subKeys[0].getExpirationTime()).to.equal(Infinity);
|
||||
expect(newKey.privateKeyArmored).to.exist;
|
||||
expect(newKey.publicKeyArmored).to.exist;
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../../dist/openpgp');
|
||||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../..');
|
||||
|
||||
const stub = require('sinon/lib/sinon/stub');
|
||||
const chai = require('chai');
|
||||
|
|
@ -23,7 +23,7 @@ function stringify(array) {
|
|||
return result.join('');
|
||||
}
|
||||
|
||||
describe("Packet", function() {
|
||||
module.exports = () => describe("Packet", function() {
|
||||
const armored_key =
|
||||
'-----BEGIN PGP PRIVATE KEY BLOCK-----\n' +
|
||||
'Version: GnuPG v2.0.19 (GNU/Linux)\n' +
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../../dist/openpgp');
|
||||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../..');
|
||||
|
||||
const chai = require('chai');
|
||||
chai.use(require('chai-as-promised'));
|
||||
|
||||
const expect = chai.expect;
|
||||
|
||||
describe("Signature", function() {
|
||||
module.exports = () => describe("Signature", function() {
|
||||
const priv_key_arm1 =
|
||||
['-----BEGIN PGP PRIVATE KEY BLOCK-----',
|
||||
'Version: GnuPG v1.4.11 (GNU/Linux)',
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../../dist/openpgp');
|
||||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../..');
|
||||
|
||||
const stub = require('sinon/lib/sinon/stub');
|
||||
const chai = require('chai');
|
||||
|
|
@ -870,7 +870,7 @@ function tests() {
|
|||
});
|
||||
}
|
||||
|
||||
describe('Streaming', function() {
|
||||
module.exports = () => describe('Streaming', function() {
|
||||
let currentTest = 0;
|
||||
const aeadChunkSizeByteValue = openpgp.config.aeadChunkSizeByte;
|
||||
|
||||
|
|
@ -929,7 +929,7 @@ describe('Streaming', function() {
|
|||
});
|
||||
|
||||
if (openpgp.util.detectNode()) {
|
||||
const fs = util.nodeRequire('fs');
|
||||
const fs = require('fs');
|
||||
|
||||
it('Node: Encrypt and decrypt text message roundtrip', async function() {
|
||||
dataArrived(); // Do not wait until data arrived.
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../../dist/openpgp');
|
||||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../..');
|
||||
|
||||
const chai = require('chai');
|
||||
|
||||
const { expect } = chai;
|
||||
|
||||
describe('Util unit tests', function() {
|
||||
module.exports = () => describe('Util unit tests', function() {
|
||||
|
||||
describe('isString', function() {
|
||||
it('should return true for type "string"', function() {
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../../dist/openpgp');
|
||||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../..');
|
||||
|
||||
const chai = require('chai');
|
||||
|
||||
const { expect } = chai;
|
||||
|
||||
describe.skip('WKD unit tests', function() {
|
||||
module.exports = () => describe.skip('WKD unit tests', function() {
|
||||
this.timeout(60000);
|
||||
|
||||
let wkd;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../../dist/openpgp');
|
||||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../..');
|
||||
|
||||
const elliptic = openpgp.crypto.publicKey.elliptic;
|
||||
|
||||
|
|
@ -8,7 +8,7 @@ chai.use(require('chai-as-promised'));
|
|||
const { expect } = chai;
|
||||
const input = require('./testInputs');
|
||||
|
||||
(openpgp.config.ci ? describe.skip : describe)('X25519 Cryptography', function () {
|
||||
module.exports = () => (openpgp.config.ci ? describe.skip : describe)('X25519 Cryptography', function () {
|
||||
const data = {
|
||||
light: {
|
||||
id: '1ecdf026c0245830',
|
||||
|
|
@ -425,6 +425,8 @@ const input = require('./testInputs');
|
|||
hi.primaryKey, user.selfCertifications[0], [hi]
|
||||
);
|
||||
}); */
|
||||
|
||||
describe('X25519 Omnibus Tests', omnibus);
|
||||
});
|
||||
|
||||
// TODO export, then reimport key and validate
|
||||
|
|
@ -533,7 +535,3 @@ function omnibus() {
|
|||
});
|
||||
});
|
||||
}
|
||||
|
||||
tryTests('X25519 Omnibus Tests', omnibus, {
|
||||
if: !openpgp.config.ci
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
describe('Security', function () {
|
||||
require('./message_signature_bypass');
|
||||
require('./unsigned_subpackets');
|
||||
require('./subkey_trust');
|
||||
require('./preferred_algo_mismatch');
|
||||
module.exports = () => describe('Security', function () {
|
||||
require('./message_signature_bypass')();
|
||||
require('./unsigned_subpackets')();
|
||||
require('./subkey_trust')();
|
||||
require('./preferred_algo_mismatch')();
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../../dist/openpgp');
|
||||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../..');
|
||||
|
||||
const { key, cleartext, util, packet: { Signature } } = openpgp;
|
||||
|
||||
|
|
@ -109,4 +109,4 @@ async function fakeSignature() {
|
|||
expect(signatures).to.have.length(0);
|
||||
}
|
||||
|
||||
it('Does not accept non-binary/text signatures', fakeSignature);
|
||||
module.exports = () => it('Does not accept non-binary/text signatures', fakeSignature);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../../dist/openpgp');
|
||||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../..');
|
||||
|
||||
const { key, cleartext, enums, packet: { List, Signature } } = openpgp;
|
||||
|
||||
|
|
@ -42,7 +42,7 @@ EnxUPL95HuMKoVkf4w==
|
|||
=oopr
|
||||
-----END PGP PRIVATE KEY BLOCK-----`;
|
||||
|
||||
it('Does not accept message encrypted with algo not mentioned in preferred algorithms', async function() {
|
||||
module.exports = () => it('Does not accept message encrypted with algo not mentioned in preferred algorithms', async function() {
|
||||
const message = await openpgp.message.readArmored(messageArmor);
|
||||
const privKey = await openpgp.key.readArmored(privateKeyArmor);
|
||||
await expect(openpgp.decrypt({ message, privateKeys: [privKey] })).to.be.rejectedWith('A non-preferred symmetric algorithm was used.');
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../../dist/openpgp');
|
||||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../..');
|
||||
|
||||
const { key, cleartext, enums, packet: { List, Signature } } = openpgp;
|
||||
|
||||
|
|
@ -73,4 +73,4 @@ async function testSubkeyTrust() {
|
|||
expect(verifyAttackerIsBatman.signatures[0].valid).to.be.null;
|
||||
}
|
||||
|
||||
it('Does not trust subkeys without Primary Key Binding Signature', testSubkeyTrust);
|
||||
module.exports = () => it('Does not trust subkeys without Primary Key Binding Signature', testSubkeyTrust);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../../dist/openpgp');
|
||||
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../..');
|
||||
|
||||
const { key, message, enums, packet: { List, Signature } } = openpgp;
|
||||
|
||||
|
|
@ -91,4 +91,4 @@ async function makeKeyValid() {
|
|||
expect(await encryptFails(modifiedkey)).to.be.true;
|
||||
}
|
||||
|
||||
it('Does not accept unsigned subpackets', makeKeyValid);
|
||||
module.exports = () => it('Does not accept unsigned subpackets', makeKeyValid);
|
||||
|
|
|
|||
|
|
@ -6,11 +6,17 @@
|
|||
<link rel="stylesheet" href="lib/mocha.css" />
|
||||
|
||||
<!-- libs -->
|
||||
<script src="../dist/openpgp.js"></script>
|
||||
<script>
|
||||
if (window.location.search.includes('lightweight=')) {
|
||||
document.write('<script src="../dist/lightweight/openpgp.js"><\/script>');
|
||||
} else {
|
||||
document.write('<script src="../dist/openpgp.js"><\/script>');
|
||||
}
|
||||
</script>
|
||||
<script src="lib/mocha.js"></script>
|
||||
<script>
|
||||
mocha.setup('bdd');
|
||||
mocha.timeout(240000);
|
||||
mocha.setup('bdd');
|
||||
mocha.timeout(240000);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
|
|
|
|||
|
|
@ -34,21 +34,21 @@ describe('Unit Tests', function () {
|
|||
|
||||
if (typeof window !== 'undefined') {
|
||||
openpgp.config.s2kIterationCountByte = 0;
|
||||
openpgp.config.indutnyEllipticPath = '../dist/elliptic.min.js';
|
||||
openpgp.config.indutnyEllipticPath = '../dist/lightweight/elliptic.min.js';
|
||||
|
||||
window.location.search.substr(1).split('&').forEach(param => {
|
||||
const [key, value] = param.split('=');
|
||||
if (key && key !== 'grep') {
|
||||
openpgp.config[key] = decodeURIComponent(value);
|
||||
try {
|
||||
openpgp.config[key] = eval(openpgp.config[key]);
|
||||
openpgp.config[key] = window.eval(openpgp.config[key]);
|
||||
} catch(e) {}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
require('./crypto');
|
||||
require('./general');
|
||||
require('./worker');
|
||||
require('./security');
|
||||
require('./crypto')();
|
||||
require('./general')();
|
||||
require('./worker')();
|
||||
require('./security')();
|
||||
});
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ const chai = require('chai');
|
|||
|
||||
const { expect } = chai;
|
||||
|
||||
tryTests('Application Worker', tests, {
|
||||
module.exports = () => tryTests('Application Worker', tests, {
|
||||
if: typeof window !== 'undefined' && window.Worker && window.MessageChannel
|
||||
});
|
||||
|
||||
|
|
@ -15,7 +15,7 @@ function tests() {
|
|||
this.skip(); // Old Edge doesn't support crypto.getRandomValues inside a Worker.
|
||||
}
|
||||
try {
|
||||
eval('(async function() {})');
|
||||
globalThis.eval('(async function() {})');
|
||||
} catch (e) {
|
||||
console.error(e);
|
||||
this.skip();
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
describe('Web Worker', function () {
|
||||
require('./application_worker.js');
|
||||
module.exports = () => describe('Web Worker', function () {
|
||||
require('./application_worker.js')();
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -9,14 +9,13 @@ if [ $OPENPGPJSTEST = "coverage" ]; then
|
|||
|
||||
elif [ $OPENPGPJSTEST = "unit" ]; then
|
||||
echo "Running OpenPGP.js unit tests on node.js."
|
||||
grunt build test --lightweight=$LIGHTWEIGHT
|
||||
npm test ${LIGHTWEIGHT+ -- --grep lightweight}
|
||||
|
||||
elif [ $OPENPGPJSTEST = "browserstack" ]; then
|
||||
echo "Running OpenPGP.js browser unit tests on Browserstack."
|
||||
|
||||
grunt build browserify:unittests copy:browsertest --compat=$COMPAT --lightweight=$LIGHTWEIGHT
|
||||
echo -n "Using config: "
|
||||
echo "{\"browsers\": [$BROWSER], \"test_framework\": \"mocha\", \"test_path\": [\"test/unittests.html?ci=true\"], \"timeout\": 1800, \"exit_with_fail\": true, \"project\": \"openpgpjs/${TRAVIS_EVENT_TYPE:-push}${COMPAT:+/compat}${LIGHTWEIGHT:+/lightweight}\"}" > browserstack.json
|
||||
echo "{\"browsers\": [$BROWSER], \"test_framework\": \"mocha\", \"test_path\": [\"test/unittests.html?ci=true${LIGHTWEIGHT+&lightweight=true}\"], \"timeout\": 1800, \"exit_with_fail\": true, \"project\": \"openpgpjs/${TRAVIS_EVENT_TYPE:-push}${LIGHTWEIGHT:+/lightweight}\"}" > browserstack.json
|
||||
cat browserstack.json
|
||||
|
||||
result=0
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user