diff --git a/package-lock.json b/package-lock.json index 0c0cc051..8c3b047c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,7 +17,7 @@ "@openpgp/noble-curves": "^1.2.1-0", "@openpgp/noble-hashes": "^1.3.3-0", "@openpgp/seek-bzip": "^1.0.5-git", - "@openpgp/tweetnacl": "^1.0.3", + "@openpgp/tweetnacl": "^1.0.4-1", "@openpgp/web-stream-tools": "^0.0.14", "@rollup/plugin-alias": "^5.0.0", "@rollup/plugin-commonjs": "^24.0.1", @@ -663,9 +663,9 @@ } }, "node_modules/@openpgp/tweetnacl": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@openpgp/tweetnacl/-/tweetnacl-1.0.3.tgz", - "integrity": "sha512-KGXNhU/mRg+uTsLGva55V340jwbX2pC8LndjOVI2oQ8vewPVTS2KnDOIXQ8O6KyT/c9Qy16KUQ5mwewe72m1Yw==", + "version": "1.0.4-1", + "resolved": "https://registry.npmjs.org/@openpgp/tweetnacl/-/tweetnacl-1.0.4-1.tgz", + "integrity": "sha512-coYo04Op1+g4h6yE6q0GglGdvWkdfvpQWKmR9nDIrW+LqdTtwHFXIyIQGs5cosR4tCajxRn9aF/+WK207zxFrg==", "dev": true }, "node_modules/@openpgp/web-stream-tools": { @@ -8010,9 +8010,9 @@ } }, "@openpgp/tweetnacl": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@openpgp/tweetnacl/-/tweetnacl-1.0.3.tgz", - "integrity": "sha512-KGXNhU/mRg+uTsLGva55V340jwbX2pC8LndjOVI2oQ8vewPVTS2KnDOIXQ8O6KyT/c9Qy16KUQ5mwewe72m1Yw==", + "version": "1.0.4-1", + "resolved": "https://registry.npmjs.org/@openpgp/tweetnacl/-/tweetnacl-1.0.4-1.tgz", + "integrity": "sha512-coYo04Op1+g4h6yE6q0GglGdvWkdfvpQWKmR9nDIrW+LqdTtwHFXIyIQGs5cosR4tCajxRn9aF/+WK207zxFrg==", "dev": true }, "@openpgp/web-stream-tools": { diff --git a/package.json b/package.json index 90cd6346..f1bf3b30 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "@openpgp/jsdoc": "^3.6.11", "@openpgp/noble-hashes": "^1.3.3-0", "@openpgp/seek-bzip": "^1.0.5-git", - "@openpgp/tweetnacl": "^1.0.3", + "@openpgp/tweetnacl": "^1.0.4-1", "@openpgp/web-stream-tools": "^0.0.14", "@rollup/plugin-alias": "^5.0.0", "@rollup/plugin-commonjs": "^24.0.1", diff --git a/src/crypto/public_key/elliptic/ecdh.js b/src/crypto/public_key/elliptic/ecdh.js index ed370578..9039833a 100644 --- a/src/crypto/public_key/elliptic/ecdh.js +++ b/src/crypto/public_key/elliptic/ecdh.js @@ -20,7 +20,7 @@ * @module crypto/public_key/elliptic/ecdh */ -import nacl from '@openpgp/tweetnacl/nacl-fast-light'; +import nacl from '@openpgp/tweetnacl'; import { CurveWithOID, jwkToRawPublic, rawPublicToJWK, privateToJWK, validateStandardParams, getNobleCurve } from './oid_curves'; import * as aesKW from '../../aes_kw'; import { getRandomBytes } from '../../random'; diff --git a/src/crypto/public_key/elliptic/ecdh_x.js b/src/crypto/public_key/elliptic/ecdh_x.js index decdeaab..2d9ffe3e 100644 --- a/src/crypto/public_key/elliptic/ecdh_x.js +++ b/src/crypto/public_key/elliptic/ecdh_x.js @@ -3,7 +3,7 @@ * @module crypto/public_key/elliptic/ecdh */ -import x25519 from '@openpgp/tweetnacl/nacl-fast-light'; +import x25519 from '@openpgp/tweetnacl'; import { x448 } from '@openpgp/noble-curves/ed448'; import * as aesKW from '../../aes_kw'; import { getRandomBytes } from '../../random'; diff --git a/src/crypto/public_key/elliptic/eddsa.js b/src/crypto/public_key/elliptic/eddsa.js index 8b08a671..28c33f0c 100644 --- a/src/crypto/public_key/elliptic/eddsa.js +++ b/src/crypto/public_key/elliptic/eddsa.js @@ -21,7 +21,7 @@ */ import { sha512 } from '@openpgp/noble-hashes/sha512'; -import ed25519 from '@openpgp/tweetnacl/nacl-fast-light'; +import ed25519 from '@openpgp/tweetnacl'; import { ed448 } from '@openpgp/noble-curves/ed448'; import util from '../../../util'; import enums from '../../../enums'; diff --git a/src/crypto/public_key/elliptic/eddsa_legacy.js b/src/crypto/public_key/elliptic/eddsa_legacy.js index d90e0f9c..966f8dbe 100644 --- a/src/crypto/public_key/elliptic/eddsa_legacy.js +++ b/src/crypto/public_key/elliptic/eddsa_legacy.js @@ -21,14 +21,11 @@ * @module crypto/public_key/elliptic/eddsa_legacy */ -import { sha512 } from '@openpgp/noble-hashes/sha512'; -import nacl from '@openpgp/tweetnacl/nacl-fast-light'; +import nacl from '@openpgp/tweetnacl'; import util from '../../../util'; import enums from '../../../enums'; import hash from '../../hash'; -nacl.hash = bytes => sha512(bytes); - /** * Sign a message using the provided legacy EdDSA key * @param {module:type/oid} oid - Elliptic curve object identifier diff --git a/src/crypto/public_key/elliptic/oid_curves.js b/src/crypto/public_key/elliptic/oid_curves.js index 0ad88cba..f5716d02 100644 --- a/src/crypto/public_key/elliptic/oid_curves.js +++ b/src/crypto/public_key/elliptic/oid_curves.js @@ -19,7 +19,7 @@ * @fileoverview Wrapper of an instance of an Elliptic Curve * @module crypto/public_key/elliptic/curve */ -import nacl from '@openpgp/tweetnacl/nacl-fast-light'; +import nacl from '@openpgp/tweetnacl'; import { p256 } from '@openpgp/noble-curves/p256'; import { p384 } from '@openpgp/noble-curves/p384'; import { p521 } from '@openpgp/noble-curves/p521'; diff --git a/src/crypto/public_key/index.js b/src/crypto/public_key/index.js index ac34ab76..ffcf73cc 100644 --- a/src/crypto/public_key/index.js +++ b/src/crypto/public_key/index.js @@ -3,7 +3,6 @@ * @module crypto/public_key */ -import nacl from '@openpgp/tweetnacl/nacl-fast-light'; import * as rsa from './rsa'; import * as elgamal from './elgamal'; import * as elliptic from './elliptic'; @@ -17,7 +16,5 @@ export default { /** @see module:crypto/public_key/elliptic */ elliptic: elliptic, /** @see module:crypto/public_key/dsa */ - dsa: dsa, - /** @see tweetnacl */ - nacl: nacl + dsa: dsa };