mirror of
https://github.com/fluencelabs/js-libp2p-noise
synced 2025-04-25 23:42:17 +00:00
fix buffer usage in browser
This commit is contained in:
parent
95eba0b8fe
commit
cc2fb94323
13
src/utils.ts
13
src/utils.ts
@ -58,9 +58,9 @@ export async function getPeerIdFromPayload(payload: pb.INoiseHandshakePayload):
|
|||||||
return await PeerId.createFromPubKey(Buffer.from(payload.identityKey as Uint8Array));
|
return await PeerId.createFromPubKey(Buffer.from(payload.identityKey as Uint8Array));
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function decodePayload(payload: bytes): Promise<pb.INoiseHandshakePayload> {
|
export async function decodePayload(payload: bytes|Uint8Array): Promise<pb.INoiseHandshakePayload> {
|
||||||
return NoiseHandshakePayloadProto.toObject(
|
return NoiseHandshakePayloadProto.toObject(
|
||||||
NoiseHandshakePayloadProto.decode(payload)
|
NoiseHandshakePayloadProto.decode(Buffer.from(payload))
|
||||||
) as INoisePayload;
|
) as INoisePayload;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -85,19 +85,16 @@ export async function verifySignedPayload(
|
|||||||
payload: pb.INoiseHandshakePayload,
|
payload: pb.INoiseHandshakePayload,
|
||||||
remotePeer: PeerId
|
remotePeer: PeerId
|
||||||
): Promise<PeerId> {
|
): Promise<PeerId> {
|
||||||
|
const identityKey = Buffer.from(payload.identityKey as Uint8Array);
|
||||||
if (!(await isValidPeerId(remotePeer.id, Buffer.from(payload.identityKey as Uint8Array)))) {
|
if (!(await isValidPeerId(remotePeer.id, identityKey))) {
|
||||||
throw new Error("Peer ID doesn't match libp2p public key.");
|
throw new Error("Peer ID doesn't match libp2p public key.");
|
||||||
}
|
}
|
||||||
|
|
||||||
const generatedPayload = getHandshakePayload(noiseStaticKey);
|
const generatedPayload = getHandshakePayload(noiseStaticKey);
|
||||||
|
|
||||||
// Unmarshaling from PublicKey protobuf
|
// Unmarshaling from PublicKey protobuf
|
||||||
const publicKey = crypto.keys.unmarshalPublicKey(payload.identityKey);
|
const publicKey = crypto.keys.unmarshalPublicKey(identityKey);
|
||||||
if (!publicKey.verify(generatedPayload, payload.identitySig)) {
|
if (!publicKey.verify(generatedPayload, payload.identitySig)) {
|
||||||
throw new Error("Static key doesn't match to peer that signed payload!");
|
throw new Error("Static key doesn't match to peer that signed payload!");
|
||||||
}
|
}
|
||||||
|
|
||||||
return remotePeer;
|
return remotePeer;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user