fluencelabs/js-libp2p-noise
1
0
Fork 0
mirror of https://github.com/fluencelabs/js-libp2p-noise synced 2025-06-24 19:41:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'morrigan/fix-interop' into revert-51-remove-bcrypto-dependency

Browse Source 
# Conflicts:
#	package.json
#	src/@types/basic.ts
#	src/handshakes/ik.ts
#	src/handshakes/xx.ts
#	yarn.lock
This commit is contained in:
morrigan
2020-04-22 19:07:03 +02:00
parent 7b11f5a3ab 866ae6d333
commit f5f4b9f344
11 changed files with 90 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/@types/basic.ts
View File

@ -1,9 +1,8 @@
import BN from 'bn.js';
import { Buffer } from 'buffer';
import {Buffer} from 'buffer';
export type bytes = Buffer;
export type bytes32 = Buffer;
export type bytes16 = Buffer;
export type uint32 = number;
export type uint64 = BN;
export type uint64 = number;

4
src/handshakes/abstract-handshake.ts
View File

@ -1,5 +1,7 @@
import {Buffer} from "buffer";
import { AEAD, x25519, SHA256 } from 'bcrypto';
import AEAD from 'bcrypto/lib/js/aead';
import x25519 from 'bcrypto/lib/js/x25519';
import SHA256 from 'bcrypto/lib/js/sha256';
import {bytes, bytes32, uint32} from "../@types/basic";
import {CipherState, MessageBuffer, SymmetricState} from "../@types/handshake";

18
src/handshakes/ik.ts
View File

