Mirroristas/openpgpjs
2
0
Fork 0
mirror of https://github.com/openpgpjs/openpgpjs.git synced 2025-11-24 14:35:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1875

Browse Source
This commit is contained in:
larabr 2025-07-31 19:08:40 +02:00 committed by GitHub
commit 6b1da73b97
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
package-lock.json generated
View File

@ -10,7 +10,7 @@
"license": "LGPL-3.0+", "license": "LGPL-3.0+",
"devDependencies": { "devDependencies": {
"@noble/ciphers": "^1.3.0", "@noble/ciphers": "^1.3.0",
"@noble/curves": "^1.9.2", "@noble/curves": "^1.9.5",
"@noble/hashes": "^1.8.0", "@noble/hashes": "^1.8.0",
"@openpgp/jsdoc": "^3.6.11", "@openpgp/jsdoc": "^3.6.11",
"@openpgp/seek-bzip": "^1.0.5-git", "@openpgp/seek-bzip": "^1.0.5-git",
@ -971,9 +971,9 @@
} }
}, },
"node_modules/@noble/curves": { "node_modules/@noble/curves": {
"version": "1.9.2", "version": "1.9.5",
"resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.9.2.tgz", "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.9.5.tgz",
"integrity": "sha512-HxngEd2XUcg9xi20JkwlLCtYwfoFw4JGkuZpT+WlsPD4gB/cxkvTD8fSsoAnphGZhFdZYKeQIPCuFlWPm1uE0g==", "integrity": "sha512-IHiC8xU74NLKg7gNmwMbUVtqqZy9OWKphTAChESCgsXI5NTK6n3ewOFXrj4Dxal/Ml8D3msbPIHfpHLwv50Q2w==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {

2
package.json
View File

@ -64,7 +64,7 @@
}, },
"devDependencies": { "devDependencies": {
"@noble/ciphers": "^1.3.0", "@noble/ciphers": "^1.3.0",
"@noble/curves": "^1.9.2", "@noble/curves": "^1.9.5",
"@noble/hashes": "^1.8.0", "@noble/hashes": "^1.8.0",
"@openpgp/jsdoc": "^3.6.11", "@openpgp/jsdoc": "^3.6.11",
"@openpgp/seek-bzip": "^1.0.5-git", "@openpgp/seek-bzip": "^1.0.5-git",

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

@ -61,8 +61,7 @@ export async function generate(algo) {
case enums.publicKey.x448: { case enums.publicKey.x448: {
const x448 = await util.getNobleCurve(enums.publicKey.x448); const x448 = await util.getNobleCurve(enums.publicKey.x448);
const k = x448.utils.randomPrivateKey(); const { secretKey: k, publicKey: A } = x448.keygen();
const A = x448.getPublicKey(k);
return { A, k }; return { A, k };
} }
default: default:
@ -246,10 +245,9 @@ export async function generateEphemeralEncryptionMaterial(algo, recipientA) {
} }
case enums.publicKey.x448: { case enums.publicKey.x448: {
const x448 = await util.getNobleCurve(enums.publicKey.x448); const x448 = await util.getNobleCurve(enums.publicKey.x448);
const ephemeralSecretKey = x448.utils.randomPrivateKey(); const { secretKey: ephemeralSecretKey, publicKey: ephemeralPublicKey } = x448.keygen();
const sharedSecret = x448.getSharedSecret(ephemeralSecretKey, recipientA); const sharedSecret = x448.getSharedSecret(ephemeralSecretKey, recipientA);
assertNonZeroArray(sharedSecret); assertNonZeroArray(sharedSecret);
const ephemeralPublicKey = x448.getPublicKey(ephemeralSecretKey);
return { ephemeralPublicKey, sharedSecret }; return { ephemeralPublicKey, sharedSecret };
} }
default: default:

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

@ -67,8 +67,7 @@ export async function generate(algo) {
case enums.publicKey.ed448: { case enums.publicKey.ed448: {
const ed448 = await util.getNobleCurve(enums.publicKey.ed448); const ed448 = await util.getNobleCurve(enums.publicKey.ed448);
const seed = ed448.utils.randomPrivateKey(); const { secretKey: seed, publicKey: A } = ed448.keygen();
const A = ed448.getPublicKey(seed);
return { A, seed }; return { A, seed };
} }
default: default:

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

@ -297,7 +297,7 @@ export {
////////////////////////// //////////////////////////
async function jsGenKeyPair(name) { async function jsGenKeyPair(name) {
const nobleCurve = await util.getNobleCurve(enums.publicKey.ecdsa, name); // excluding curve25519Legacy, ecdh and ecdsa use the same curves const nobleCurve = await util.getNobleCurve(enums.publicKey.ecdsa, name); // excluding curve25519Legacy, ecdh and ecdsa use the same curves
const privateKey = nobleCurve.utils.randomPrivateKey(); const { secretKey: privateKey } = nobleCurve.keygen();
const publicKey = nobleCurve.getPublicKey(privateKey, false); const publicKey = nobleCurve.getPublicKey(privateKey, false);
return { publicKey, privateKey }; return { publicKey, privateKey };
} }