Mirroristas/openpgpjs
2
0
Fork 0
mirror of https://github.com/openpgpjs/openpgpjs.git synced 2025-06-13 17:56:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use internal tweetnacl SHA-512 implementation

Browse Source 
Instead of relying on externally provided one (no async loading supported)
This commit is contained in:
larabr 2023-10-12 13:56:02 +02:00
parent 7295a2e7b3
commit a56a4a16e8
8 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
package-lock.json generated
View File

@ -17,7 +17,7 @@
"@openpgp/noble-curves": "^1.2.1-0", "@openpgp/noble-curves": "^1.2.1-0",
"@openpgp/noble-hashes": "^1.3.3-0", "@openpgp/noble-hashes": "^1.3.3-0",
"@openpgp/seek-bzip": "^1.0.5-git", "@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", "@openpgp/web-stream-tools": "^0.0.14",
"@rollup/plugin-alias": "^5.0.0", "@rollup/plugin-alias": "^5.0.0",
"@rollup/plugin-commonjs": "^24.0.1", "@rollup/plugin-commonjs": "^24.0.1",
@ -663,9 +663,9 @@
} }
}, },
"node_modules/@openpgp/tweetnacl": { "node_modules/@openpgp/tweetnacl": {
"version": "1.0.3", "version": "1.0.4-1",
"resolved": "https://registry.npmjs.org/@openpgp/tweetnacl/-/tweetnacl-1.0.3.tgz", "resolved": "https://registry.npmjs.org/@openpgp/tweetnacl/-/tweetnacl-1.0.4-1.tgz",
"integrity": "sha512-KGXNhU/mRg+uTsLGva55V340jwbX2pC8LndjOVI2oQ8vewPVTS2KnDOIXQ8O6KyT/c9Qy16KUQ5mwewe72m1Yw==", "integrity": "sha512-coYo04Op1+g4h6yE6q0GglGdvWkdfvpQWKmR9nDIrW+LqdTtwHFXIyIQGs5cosR4tCajxRn9aF/+WK207zxFrg==",
"dev": true "dev": true
}, },
"node_modules/@openpgp/web-stream-tools": { "node_modules/@openpgp/web-stream-tools": {
@ -8010,9 +8010,9 @@
} }
}, },
"@openpgp/tweetnacl": { "@openpgp/tweetnacl": {
"version": "1.0.3", "version": "1.0.4-1",
"resolved": "https://registry.npmjs.org/@openpgp/tweetnacl/-/tweetnacl-1.0.3.tgz", "resolved": "https://registry.npmjs.org/@openpgp/tweetnacl/-/tweetnacl-1.0.4-1.tgz",
"integrity": "sha512-KGXNhU/mRg+uTsLGva55V340jwbX2pC8LndjOVI2oQ8vewPVTS2KnDOIXQ8O6KyT/c9Qy16KUQ5mwewe72m1Yw==", "integrity": "sha512-coYo04Op1+g4h6yE6q0GglGdvWkdfvpQWKmR9nDIrW+LqdTtwHFXIyIQGs5cosR4tCajxRn9aF/+WK207zxFrg==",
"dev": true "dev": true
}, },
"@openpgp/web-stream-tools": { "@openpgp/web-stream-tools": {

2
package.json
View File

@ -67,7 +67,7 @@
"@openpgp/jsdoc": "^3.6.11", "@openpgp/jsdoc": "^3.6.11",
"@openpgp/noble-hashes": "^1.3.3-0", "@openpgp/noble-hashes": "^1.3.3-0",
"@openpgp/seek-bzip": "^1.0.5-git", "@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", "@openpgp/web-stream-tools": "^0.0.14",
"@rollup/plugin-alias": "^5.0.0", "@rollup/plugin-alias": "^5.0.0",
"@rollup/plugin-commonjs": "^24.0.1", "@rollup/plugin-commonjs": "^24.0.1",

2
src/crypto/public_key/elliptic/ecdh.js
View File

@ -20,7 +20,7 @@
* @module crypto/public_key/elliptic/ecdh * @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 { CurveWithOID, jwkToRawPublic, rawPublicToJWK, privateToJWK, validateStandardParams, getNobleCurve } from './oid_curves';
import * as aesKW from '../../aes_kw'; import * as aesKW from '../../aes_kw';
import { getRandomBytes } from '../../random'; import { getRandomBytes } from '../../random';

2
src/crypto/public_key/elliptic/ecdh_x.js
View File

@ -3,7 +3,7 @@
* @module crypto/public_key/elliptic/ecdh * @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 { x448 } from '@openpgp/noble-curves/ed448';
import * as aesKW from '../../aes_kw'; import * as aesKW from '../../aes_kw';
import { getRandomBytes } from '../../random'; import { getRandomBytes } from '../../random';

2
src/crypto/public_key/elliptic/eddsa.js
View File

@ -21,7 +21,7 @@
*/ */
import { sha512 } from '@openpgp/noble-hashes/sha512'; 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 { ed448 } from '@openpgp/noble-curves/ed448';
import util from '../../../util'; import util from '../../../util';
import enums from '../../../enums'; import enums from '../../../enums';

5
src/crypto/public_key/elliptic/eddsa_legacy.js
View File

@ -21,14 +21,11 @@
* @module crypto/public_key/elliptic/eddsa_legacy * @module crypto/public_key/elliptic/eddsa_legacy
*/ */
import { sha512 } from '@openpgp/noble-hashes/sha512'; import nacl from '@openpgp/tweetnacl';
import nacl from '@openpgp/tweetnacl/nacl-fast-light';
import util from '../../../util'; import util from '../../../util';
import enums from '../../../enums'; import enums from '../../../enums';
import hash from '../../hash'; import hash from '../../hash';
nacl.hash = bytes => sha512(bytes);
/** /**
* Sign a message using the provided legacy EdDSA key * Sign a message using the provided legacy EdDSA key
* @param {module:type/oid} oid - Elliptic curve object identifier * @param {module:type/oid} oid - Elliptic curve object identifier

2
src/crypto/public_key/elliptic/oid_curves.js
View File

@ -19,7 +19,7 @@
* @fileoverview Wrapper of an instance of an Elliptic Curve * @fileoverview Wrapper of an instance of an Elliptic Curve
* @module crypto/public_key/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 { p256 } from '@openpgp/noble-curves/p256';
import { p384 } from '@openpgp/noble-curves/p384'; import { p384 } from '@openpgp/noble-curves/p384';
import { p521 } from '@openpgp/noble-curves/p521'; import { p521 } from '@openpgp/noble-curves/p521';

5
src/crypto/public_key/index.js
View File

@ -3,7 +3,6 @@
* @module crypto/public_key * @module crypto/public_key
*/ */
import nacl from '@openpgp/tweetnacl/nacl-fast-light';
import * as rsa from './rsa'; import * as rsa from './rsa';
import * as elgamal from './elgamal'; import * as elgamal from './elgamal';
import * as elliptic from './elliptic'; import * as elliptic from './elliptic';
@ -17,7 +16,5 @@ export default {
/** @see module:crypto/public_key/elliptic */ /** @see module:crypto/public_key/elliptic */
elliptic: elliptic, elliptic: elliptic,
/** @see module:crypto/public_key/dsa */ /** @see module:crypto/public_key/dsa */
dsa: dsa, dsa: dsa
/** @see tweetnacl */
nacl: nacl
}; };