diff --git a/package-lock.json b/package-lock.json index 832dc5e1..68ce9878 100644 --- a/package-lock.json +++ b/package-lock.json @@ -176,6 +176,100 @@ "integrity": "sha512-OIfunNt/fTjIgDtUqXhBYOKtgaxm30ZWkMWegI9iS3xUHy2/A3AXki6/k+z40+BywNMi+spON/jSE0FF9WmUKA==", "dev": true }, + "@openpgp/asmcrypto.js": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/@openpgp/asmcrypto.js/-/asmcrypto.js-2.3.2.tgz", + "integrity": "sha512-CEb3I/Tqg+i5NgEnhYj3fi6XsT5JTuvYdwbMq+STGxlZ8uYSWmYFmVyz9vQgtNwCll/FbB6eR1opa4hoeHGceQ==", + "dev": true + }, + "@openpgp/elliptic": { + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/@openpgp/elliptic/-/elliptic-6.5.1.tgz", + "integrity": "sha512-VR20QWndMXoZTAzCUqauDT4dLrHO4RTnyVV3szuRHllQSU/JZToLvWtFxpEQth4XWyqlxHPwq7tljE5V97+n1g==", + "dev": true, + "requires": { + "bn.js": "^4.4.0", + "brorand": "^1.0.1", + "hash.js": "^1.0.0", + "hmac-drbg": "^1.0.0", + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0", + "minimalistic-crypto-utils": "^1.0.0" + } + }, + "@openpgp/jsdoc": { + "version": "3.6.4", + "resolved": "https://registry.npmjs.org/@openpgp/jsdoc/-/jsdoc-3.6.4.tgz", + "integrity": "sha512-PR4NtdOVev7wbUYe4/T0CeLDAr0qxDthBqUrqngKIHn6h+m9fgRz20vH5OBalIVYaDeHcUcxdwGbEFRT30/WSg==", + "dev": true, + "requires": { + "@babel/parser": "^7.9.4", + "bluebird": "^3.7.2", + "catharsis": "^0.8.11", + "escape-string-regexp": "^2.0.0", + "js2xmlparser": "^4.0.1", + "klaw": "^3.0.0", + "markdown-it": "^10.0.0", + "markdown-it-anchor": "^5.2.7", + "marked": "^0.8.2", + "mkdirp": "^1.0.4", + "requizzle": "^0.2.3", + "strip-json-comments": "^3.1.0", + "taffydb": "2.6.2", + "underscore": "~1.10.2" + }, + "dependencies": { + "escape-string-regexp": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", + "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", + "dev": true + }, + "mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "dev": true + }, + "strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true + } + } + }, + "@openpgp/pako": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/@openpgp/pako/-/pako-1.0.11.tgz", + "integrity": "sha512-XjrXK09rAI1gLN/nDUS+mO3wrQVbVjU0Gdhxn/n79QVkFANgIg56S/u5lvu5+MLN5kmiHm3V9UUiu3p9euqqFg==", + "dev": true + }, + "@openpgp/seek-bzip": { + "version": "1.0.5-git", + "resolved": "https://registry.npmjs.org/@openpgp/seek-bzip/-/seek-bzip-1.0.5-git.tgz", + "integrity": "sha512-1493w5yzXmAss9GEbNPYwX9UjROLfCTB8vjiTlT/HNzSH9b1FL4kJFH5iBV/+v6Ur5wlbCatGHinvqPeY0BwCw==", + "dev": true, + "requires": { + "commander": "~2.8.1" + } + }, + "@openpgp/tweetnacl": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@openpgp/tweetnacl/-/tweetnacl-1.0.3.tgz", + "integrity": "sha512-KGXNhU/mRg+uTsLGva55V340jwbX2pC8LndjOVI2oQ8vewPVTS2KnDOIXQ8O6KyT/c9Qy16KUQ5mwewe72m1Yw==", + "dev": true + }, + "@openpgp/web-stream-tools": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/@openpgp/web-stream-tools/-/web-stream-tools-0.0.1.tgz", + "integrity": "sha512-k3MqSRRjWkODJzsQdHeYxjG3IdmmtUXkXrz6XMq7aDT7GFTZPV/ZTbTHN93YkViPJNO3G0pS+FdO4Qy+UgGZpw==", + "dev": true, + "requires": { + "@mattiasbuelens/web-streams-adapter": "0.1.0-alpha.5", + "web-streams-polyfill": "~2.1.1" + } + }, "@rollup/plugin-commonjs": { "version": "11.1.0", "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-11.1.0.tgz", @@ -500,11 +594,6 @@ "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=", "dev": true }, - "asmcrypto.js": { - "version": "github:openpgpjs/asmcrypto#5b994303a9d3e27e0915f72a10b6c2c51535a4dc", - "from": "github:openpgpjs/asmcrypto#5b994303a9d3e27e0915f72a10b6c2c51535a4dc", - "dev": true - }, "asn1.js": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.0.0.tgz", @@ -1224,20 +1313,6 @@ "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=", "dev": true }, - "elliptic": { - "version": "github:openpgpjs/elliptic#ab7d8268c60b6abeb175841c578c224ac5b2d279", - "from": "github:openpgpjs/elliptic#ab7d8268c60b6abeb175841c578c224ac5b2d279", - "dev": true, - "requires": { - "bn.js": "^4.4.0", - "brorand": "^1.0.1", - "hash.js": "^1.0.0", - "hmac-drbg": "^1.0.0", - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0", - "minimalistic-crypto-utils": "^1.0.0" - } - }, "email-addresses": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/email-addresses/-/email-addresses-3.1.0.tgz", @@ -2707,47 +2782,6 @@ "xmlcreate": "^2.0.3" } }, - "jsdoc": { - "version": "github:openpgpjs/jsdoc#ff7cb3929586868bf91deb78a26d7e217e051a0f", - "from": "github:openpgpjs/jsdoc#ff7cb3929586868bf91deb78a26d7e217e051a0f", - "dev": true, - "requires": { - "@babel/parser": "^7.9.4", - "bluebird": "^3.7.2", - "catharsis": "^0.8.11", - "escape-string-regexp": "^2.0.0", - "js2xmlparser": "^4.0.1", - "klaw": "^3.0.0", - "markdown-it": "^10.0.0", - "markdown-it-anchor": "^5.2.7", - "marked": "^0.8.2", - "mkdirp": "^1.0.4", - "requizzle": "^0.2.3", - "strip-json-comments": "^3.1.0", - "taffydb": "2.6.2", - "underscore": "~1.10.2" - }, - "dependencies": { - "escape-string-regexp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", - "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", - "dev": true - }, - "mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", - "dev": true - }, - "strip-json-comments": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", - "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", - "dev": true - } - } - }, "jsesc": { "version": "2.5.2", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", @@ -3775,11 +3809,6 @@ } } }, - "pako": { - "version": "github:openpgpjs/pako#f38f7368a5fa511e54b95add2f04444c3a9d803f", - "from": "github:openpgpjs/pako#f38f7368a5fa511e54b95add2f04444c3a9d803f", - "dev": true - }, "parse-json": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", @@ -4221,14 +4250,6 @@ "integrity": "sha1-8aAymzCLIh+uN7mXTz1XjQypmeM=", "dev": true }, - "seek-bzip": { - "version": "github:openpgpjs/seek-bzip#4b89457f20c0e1921b4689106a31c99782c29829", - "from": "github:openpgpjs/seek-bzip#4b89457f20c0e1921b4689106a31c99782c29829", - "dev": true, - "requires": { - "commander": "~2.8.1" - } - }, "semver": { "version": "5.4.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz", @@ -4930,11 +4951,6 @@ "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==", "dev": true }, - "tweetnacl": { - "version": "github:openpgpjs/tweetnacl-js#3dae25bd3eaa77173f3405676b595721dde92eec", - "from": "github:openpgpjs/tweetnacl-js#3dae25bd3eaa77173f3405676b595721dde92eec", - "dev": true - }, "type-check": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", @@ -5057,15 +5073,6 @@ "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=", "dev": true }, - "web-stream-tools": { - "version": "github:openpgpjs/web-stream-tools#a60cfd8a4ae883e718440524151480b0d3d318c8", - "from": "github:openpgpjs/web-stream-tools#a60cfd8a4ae883e718440524151480b0d3d318c8", - "dev": true, - "requires": { - "@mattiasbuelens/web-streams-adapter": "0.1.0-alpha.5", - "web-streams-polyfill": "~2.1.1" - } - }, "web-streams-polyfill": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-2.1.1.tgz", diff --git a/package.json b/package.json index 85f66aea..4a40e022 100644 --- a/package.json +++ b/package.json @@ -52,17 +52,22 @@ }, "devDependencies": { "@mattiasbuelens/web-streams-adapter": "0.1.0-alpha.5", + "@openpgp/asmcrypto.js": "^2.3.2", + "@openpgp/elliptic": "^6.5.1", + "@openpgp/jsdoc": "^3.6.4", + "@openpgp/pako": "^1.0.11", + "@openpgp/seek-bzip": "^1.0.5-git", + "@openpgp/tweetnacl": "^1.0.3", + "@openpgp/web-stream-tools": "0.0.1", "@rollup/plugin-commonjs": "^11.1.0", "@rollup/plugin-node-resolve": "^7.1.3", "@rollup/plugin-replace": "^2.3.2", "@types/chai": "^4.2.14", - "asmcrypto.js": "github:openpgpjs/asmcrypto#5b994303a9d3e27e0915f72a10b6c2c51535a4dc", "babel-eslint": "^10.1.0", "bn.js": "^4.11.8", "buffer": "^5.0.8", "chai": "^4.1.2", "chai-as-promised": "^7.1.1", - "elliptic": "github:openpgpjs/elliptic#ab7d8268c60b6abeb175841c578c224ac5b2d279", "email-addresses": "3.1.0", "eslint": "^4.17.0", "eslint-config-airbnb": "^16.1.0", @@ -72,21 +77,16 @@ "esm": "^3.2.25", "hash.js": "^1.1.3", "http-server": "^0.12.3", - "jsdoc": "github:openpgpjs/jsdoc#ff7cb3929586868bf91deb78a26d7e217e051a0f", "karma": "^6.1.0", "karma-browserstack-launcher": "^1.6.0", "karma-mocha": "^2.0.1", "karma-mocha-reporter": "^2.2.5", "mocha": "^5.0.0", "nyc": "^14.1.1", - "pako": "github:openpgpjs/pako#f38f7368a5fa511e54b95add2f04444c3a9d803f", "rollup": "^2.38.5", "rollup-plugin-terser": "^5.3.0", - "seek-bzip": "github:openpgpjs/seek-bzip#4b89457f20c0e1921b4689106a31c99782c29829", "sinon": "^4.3.0", - "tweetnacl": "github:openpgpjs/tweetnacl-js#3dae25bd3eaa77173f3405676b595721dde92eec", "typescript": "^4.1.2", - "web-stream-tools": "github:openpgpjs/web-stream-tools#a60cfd8a4ae883e718440524151480b0d3d318c8", "whatwg-fetch": "^2.0.3" }, "dependencies": { diff --git a/src/crypto/cfb.js b/src/crypto/cfb.js index 042cfb46..e5ae39e7 100644 --- a/src/crypto/cfb.js +++ b/src/crypto/cfb.js @@ -22,9 +22,9 @@ * @private */ -import { AES_CFB } from 'asmcrypto.js/dist_es8/aes/cfb'; +import { AES_CFB } from '@openpgp/asmcrypto.js/dist_es8/aes/cfb'; -import stream from 'web-stream-tools'; +import stream from '@openpgp/web-stream-tools'; import * as cipher from './cipher'; import util from '../util'; diff --git a/src/crypto/cipher/aes.js b/src/crypto/cipher/aes.js index 0d0661c2..7b1fa941 100644 --- a/src/crypto/cipher/aes.js +++ b/src/crypto/cipher/aes.js @@ -1,4 +1,4 @@ -import { AES_ECB } from 'asmcrypto.js/dist_es8/aes/ecb'; +import { AES_ECB } from '@openpgp/asmcrypto.js/dist_es8/aes/ecb'; // TODO use webCrypto or nodeCrypto when possible. function aes(length) { diff --git a/src/crypto/cmac.js b/src/crypto/cmac.js index ad4217a8..ba912a20 100644 --- a/src/crypto/cmac.js +++ b/src/crypto/cmac.js @@ -5,7 +5,7 @@ * @private */ -import { AES_CBC } from 'asmcrypto.js/dist_es8/aes/cbc'; +import { AES_CBC } from '@openpgp/asmcrypto.js/dist_es8/aes/cbc'; import util from '../util'; const webCrypto = util.getWebCrypto(); diff --git a/src/crypto/eax.js b/src/crypto/eax.js index d4d0198c..0be81cd3 100644 --- a/src/crypto/eax.js +++ b/src/crypto/eax.js @@ -22,7 +22,7 @@ * @private */ -import { AES_CTR } from 'asmcrypto.js/dist_es8/aes/ctr'; +import { AES_CTR } from '@openpgp/asmcrypto.js/dist_es8/aes/ctr'; import CMAC from './cmac'; import util from '../util'; diff --git a/src/crypto/gcm.js b/src/crypto/gcm.js index f5912aaf..c8baa239 100644 --- a/src/crypto/gcm.js +++ b/src/crypto/gcm.js @@ -22,7 +22,7 @@ * @private */ -import { AES_GCM } from 'asmcrypto.js/dist_es8/aes/gcm'; +import { AES_GCM } from '@openpgp/asmcrypto.js/dist_es8/aes/gcm'; import util from '../util'; const webCrypto = util.getWebCrypto(); // no GCM support in IE11, Safari 9 diff --git a/src/crypto/hash/index.js b/src/crypto/hash/index.js index 416e07da..d29d65ab 100644 --- a/src/crypto/hash/index.js +++ b/src/crypto/hash/index.js @@ -6,13 +6,13 @@ * @private */ -import { Sha1 } from 'asmcrypto.js/dist_es8/hash/sha1/sha1'; -import { Sha256 } from 'asmcrypto.js/dist_es8/hash/sha256/sha256'; +import { Sha1 } from '@openpgp/asmcrypto.js/dist_es8/hash/sha1/sha1'; +import { Sha256 } from '@openpgp/asmcrypto.js/dist_es8/hash/sha256/sha256'; import sha224 from 'hash.js/lib/hash/sha/224'; import sha384 from 'hash.js/lib/hash/sha/384'; import sha512 from 'hash.js/lib/hash/sha/512'; import { ripemd160 } from 'hash.js/lib/hash/ripemd'; -import stream from 'web-stream-tools'; +import stream from '@openpgp/web-stream-tools'; import md5 from './md5'; import util from '../../util'; import defaultConfig from '../../config'; diff --git a/src/crypto/public_key/elliptic/curves.js b/src/crypto/public_key/elliptic/curves.js index 479ba54b..612e286b 100644 --- a/src/crypto/public_key/elliptic/curves.js +++ b/src/crypto/public_key/elliptic/curves.js @@ -21,7 +21,7 @@ * @private */ -import nacl from 'tweetnacl/nacl-fast-light.js'; +import nacl from '@openpgp/tweetnacl/nacl-fast-light.js'; import { getRandomBytes } from '../../random'; import enums from '../../../enums'; import util from '../../../util'; diff --git a/src/crypto/public_key/elliptic/ecdh.js b/src/crypto/public_key/elliptic/ecdh.js index 4a3c3443..ef2dfede 100644 --- a/src/crypto/public_key/elliptic/ecdh.js +++ b/src/crypto/public_key/elliptic/ecdh.js @@ -21,7 +21,7 @@ * @private */ -import nacl from 'tweetnacl/nacl-fast-light.js'; +import nacl from '@openpgp/tweetnacl/nacl-fast-light.js'; import { Curve, jwkToRawPublic, rawPublicToJwk, privateToJwk, validateStandardParams } from './curves'; import * as aes_kw from '../../aes_kw'; import * as cipher from '../../cipher'; diff --git a/src/crypto/public_key/elliptic/eddsa.js b/src/crypto/public_key/elliptic/eddsa.js index 9e7d98e4..6339d9bb 100644 --- a/src/crypto/public_key/elliptic/eddsa.js +++ b/src/crypto/public_key/elliptic/eddsa.js @@ -22,7 +22,7 @@ */ import sha512 from 'hash.js/lib/hash/sha/512'; -import nacl from 'tweetnacl/nacl-fast-light.js'; +import nacl from '@openpgp/tweetnacl/nacl-fast-light.js'; import util from '../../../util'; nacl.hash = bytes => new Uint8Array(sha512().update(bytes).digest()); diff --git a/src/crypto/public_key/elliptic/indutnyKey.js b/src/crypto/public_key/elliptic/indutnyKey.js index 4df03b24..aa7565c5 100644 --- a/src/crypto/public_key/elliptic/indutnyKey.js +++ b/src/crypto/public_key/elliptic/indutnyKey.js @@ -40,6 +40,6 @@ export async function getIndutnyCurve(name) { if (!config.useIndutnyElliptic) { throw new Error('This curve is only supported in the full build of OpenPGP.js'); } - const { default: elliptic } = await import('elliptic'); + const { default: elliptic } = await import('@openpgp/elliptic'); return new elliptic.ec(name); } diff --git a/src/crypto/public_key/index.js b/src/crypto/public_key/index.js index 01973352..6f386c75 100644 --- a/src/crypto/public_key/index.js +++ b/src/crypto/public_key/index.js @@ -4,7 +4,7 @@ * @private */ -import nacl from 'tweetnacl/nacl-fast-light.js'; +import nacl from '@openpgp/tweetnacl/nacl-fast-light.js'; import * as rsa from './rsa'; import * as elgamal from './elgamal'; import * as elliptic from './elliptic'; diff --git a/src/encoding/armor.js b/src/encoding/armor.js index b51f3265..e19bf05d 100644 --- a/src/encoding/armor.js +++ b/src/encoding/armor.js @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -import stream from 'web-stream-tools'; +import stream from '@openpgp/web-stream-tools'; import * as base64 from './base64.js'; import enums from '../enums.js'; import util from '../util'; diff --git a/src/encoding/base64.js b/src/encoding/base64.js index da02663c..e5522a35 100644 --- a/src/encoding/base64.js +++ b/src/encoding/base64.js @@ -16,7 +16,7 @@ * @private */ -import stream from 'web-stream-tools'; +import stream from '@openpgp/web-stream-tools'; import util from '../util'; const Buffer = util.getNodeBuffer(); diff --git a/src/index.js b/src/index.js index 083a3841..7136d914 100644 --- a/src/index.js +++ b/src/index.js @@ -21,7 +21,7 @@ export { CleartextMessage, readCleartextMessage } from './cleartext'; export * from './packet'; -export { default as stream } from 'web-stream-tools'; +export { default as stream } from '@openpgp/web-stream-tools'; export * from './encoding/armor'; diff --git a/src/keyring/localstore.js b/src/keyring/localstore.js index fafc4353..b45c9f5b 100644 --- a/src/keyring/localstore.js +++ b/src/keyring/localstore.js @@ -20,7 +20,7 @@ * @private */ -import stream from 'web-stream-tools'; +import stream from '@openpgp/web-stream-tools'; import { readKey } from '../key'; import defaultConfig from '../config'; diff --git a/src/message.js b/src/message.js index 29eb59d0..e4b0c4f2 100644 --- a/src/message.js +++ b/src/message.js @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -import stream from 'web-stream-tools'; +import stream from '@openpgp/web-stream-tools'; import { armor, unarmor } from './encoding/armor'; import type_keyid from './type/keyid'; import defaultConfig from './config'; diff --git a/src/openpgp.js b/src/openpgp.js index 8b25a2c2..7c05278f 100644 --- a/src/openpgp.js +++ b/src/openpgp.js @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -import stream from 'web-stream-tools'; +import stream from '@openpgp/web-stream-tools'; import { createReadableStreamWrapper } from '@mattiasbuelens/web-streams-adapter'; import { Message } from './message'; import { CleartextMessage } from './cleartext'; diff --git a/src/packet/aead_encrypted_data.js b/src/packet/aead_encrypted_data.js index de3aeeeb..94ffc776 100644 --- a/src/packet/aead_encrypted_data.js +++ b/src/packet/aead_encrypted_data.js @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -import stream from 'web-stream-tools'; +import stream from '@openpgp/web-stream-tools'; import crypto from '../crypto'; import enums from '../enums'; import util from '../util'; diff --git a/src/packet/compressed_data.js b/src/packet/compressed_data.js index 5034b731..8629293c 100644 --- a/src/packet/compressed_data.js +++ b/src/packet/compressed_data.js @@ -15,11 +15,11 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -import { Deflate } from 'pako/lib/deflate'; -import { Inflate } from 'pako/lib/inflate'; -import { Z_SYNC_FLUSH, Z_FINISH } from 'pako/lib/zlib/constants'; -import { decode as BunzipDecode } from 'seek-bzip'; -import stream from 'web-stream-tools'; +import { Deflate } from '@openpgp/pako/lib/deflate'; +import { Inflate } from '@openpgp/pako/lib/inflate'; +import { Z_SYNC_FLUSH, Z_FINISH } from '@openpgp/pako/lib/zlib/constants'; +import { decode as BunzipDecode } from '@openpgp/seek-bzip'; +import stream from '@openpgp/web-stream-tools'; import enums from '../enums'; import util from '../util'; import defaultConfig from '../config'; diff --git a/src/packet/literal_data.js b/src/packet/literal_data.js index 03c0eba3..c23a4922 100644 --- a/src/packet/literal_data.js +++ b/src/packet/literal_data.js @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -import stream from 'web-stream-tools'; +import stream from '@openpgp/web-stream-tools'; import enums from '../enums'; import util from '../util'; diff --git a/src/packet/one_pass_signature.js b/src/packet/one_pass_signature.js index fe0884fa..624c713c 100644 --- a/src/packet/one_pass_signature.js +++ b/src/packet/one_pass_signature.js @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -import stream from 'web-stream-tools'; +import stream from '@openpgp/web-stream-tools'; import SignaturePacket from './signature'; import type_keyid from '../type/keyid'; import enums from '../enums'; diff --git a/src/packet/packet.js b/src/packet/packet.js index 6be01d02..6492085a 100644 --- a/src/packet/packet.js +++ b/src/packet/packet.js @@ -23,7 +23,7 @@ * @private */ -import stream from 'web-stream-tools'; +import stream from '@openpgp/web-stream-tools'; import enums from '../enums'; import util from '../util'; diff --git a/src/packet/packetlist.js b/src/packet/packetlist.js index e1af36ea..7081a63a 100644 --- a/src/packet/packetlist.js +++ b/src/packet/packetlist.js @@ -1,4 +1,4 @@ -import stream from 'web-stream-tools'; +import stream from '@openpgp/web-stream-tools'; import * as packets from './all_packets'; import { readPackets, supportsStreaming, diff --git a/src/packet/public_key.js b/src/packet/public_key.js index ca0a4415..98ff6769 100644 --- a/src/packet/public_key.js +++ b/src/packet/public_key.js @@ -17,8 +17,8 @@ /* eslint class-methods-use-this: ["error", { "exceptMethods": ["isDecrypted"] }] */ -import { Sha1 } from 'asmcrypto.js/dist_es8/hash/sha1/sha1'; -import { Sha256 } from 'asmcrypto.js/dist_es8/hash/sha256/sha256'; +import { Sha1 } from '@openpgp/asmcrypto.js/dist_es8/hash/sha1/sha1'; +import { Sha256 } from '@openpgp/asmcrypto.js/dist_es8/hash/sha256/sha256'; import type_keyid from '../type/keyid'; import defaultConfig from '../config'; import crypto from '../crypto'; diff --git a/src/packet/signature.js b/src/packet/signature.js index e69add5a..2180aebf 100644 --- a/src/packet/signature.js +++ b/src/packet/signature.js @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -import stream from 'web-stream-tools'; +import stream from '@openpgp/web-stream-tools'; import { readSimpleLength, writeSimpleLength } from './packet'; import type_keyid from '../type/keyid.js'; import crypto from '../crypto'; diff --git a/src/packet/sym_encrypted_integrity_protected_data.js b/src/packet/sym_encrypted_integrity_protected_data.js index 3e225683..6c6250fc 100644 --- a/src/packet/sym_encrypted_integrity_protected_data.js +++ b/src/packet/sym_encrypted_integrity_protected_data.js @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -import stream from 'web-stream-tools'; +import stream from '@openpgp/web-stream-tools'; import crypto from '../crypto'; import enums from '../enums'; import util from '../util'; diff --git a/src/packet/symmetrically_encrypted_data.js b/src/packet/symmetrically_encrypted_data.js index 7bcef2ab..3cf2b9e6 100644 --- a/src/packet/symmetrically_encrypted_data.js +++ b/src/packet/symmetrically_encrypted_data.js @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -import stream from 'web-stream-tools'; +import stream from '@openpgp/web-stream-tools'; import crypto from '../crypto'; import enums from '../enums'; import util from '../util'; diff --git a/src/util.js b/src/util.js index 55ff4778..d72dca26 100644 --- a/src/util.js +++ b/src/util.js @@ -23,7 +23,7 @@ * @private */ -import stream from 'web-stream-tools'; +import stream from '@openpgp/web-stream-tools'; import { getBigInteger } from './biginteger'; const debugMode = globalThis.process && globalThis.process.env.NODE_ENV === 'development'; diff --git a/test/general/x25519.js b/test/general/x25519.js index ef8c6ebf..f51e32ad 100644 --- a/test/general/x25519.js +++ b/test/general/x25519.js @@ -4,7 +4,7 @@ const signature = require('../../src/crypto/signature'); const OID = require('../../src/type/oid'); const util = require('../../src/util'); -const nacl = require('tweetnacl'); +const nacl = require('@openpgp/tweetnacl'); const chai = require('chai'); chai.use(require('chai-as-promised'));