@ -1,6 +1,4 @@
import {Buffer} from "buffer";
import BN from "bn.js";
import {CipherState, HandshakeState, MessageBuffer, NoiseSession} from "../@types/handshake";
import {bytes, bytes32} from "../@types/basic";
import {generateKeypair, isValidPublicKey} from "../utils";
@ -22,21 +20,21 @@ export class IK extends AbstractHandshake {
return {
hs,
i: initiator,
mc: new BN(0),
mc: 0,
};
}
public sendMessage(session: NoiseSession, message: bytes): MessageBuffer {
let messageBuffer: MessageBuffer;
if (session.mc.eqn(0)) {
if (session.mc === 0) {
messageBuffer = this.writeMessageA(session.hs, message);
} else if (session.mc.eqn(1)) {
} else if (session.mc === 1) {
const { messageBuffer: mb, h, cs1, cs2 } = this.writeMessageB(session.hs, message);
messageBuffer = mb;
session.h = h;
session.cs1 = cs1;
session.cs2 = cs2;
} else if (session.mc.gtn(1)) {
} else if (session.mc > 1) {
if (session.i) {
if (!session.cs1) {
throw new Error("CS1 (cipher state) is not defined")
@ -54,16 +52,16 @@ export class IK extends AbstractHandshake {
throw new Error("Session invalid.")
}
session.mc = session.mc.add(new BN(1));
session.mc++;
return messageBuffer;
}
public recvMessage(session: NoiseSession, message: MessageBuffer): {plaintext: bytes; valid: boolean} {
let plaintext = Buffer.alloc(0), valid = false;
if (session.mc.eqn(0)) {
if (session.mc === 0) {
({plaintext, valid} = this.readMessageA(session.hs, message));
}
if (session.mc.eqn(1)) {
if (session.mc === 1) {
const { plaintext: pt, valid: v, h, cs1, cs2 } = this.readMessageB(session.hs, message);
plaintext = pt;
valid = v;
@ -71,7 +69,7 @@ export class IK extends AbstractHandshake {
session.cs1 = cs1;
session.cs2 = cs2;
}
session.mc = session.mc.add(new BN(1));
session.mc++;
return {plaintext, valid};
}

22
src/handshakes/xx.ts
View File

@ -1,6 +1,4 @@
import { Buffer } from 'buffer';
import BN from 'bn.js';
import { bytes32, bytes } from '../@types/basic'
import { KeyPair } from '../@types/libp2p'
import {generateKeypair, isValidPublicKey} from '../utils';
@ -129,23 +127,23 @@ export class XX extends AbstractHandshake {
return {
hs,
i: initiator,
mc: new BN(0),
mc: 0,
};
}
public sendMessage(session: NoiseSession, message: bytes, ephemeral?: KeyPair): MessageBuffer {
let messageBuffer: MessageBuffer;
if (session.mc.eqn(0)) {
if (session.mc === 0) {
messageBuffer = this.writeMessageA(session.hs, message, ephemeral);
} else if (session.mc.eqn(1)) {
} else if (session.mc === 1) {
messageBuffer = this.writeMessageB(session.hs, message);
} else if (session.mc.eqn(2)) {
} else if (session.mc === 2) {
const { h, messageBuffer: resultingBuffer, cs1, cs2 } = this.writeMessageC(session.hs, message);
messageBuffer = resultingBuffer;
session.h = h;
session.cs1 = cs1;
session.cs2 = cs2;
} else if (session.mc.gtn(2)) {
} else if (session.mc > 2) {
if (session.i) {
if (!session.cs1) {
throw new Error("CS1 (cipher state) is not defined")
@ -163,18 +161,18 @@ export class XX extends AbstractHandshake {
throw new Error("Session invalid.")
}
session.mc = session.mc.add(new BN(1));
session.mc++;
return messageBuffer;
}
public recvMessage(session: NoiseSession, message: MessageBuffer): {plaintext: bytes; valid: boolean} {
let plaintext: bytes = Buffer.alloc(0);
let valid = false;
if (session.mc.eqn(0)) {
if (session.mc === 0) {
({plaintext, valid} = this.readMessageA(session.hs, message));
} else if (session.mc.eqn(1)) {
} else if (session.mc === 1) {
({plaintext, valid} = this.readMessageB(session.hs, message));
} else if (session.mc.eqn(2)) {
} else if (session.mc === 2) {
const { h, plaintext: resultingPlaintext, valid: resultingValid, cs1, cs2 } = this.readMessageC(session.hs, message);
plaintext = resultingPlaintext;
valid = resultingValid;
@ -182,7 +180,7 @@ export class XX extends AbstractHandshake {
session.cs1 = cs1;
session.cs2 = cs2;
}
session.mc = session.mc.add(new BN(1));
session.mc++;
return {plaintext, valid};
}
}

2
src/noise.ts
View File

@ -1,4 +1,4 @@
import {x25519} from 'bcrypto';
import x25519 from 'bcrypto/lib/js/x25519';
import {Buffer} from "buffer";
import Wrap from 'it-pb-rpc';
import DuplexPair from 'it-pair/duplex';

8
src/utils.ts
View File

@ -1,7 +1,9 @@
import {HKDF, SHA256, x25519} from 'bcrypto';
import HKDF from 'bcrypto/lib/hkdf';
import x25519 from 'bcrypto/lib/js/x25519';
import SHA256 from 'bcrypto/lib/js/sha256';
import {Buffer} from "buffer";
import PeerId from "peer-id";
import * as crypto from 'libp2p-crypto';
import {keys} from 'libp2p-crypto';
import {KeyPair} from "./@types/libp2p";
import {bytes, bytes32} from "./@types/basic";
import {Hkdf, INoisePayload} from "./@types/handshake";
@ -91,7 +93,7 @@ export async function verifySignedPayload(
}
const generatedPayload = getHandshakePayload(noiseStaticKey);
// Unmarshaling from PublicKey protobuf
const publicKey = crypto.keys.unmarshalPublicKey(identityKey);
const publicKey = keys.unmarshalPublicKey(identityKey);
if (!publicKey.verify(generatedPayload, payload.identitySig)) {
throw new Error("Static key doesn't match to peer that signed payload!");
}