fix: correct secp256k1 key length detection in publicKeyFromRaw (#2697)

- Resolves #2696

---------

Co-authored-by: achingbrain <[email protected]>

Author: wemeetagain

packages/crypto/src/keys/index.ts

@@ -85,7 +85,7 @@ export function publicKeyFromProtobuf (buf: Uint8Array): PublicKey {
 export function publicKeyFromRaw (buf: Uint8Array): PublicKey {
   if (buf.byteLength === 32) {
     return unmarshalEd25519PublicKey(buf)
-  } else if (buf.byteLength === 34) {
+  } else if (buf.byteLength === 33) {
     return unmarshalSecp256k1PublicKey(buf)
   } else {
     return pkixToRSAPublicKey(buf)

packages/crypto/test/keys/ed25519.spec.ts

@@ -4,7 +4,7 @@ import { Uint8ArrayList } from 'uint8arraylist'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import { randomBytes } from '../../src/index.js'
 import { unmarshalEd25519PrivateKey, unmarshalEd25519PublicKey } from '../../src/keys/ed25519/utils.js'
-import { generateKeyPair, generateKeyPairFromSeed, privateKeyFromProtobuf, privateKeyFromRaw, publicKeyFromProtobuf } from '../../src/keys/index.js'
+import { generateKeyPair, generateKeyPairFromSeed, privateKeyFromProtobuf, privateKeyFromRaw, publicKeyFromProtobuf, publicKeyFromRaw } from '../../src/keys/index.js'
 import fixtures from '../fixtures/go-key-ed25519.js'
 import { testGarbage } from '../helpers/test-garbage-error-handling.js'
 import type { Ed25519PrivateKey } from '@libp2p/interface'
@@ -142,13 +142,20 @@ describe('ed25519', function () {
     testGarbage('unmarshalPrivateKey', privateKeyFromProtobuf)
   })
 
-  it('imports from raw', async () => {
+  it('imports private key from raw', async () => {
     const key = await generateKeyPair('Ed25519')
     const imported = privateKeyFromRaw(key.raw)
 
     expect(key.equals(imported)).to.be.true()
   })
 
+  it('imports public key from raw', async () => {
+    const key = await generateKeyPair('Ed25519')
+    const imported = publicKeyFromRaw(key.publicKey.raw)
+
+    expect(key.publicKey.equals(imported)).to.be.true()
+  })
+
   describe('go interop', () => {
     // @ts-check
     it('verifies with data from go', async () => {

packages/crypto/test/keys/rsa.spec.ts

@@ -4,7 +4,7 @@ import { expect } from 'aegir/chai'
 import { Uint8ArrayList } from 'uint8arraylist'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import { randomBytes } from '../../src/index.js'
-import { generateKeyPair, privateKeyFromProtobuf, privateKeyFromRaw, publicKeyFromProtobuf } from '../../src/keys/index.js'
+import { generateKeyPair, privateKeyFromProtobuf, privateKeyFromRaw, publicKeyFromProtobuf, publicKeyFromRaw } from '../../src/keys/index.js'
 import { MAX_RSA_KEY_SIZE, pkcs1ToRSAPrivateKey, pkixToRSAPublicKey } from '../../src/keys/rsa/utils.js'
 import fixtures from '../fixtures/go-key-rsa.js'
 import { testGarbage } from '../helpers/test-garbage-error-handling.js'
@@ -101,13 +101,20 @@ describe('RSA', function () {
     expect(privateKey.raw).to.equalBytes(pkcs1)
   })
 
-  it('imports from raw', async () => {
+  it('imports private key from raw', async () => {
     const key = await generateKeyPair('RSA', 512)
     const imported = privateKeyFromRaw(key.raw)
 
     expect(key.equals(imported)).to.be.true()
   })
 
+  it('imports public key from raw', async () => {
+    const key = await generateKeyPair('RSA', 512)
+    const imported = publicKeyFromRaw(key.publicKey.raw)
+
+    expect(key.publicKey.equals(imported)).to.be.true()
+  })
+
   describe('key equals', () => {
     it('equals itself', () => {
       expect(key.equals(key)).to.be.true()

packages/crypto/test/keys/secp256k1.spec.ts

@@ -4,7 +4,7 @@ import { expect } from 'aegir/chai'
 import { Uint8ArrayList } from 'uint8arraylist'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import { randomBytes } from '../../src/index.js'
-import { generateKeyPair, privateKeyFromRaw, privateKeyToProtobuf, publicKeyToProtobuf } from '../../src/keys/index.js'
+import { generateKeyPair, privateKeyFromRaw, privateKeyToProtobuf, publicKeyFromRaw, publicKeyToProtobuf } from '../../src/keys/index.js'
 import { KeyType, PrivateKey, PublicKey } from '../../src/keys/keys.js'
 import { hashAndSign, hashAndVerify } from '../../src/keys/secp256k1/index.js'
 import { unmarshalSecp256k1PrivateKey, unmarshalSecp256k1PublicKey, compressSecp256k1PublicKey, computeSecp256k1PublicKey, decompressSecp256k1PublicKey, generateSecp256k1PrivateKey, validateSecp256k1PrivateKey, validateSecp256k1PublicKey } from '../../src/keys/secp256k1/utils.js'
@@ -69,13 +69,20 @@ describe('secp256k1 keys', () => {
     expect(key.publicKey.toString()).to.equal('16Uiu2HAm5vpzEwJ41kQmnwDu9moFusdc16wV1oCUd1AHLgFgPpKY')
   })
 
-  it('imports from raw', async () => {
+  it('imports private key from raw', async () => {
     const key = await generateKeyPair('secp256k1')
     const imported = privateKeyFromRaw(key.raw)
 
     expect(key.equals(imported)).to.be.true()
   })
 
+  it('imports public key from raw', async () => {
+    const key = await generateKeyPair('secp256k1')
+    const imported = publicKeyFromRaw(key.publicKey.raw)
+
+    expect(key.publicKey.equals(imported)).to.be.true()
+  })
+
   describe('key equals', () => {
     it('equals itself', () => {
       expect(key.equals(key)).to.be.true()