Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions lib/bitauth-node.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const crypto = require('crypto');

BitAuth._generateRandomPair = function() {
const privateKeyBuffer = crypto.randomBytes(32); // may throw error if entropy sources drained
const publicKeyBuffer = secp256k1.publicKeyCreate(privateKeyBuffer, true);
const publicKeyBuffer = Buffer.from(secp256k1.publicKeyCreate(privateKeyBuffer, true));
return [privateKeyBuffer.toString('hex'), publicKeyBuffer.toString('hex')];
};

Expand All @@ -17,7 +17,7 @@ BitAuth._getPublicKeyFromPrivateKey = function(privkey) {
} else {
privateKeyBuffer = Buffer.from(privkey, 'hex');
}
return secp256k1.publicKeyCreate(privateKeyBuffer, true);
return Buffer.from(secp256k1.publicKeyCreate(privateKeyBuffer, true));
};

BitAuth._sign = function(hashBuffer, privkey) {
Expand All @@ -27,19 +27,19 @@ BitAuth._sign = function(hashBuffer, privkey) {
} else {
privkeyBuffer = Buffer.from(privkey, 'hex');
}
var signatureInfo = secp256k1.sign(hashBuffer, privkeyBuffer);
return secp256k1.signatureExport(signatureInfo.signature);
var signatureInfo = secp256k1.ecdsaSign(hashBuffer, privkeyBuffer);
return Buffer.from(secp256k1.signatureExport(signatureInfo.signature));
};

BitAuth._verifySignature = function(hashBuffer, signatureBuffer, pubkey) {
let pubkeyBuffer;
const signature = secp256k1.signatureNormalize(secp256k1.signatureImportLax(signatureBuffer));
const signature = secp256k1.signatureNormalize(secp256k1.signatureImport(signatureBuffer));
if (!Buffer.isBuffer(pubkey)){
pubkeyBuffer = Buffer.from(pubkey, 'hex');
} else {
pubkeyBuffer = pubkey;
}
return !!secp256k1.verify(hashBuffer, signature, pubkeyBuffer);
return !!secp256k1.ecdsaVerify(signature, hashBuffer, pubkeyBuffer);
};

module.exports = BitAuth;
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"version": "0.4.0",
"dependencies": {
"bs58": "^2.0.0",
"secp256k1": "3.7.1"
"secp256k1": "4.0.2"
},
"devDependencies": {
"benchmark": "^2.1.4",
Expand Down