Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #8 - Make share output valid hexadecimal #9

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix #8 - Make share output valid hexadecimal #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions secrets.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ exports.share = function(secret, numShares, threshold, padLength, withoutPrefix)
}
}else{
for(var i=0; i<numShares; i++){
x[i] = config.bits.toString(36).toUpperCase() + padLeft(x[i],padding) + bin2hex(y[i]);
x[i] = padLeft(config.bits.toString(16).toUpperCase(), 2) + padLeft(x[i], padding) + bin2hex(y[i]);
}
}

Expand Down Expand Up @@ -300,15 +300,15 @@ function inArray(arr,val){

function processShare(share){

var bits = parseInt(share[0], 36);
var bits = parseInt(share.substring(0, 2), 16);
if(bits && (typeof bits !== 'number' || bits%1 !== 0 || bits<defaults.minBits || bits>defaults.maxBits)){
throw new Error('Number of bits must be an integer between ' + defaults.minBits + ' and ' + defaults.maxBits + ', inclusive.')
}

var max = Math.pow(2, bits) - 1;
var idLength = max.toString(config.radix).length;

var id = parseInt(share.substr(1, idLength), config.radix);
var id = parseInt(share.substr(2, idLength), config.radix);
if(typeof id !== 'number' || id%1 !== 0 || id<1 || id>max){
throw new Error('Share id must be an integer between 1 and ' + config.max + ', inclusive.');
}
Expand Down Expand Up @@ -392,7 +392,7 @@ exports.newShare = function(id, shares){
}

var padding = max.toString(config.radix).length;
return config.bits.toString(36).toUpperCase() + padLeft(id.toString(config.radix), padding) + combine(id, shares);
return padLeft(config.bits.toString(36).toUpperCase(), 2) + padLeft(id.toString(config.radix), padding) + combine(id, shares);
};

// Evaluate the Lagrange interpolation polynomial at x = `at`
Expand Down Expand Up @@ -529,4 +529,4 @@ exports.hex2str = function(str, bytesPerChar){

// by default, initialize without an RNG
exports.init();
})(typeof module !== 'undefined' && module['exports'] ? module['exports'] : (window['secrets'] = {}), typeof GLOBAL !== 'undefined' ? GLOBAL : window );
})(typeof module !== 'undefined' && module['exports'] ? module['exports'] : (window['secrets'] = {}), typeof GLOBAL !== 'undefined' ? GLOBAL : window );