Handshake payload refactor

This commit is contained in:
morrigan
2019-11-20 21:38:14 +01:00
parent 3519df482d
commit af95dc2fcd
6 changed files with 64 additions and 42 deletions

View File

@ -1,8 +1,14 @@
import { x25519 } from 'bcrypto';
import * as crypto from 'libp2p-crypto';
import { x25519, ed25519 } from 'bcrypto';
import protobuf from "protobufjs";
import { KeyPair } from "./@types/libp2p";
import { bytes } from "./@types/basic";
import {Buffer} from "buffer";
export async function loadPayloadProto () {
const payloadProtoBuf = await protobuf.load("protos/payload.proto");
return payloadProtoBuf.lookupType("pb.NoiseHandshakePayload");
}
export async function generateKeypair() : Promise<KeyPair> {
const privateKey = x25519.privateKeyGenerate();
@ -14,8 +20,40 @@ export async function generateKeypair() : Promise<KeyPair> {
}
}
export async function signPayload(privateKey: bytes, payload: bytes) {
const Ed25519PrivateKey = crypto.keys.supportedKeys.ed25519.Ed25519PrivateKey;
// const ed25519 = Ed25519PrivateKey(privateKey, "need-to-get-public-key");
// return ed25519.sign(privateKey, payload);
export async function createHandshakePayload(
libp2pKeys: KeyPair,
signedPayload: bytes,
earlyData?: bytes,
) : Promise<bytes> {
const NoiseHandshakePayload = await loadPayloadProto();
const payloadInit = NoiseHandshakePayload.create({
libp2pKey: libp2pKeys.publicKey,
noiseStaticKeySignature: signedPayload,
...resolveEarlyDataPayload(libp2pKeys.privateKey, earlyData),
});
return Buffer.from(NoiseHandshakePayload.encode(payloadInit).finish());
}
export function signPayload(privateKey: bytes, payload: bytes) {
return ed25519.sign(payload, privateKey);
}
export const getHandshakePayload = (publicKey: bytes ) => Buffer.concat([Buffer.from("noise-libp2p-static-key:"), publicKey]);
export const getEarlyDataPayload = (earlyData: bytes) => Buffer.concat([Buffer.from("noise-libp2p-early-data:"), earlyData]);
function resolveEarlyDataPayload(privateKey: bytes, earlyData?: bytes) : Object {
if (!earlyData) {
return {};
}
const payload = getEarlyDataPayload(earlyData);
const signedPayload = signPayload(privateKey, payload);
return {
libp2pData: payload,
libp2pDataSignature: signedPayload,
}
}