Lancaster-University/DEMOS2
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Public Keys and Secret Keys for Trustees are now Base64 encoded. I've tested this against 1 trustee and multiple trustees.

Browse source
This commit is contained in:
vince0656 2018-09-04 15:21:31 +01:00
parent 801f6b274f
commit da74180884
5 changed files with 57 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Node/index.js
View file

@ -10,6 +10,7 @@ Dependencies can be found in 'package.json' and installed using 'npm install'
var port = 8080;
var Buffer = require('buffer').Buffer;
var atob = require("atob");
var CTX = require('milagro-crypto-js');
var express = require('express');
@ -65,6 +66,13 @@ app.get('/combpk', function(request, response){
});
function getKeyBytes(key, byteArray) {
for(let i = 0; i < key.length; i += 4) {
let B64EncodedByte = key.substring(i, i + 4);
byteArray.push(atob(B64EncodedByte));
}
}
//byte array version
app.post('/cmpkstring', function(request, response){
@ -77,19 +85,25 @@ app.post('/cmpkstring', function(request, response){
if(partials.length > 1)//if we're submitting more than one key
{
console.log('Combining ' + partials.length + " public keys into one...");
for (var i = partials.length - 1; i >= 0; i--) {
console.log('PK' + i + ': ' + partials[i]);
var bytes = Buffer.from(partials[i].split(','), 'hex');
var pk = new ctx.ECP.fromBytes(bytes);
parsed.push(pk);
for (let i = partials.length - 1; i >= 0; i--) {
console.log('PK' + i + ': ' + partials[i]);
let rawBytes = [];
getKeyBytes(partials[i], rawBytes);
parsed.push(new ctx.ECP.fromBytes(Buffer.from(rawBytes, 'hex')));
}
}
else if(partials.length === 1)
{
console.log("Combining just one public key...");
var bytes = Buffer.from(partials[0].split(','), 'hex');
var pk = new ctx.ECP.fromBytes(bytes);
parsed.push(pk);
let PKStr = partials[0];
console.log("PK: " + PKStr);
let rawBytes = [];
getKeyBytes(PKStr, rawBytes);
parsed.push(new ctx.ECP.fromBytes(Buffer.from(rawBytes, 'hex')));
}
response.json(combine_pks(parsed));

1
Node/package.json
View file

@ -17,6 +17,7 @@
"author": "Bingsheng Zang, Thomas Smith, Vincent de Almeida",
"license": "ISC",
"dependencies": {
"atob": "^2.1.2",
"body-parser": "^1.18.3",
"express": "^4.16.3",
"milagro-crypto-js": "git+https://github.com/milagro-crypto/milagro-crypto-js.git"