RanchiMall/flocore
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix post-rebase confilcts

Browse Source
This commit is contained in:
Manuel Araoz 2014-12-16 03:35:31 -03:00
parent 4fcc048311
commit 7683d2c2ed
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/publickey.js
View File

@ -53,6 +53,8 @@ var PublicKey = function PublicKey(data, extra) {
info.point = data; info.point = data;
} else if (PublicKey._isJSON(data)) { } else if (PublicKey._isJSON(data)) {
info = PublicKey._transformJSON(data); info = PublicKey._transformJSON(data);
} else if (typeof(data) === 'string') {
info = PublicKey._transformDER(new Buffer(data, 'hex'));
} else if (PublicKey._isBuffer(data)) { } else if (PublicKey._isBuffer(data)) {
info = PublicKey._transformDER(data); info = PublicKey._transformDER(data);
} else if (PublicKey._isPrivateKey(data)) { } else if (PublicKey._isPrivateKey(data)) {
@ -60,7 +62,7 @@ var PublicKey = function PublicKey(data, extra) {
} else { } else {
throw new TypeError('First argument is an unrecognized data format.'); throw new TypeError('First argument is an unrecognized data format.');
} }
// validation // validation
info.point.validate(); info.point.validate();
@ -289,7 +291,9 @@ PublicKey.fromPoint = function(point, compressed) {
*/ */
PublicKey.fromDER = function(buf, strict) { PublicKey.fromDER = function(buf, strict) {
var info = PublicKey._transformDER(buf, strict); var info = PublicKey._transformDER(buf, strict);
return new PublicKey(info.point, info.compressed); return new PublicKey(info.point, {
compressed: info.compressed
});
}; };
/** /**