Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add secp256k1 key option #2

Closed
wants to merge 4 commits into from
Closed

Add secp256k1 key option #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4b3d3f1
feat: secp256k1 curve key
doctor-zob Mar 18, 2025
270ac09
fix: secp256k1 curve key import order
doctor-zob Mar 18, 2025
1d03da9
fix: secp256k1 curve key import order
doctor-zob Mar 18, 2025
0043da8
fix: secp256k1 tests
doctor-zob Mar 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/ecdsa.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ describe('ECDSAKey Examples', () => {
for (const alg of [
iana.AlgorithmES256,
iana.AlgorithmES384,
iana.AlgorithmES512
iana.AlgorithmES512,
iana.AlgorithmES256K
]) {
let key = ECDSAKey.generate(alg)
assert.equal(key.kty, iana.KeyTypeEC2)
Expand All @@ -24,7 +25,7 @@ describe('ECDSAKey Examples', () => {
const sig = key.sign(utf8ToBytes('This is the content.'))
assert.equal(key.verify(utf8ToBytes('This is the content.'), sig), true)
assert.equal(key.verify(utf8ToBytes('This is the content'), sig), false)
const key2 = ECDSAKey.fromSecret(key.getSecretKey())
const key2 = ECDSAKey.fromSecret(key.getSecretKey(), null, alg)
assert.equal(key2.verify(utf8ToBytes('This is the content.'), sig), true)

const pk = key.public()
Expand All @@ -34,7 +35,7 @@ describe('ECDSAKey Examples', () => {
const sig2 = key2.sign(utf8ToBytes('This is the content.'))
assert.equal(bytesToHex(sig2), bytesToHex(sig))

const pk2 = ECDSAKey.fromPublic(pk.getPublicKey())
const pk2 = ECDSAKey.fromPublic(pk.getPublicKey(), null, alg)
assert.equal(pk2.verify(utf8ToBytes('This is the content.'), sig2), true)
}
})
Expand Down
28 changes: 17 additions & 11 deletions src/ecdsa.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import { p256 } from '@noble/curves/p256'
import { p384 } from '@noble/curves/p384'
import { p521 } from '@noble/curves/p521'
import { secp256k1 } from '@noble/curves/secp256k1'
import { CurveFn } from '@noble/curves/abstract/weierstrass'
import * as iana from './iana'
import { RawMap, assertBytes } from './map'
Expand All @@ -20,15 +21,16 @@ export class ECDSAKey extends Key implements Signer, Verifier {

static generate<T>(alg: number, kid?: T): ECDSAKey {
const curve = getCurve(alg)
return ECDSAKey.fromSecret(curve.utils.randomPrivateKey(), kid)
return ECDSAKey.fromSecret(curve.utils.randomPrivateKey(), kid, alg)
}

static fromSecret<T>(secret: Uint8Array, kid?: T): ECDSAKey {
static fromSecret<T>(secret: Uint8Array, kid?: T, alg?: number): ECDSAKey {
assertBytes(secret, 'secret')
const alg = getAlg(secret.length)
if (alg == undefined) {
alg = getAlg(secret.length)
}
const key = new ECDSAKey()
key.alg = alg

const curve = getCurve(alg)
if (!curve.utils.isValidPrivateKey(secret)) {
throw new Error(
Expand All @@ -43,23 +45,23 @@ export class ECDSAKey extends Key implements Signer, Verifier {
return key
}

static fromPublic<T>(pubkey: Uint8Array, kid?: T): ECDSAKey {
static fromPublic<T>(pubkey: Uint8Array, kid?: T, alg?: number): ECDSAKey {
assertBytes(pubkey, 'public key')
if (pubkey.length < 33) {
throw new Error(
`cose-ts: ECDSAKey.fromPublic: public key size mismatch, expected at least 33, got ${pubkey.length}`
)
}

const alg =
pubkey[0] == 0x04
? getAlg((pubkey.length - 1) / 2)
: getAlg(pubkey.length - 1)
if (alg == undefined) {
alg =
pubkey[0] == 0x04
? getAlg((pubkey.length - 1) / 2)
: getAlg(pubkey.length - 1)
}
const key = new ECDSAKey()
key.alg = alg
const curve = getCurve(alg)
curve.ProjectivePoint.fromHex(pubkey) // validate public key

switch (pubkey[0]) {
case 0x02:
key.setParam(iana.EC2KeyParameterY, false)
Expand Down Expand Up @@ -202,6 +204,8 @@ export function getCrv(alg: number): number {
return iana.EllipticCurveP_384
case iana.AlgorithmES512:
return iana.EllipticCurveP_521
case iana.AlgorithmES256K:
return iana.EllipticCurveSecp256k1
default:
throw new Error(`cose-ts: unsupported ECDSA alg ${alg}`)
}
Expand All @@ -215,6 +219,8 @@ export function getCurve(alg: number): CurveFn {
return p384
case iana.AlgorithmES512:
return p521
case iana.AlgorithmES256K:
return secp256k1
default:
throw new Error(`cose-ts: unsupported ECDSA alg ${alg}`)
}
Expand Down