From 5c1a50bd8e4cf6f11c68a8a6d1e39feac70b2801 Mon Sep 17 00:00:00 2001
From: Belma Gutlic <belma.dzi@gmail.com>
Date: Fri, 27 Dec 2019 13:15:06 +0100
Subject: [PATCH] Address PR comments

---
 src/crypto.ts      |  4 ++--
 test/noise.test.ts |  5 +++--
 test/utils.ts      | 12 ------------
 3 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/src/crypto.ts b/src/crypto.ts
index 4f4a0b0..34f8c06 100644
--- a/src/crypto.ts
+++ b/src/crypto.ts
@@ -11,7 +11,7 @@ const maxPlaintextLength = 65519;
 export function encryptStream(handshake: Handshake): ReturnEncryptionWrapper {
   return async function * (source) {
     for await (const chunk of source) {
-      const chunkBuffer = Buffer.from(chunk);
+      const chunkBuffer = Buffer.from(chunk.buffer, chunk.byteOffset, chunk.length);
 
       for (let i = 0; i < chunkBuffer.length; i += maxPlaintextLength) {
         let end = i + maxPlaintextLength;
@@ -31,7 +31,7 @@ export function encryptStream(handshake: Handshake): ReturnEncryptionWrapper {
 export function decryptStream(handshake: Handshake): ReturnEncryptionWrapper {
   return async function * (source) {
     for await (const chunk of source) {
-      const chunkBuffer = Buffer.from(chunk);
+      const chunkBuffer = Buffer.from(chunk.buffer, chunk.byteOffset, chunk.length);
 
       for (let i = 0; i < chunkBuffer.length; i += maxPlaintextLength) {
         let end = i + maxPlaintextLength;
diff --git a/test/noise.test.ts b/test/noise.test.ts
index 5d68098..d6a8dd2 100644
--- a/test/noise.test.ts
+++ b/test/noise.test.ts
@@ -4,6 +4,7 @@ import DuplexPair from 'it-pair/duplex';
 import { Noise } from "../src";
 import {createPeerIdsFromFixtures} from "./fixtures/peer";
 import Wrap from "it-pb-rpc";
+import { random } from "bcrypto";
 import {Handshake} from "../src/handshake";
 import {
   createHandshakePayload,
@@ -14,7 +15,7 @@ import {
 import { decodeMessageBuffer, encodeMessageBuffer } from "../src/encoder";
 import {XXHandshake} from "../src/xx";
 import {Buffer} from "buffer";
-import {getKeyPairFromPeerId, getRandomBuffer} from "./utils";
+import {getKeyPairFromPeerId} from "./utils";
 
 describe("Noise", () => {
   let remotePeer, localPeer;
@@ -113,7 +114,7 @@ describe("Noise", () => {
       const wrappedInbound = Wrap(inbound.conn);
       const wrappedOutbound = Wrap(outbound.conn);
 
-      const largePlaintext = getRandomBuffer(100000);
+      const largePlaintext = random.randomBytes(100000);
       wrappedOutbound.writeLP(largePlaintext);
       const response = await wrappedInbound.readLP();
 
diff --git a/test/utils.ts b/test/utils.ts
index 7f68b0d..5e8b430 100644
--- a/test/utils.ts
+++ b/test/utils.ts
@@ -12,15 +12,3 @@ export function getKeyPairFromPeerId(peerId: PeerId): KeyPair {
     publicKey: peerId.marshalPubKey(),
   }
 }
-
-export function getRandomBuffer(size: number) : bytes {
-  size = Math.max(1, size<<0);
-
-    const buf = Buffer.alloc(size);
-    let i = 0;
-    for (; i < size; ++i) {
-      buf[i] = (Math.random() * 0xFF) << 0;
-    }
-
-    return buf;
-}