From 051f0765f9ec0d88c589c37e681169ec35ae61b6 Mon Sep 17 00:00:00 2001 From: morrigan Date: Wed, 6 Nov 2019 15:49:20 +0100 Subject: [PATCH] Finish all handshake stages --- src/xx.ts | 2 +- test/xx.test.ts | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/xx.ts b/src/xx.ts index b9d94dc..4947f63 100644 --- a/src/xx.ts +++ b/src/xx.ts @@ -375,7 +375,7 @@ export class XXHandshake { return messageBuffer; } - public async RecvMessage(session: NoiseSession, message: MessageBuffer) : Promise { + public async recvMessage(session: NoiseSession, message: MessageBuffer) : Promise { let plaintext: bytes; if (session.mc.eqn(0)) { plaintext = await this.readMessageA(session.hs, message); diff --git a/test/xx.test.ts b/test/xx.test.ts index a9a9470..c5232b8 100644 --- a/test/xx.test.ts +++ b/test/xx.test.ts @@ -73,7 +73,8 @@ describe("Index", () => { expect(messageBuffer.ne.length).not.equal(0); // responder receives message - const plaintext = await xx.RecvMessage(nsResp, messageBuffer); + const plaintext = await xx.recvMessage(nsResp, messageBuffer); + console.log("Stage 0 responder payload: ", plaintext); /* STAGE 1 */ @@ -91,8 +92,18 @@ describe("Index", () => { expect(messageBuffer2.ns.length).not.equal(0); // initiator receive payload - const plaintext2 = await xx.RecvMessage(nsInit, messageBuffer2); - console.log(plaintext2); + const plaintext2 = await xx.recvMessage(nsInit, messageBuffer2); + console.log("Stage 1 responder payload: ", plaintext2); + + /* STAGE 2 */ + + // initiator send message + const messageBuffer3 = await xx.sendMessage(nsInit, Buffer.alloc(0)); + // responder receive message + const plaintext3 = await xx.recvMessage(nsResp, messageBuffer3); + console.log("Stage 2 responder payload: ", plaintext3); + + return { nsInit, nsResp }; } it("Test handshake", async () => {