lib: relint using eslint

This commit is contained in:
Fedor Indutny
2020-08-02 08:33:08 -07:00
parent a60dd10e4f
commit ccc7030b86
23 changed files with 6280 additions and 7077 deletions
+1
View File
@@ -0,0 +1 @@
test/lib
+68
View File
@@ -0,0 +1,68 @@
module.exports = {
"env": {
"node": true,
"es6": true
},
"extends": [
"eslint:recommended",
],
"globals": {
"Atomics": "readonly",
"SharedArrayBuffer": "readonly",
"BigInt": "readonly",
},
"parserOptions": {
"ecmaVersion": 2020,
"sourceType": "module",
"ecmaFeatures": {
"jsx": true
}
},
"rules": {
"indent": [
"error",
2
],
"linebreak-style": [
"error",
"unix"
],
"quotes": [
"error",
"single"
],
"semi": [
"error",
"always"
],
"array-bracket-spacing": [ "error", "always" ],
"brace-style": [ "error" ],
"camelcase": [ "error" ],
"comma-spacing": [ "error" ],
"comma-style": [ "error" ],
"eol-last": [ "error" ],
"func-call-spacing": [ "error" ],
"func-name-matching": [ "error" ],
"no-multiple-empty-lines": [ "error" ],
"no-tabs": [ "error" ],
"no-trailing-spaces": [ "error" ],
"no-whitespace-before-property": [ "error" ],
"object-curly-newline": [ "error" ],
"object-curly-spacing": [ "error", "always" ],
"padded-blocks": [ "error", "never" ],
"quotes": [ "error", "single", { "avoidEscape": true } ],
"semi-spacing": [ "error" ],
"semi-style": [ "error" ],
"space-before-blocks": [ "error" ],
"space-in-parens": [ "error" ],
"space-infix-ops": [ "error" ],
"space-unary-ops": [ "error" ],
"switch-colon-spacing": [ "error" ],
"comma-dangle": [ "error", "always-multiline" ],
},
"settings": {
"react": {
"version": "detect",
},
}
};
-46
View File
@@ -1,46 +0,0 @@
{
"disallowKeywordsOnNewLine": [ "else" ],
"disallowMixedSpacesAndTabs": true,
"disallowMultipleLineStrings": true,
"disallowMultipleVarDecl": true,
"disallowNewlineBeforeBlockStatements": true,
"disallowQuotedKeysInObjects": true,
"disallowSpaceAfterObjectKeys": true,
"disallowSpaceAfterPrefixUnaryOperators": true,
"disallowSpaceBeforePostfixUnaryOperators": true,
"disallowSpacesInCallExpression": true,
"disallowTrailingComma": true,
"disallowTrailingWhitespace": true,
"disallowYodaConditions": true,
"requireCommaBeforeLineBreak": true,
"requireOperatorBeforeLineBreak": true,
"requireSpaceAfterBinaryOperators": true,
"requireSpaceAfterKeywords": [ "if", "for", "while", "else", "try", "catch" ],
"requireSpaceAfterLineComment": true,
"requireSpaceBeforeBinaryOperators": true,
"requireSpaceBeforeBlockStatements": true,
"requireSpaceBeforeKeywords": [ "else", "catch" ],
"requireSpaceBeforeObjectValues": true,
"requireSpaceBetweenArguments": true,
"requireSpacesInAnonymousFunctionExpression": {
"beforeOpeningCurlyBrace": true
},
"requireSpacesInFunctionDeclaration": {
"beforeOpeningCurlyBrace": true
},
"requireSpacesInFunctionExpression": {
"beforeOpeningCurlyBrace": true
},
"requireSpacesInConditionalExpression": true,
"requireSpacesInForStatement": true,
"requireSpacesInsideArrayBrackets": "all",
"requireSpacesInsideObjectBrackets": "all",
"requireDotNotation": true,
"maximumLineLength": 80,
"validateIndentation": 2,
"validateLineBreaks": "LF",
"validateParameterSeparator": ", ",
"validateQuoteMarks": "'"
}
-89
View File
@@ -1,89 +0,0 @@
{
// JSHint Default Configuration File (as on JSHint website)
// See http://jshint.com/docs/ for more details
"maxerr" : 50, // {int} Maximum error before stopping
// Enforcing
"bitwise" : false, // true: Prohibit bitwise operators (&, |, ^, etc.)
"camelcase" : true, // true: Identifiers must be in camelCase
"curly" : false, // true: Require {} for every new block or scope
"eqeqeq" : true, // true: Require triple equals (===) for comparison
"forin" : true, // true: Require filtering for..in loops with obj.hasOwnProperty()
"freeze" : true, // true: prohibits overwriting prototypes of native objects such as Array, Date etc.
"immed" : false, // true: Require immediate invocations to be wrapped in parens e.g. `(function () { } ());`
"indent" : 2, // {int} Number of spaces to use for indentation
"latedef" : true, // true: Require variables/functions to be defined before being used
"newcap" : true, // true: Require capitalization of all constructor functions e.g. `new F()`
"noarg" : true, // true: Prohibit use of `arguments.caller` and `arguments.callee`
"noempty" : false, // true: Prohibit use of empty blocks
"nonbsp" : true, // true: Prohibit "non-breaking whitespace" characters.
"nonew" : false, // true: Prohibit use of constructors for side-effects (without assignment)
"plusplus" : false, // true: Prohibit use of `++` & `--`
"quotmark" : "single", // Quotation mark consistency:
// false : do nothing (default)
// true : ensure whatever is used is consistent
// "single" : require single quotes
// "double" : require double quotes
"undef" : true, // true: Require all non-global variables to be declared (prevents global leaks)
"unused" : true, // true: Require all defined variables be used
"strict" : true, // true: Requires all functions run in ES5 Strict Mode
"maxparams" : false, // {int} Max number of formal params allowed per function
"maxdepth" : 4, // {int} Max depth of nested blocks (within functions)
"maxstatements" : false, // {int} Max number statements per function
"maxcomplexity" : false, // {int} Max cyclomatic complexity per function
"maxlen" : false, // {int} Max number of characters per line
// Relaxing
"asi" : false, // true: Tolerate Automatic Semicolon Insertion (no semicolons)
"boss" : false, // true: Tolerate assignments where comparisons would be expected
"debug" : false, // true: Allow debugger statements e.g. browser breakpoints.
"eqnull" : false, // true: Tolerate use of `== null`
"es5" : false, // true: Allow ES5 syntax (ex: getters and setters)
"esnext" : false, // true: Allow ES.next (ES6) syntax (ex: `const`)
"moz" : false, // true: Allow Mozilla specific syntax (extends and overrides esnext features)
// (ex: `for each`, multiple try/catch, function expression…)
"evil" : false, // true: Tolerate use of `eval` and `new Function()`
"expr" : false, // true: Tolerate `ExpressionStatement` as Programs
"funcscope" : false, // true: Tolerate defining variables inside control statements
"globalstrict" : false, // true: Allow global "use strict" (also enables 'strict')
"iterator" : false, // true: Tolerate using the `__iterator__` property
"lastsemic" : false, // true: Tolerate omitting a semicolon for the last statement of a 1-line block
"laxbreak" : false, // true: Tolerate possibly unsafe line breakings
"laxcomma" : false, // true: Tolerate comma-first style coding
"loopfunc" : false, // true: Tolerate functions being defined in loops
"multistr" : false, // true: Tolerate multi-line strings
"noyield" : false, // true: Tolerate generator functions with no yield statement in them.
"notypeof" : false, // true: Tolerate invalid typeof operator values
"proto" : false, // true: Tolerate using the `__proto__` property
"scripturl" : false, // true: Tolerate script-targeted URLs
"shadow" : true, // true: Allows re-define variables later in code e.g. `var x=1; x=2;`
"sub" : false, // true: Tolerate using `[]` notation when it can still be expressed in dot notation
"supernew" : false, // true: Tolerate `new function () { ... };` and `new Object;`
"validthis" : false, // true: Tolerate using this in a non-constructor function
// Environments
"browser" : true, // Web Browser (window, document, etc)
"browserify" : true, // Browserify (node.js code in the browser)
"couch" : false, // CouchDB
"devel" : true, // Development/debugging (alert, confirm, etc)
"dojo" : false, // Dojo Toolkit
"jasmine" : false, // Jasmine
"jquery" : false, // jQuery
"mocha" : true, // Mocha
"mootools" : false, // MooTools
"node" : true, // Node.js
"nonstandard" : false, // Widely adopted globals (escape, unescape, etc)
"prototypejs" : false, // Prototype and Scriptaculous
"qunit" : false, // QUnit
"rhino" : false, // Rhino
"shelljs" : false, // ShellJS
"worker" : false, // Web Workers
"wsh" : false, // Windows Scripting Host
"yui" : false, // Yahoo User Interface
// Custom Globals
"globals" : {
"module": true
} // additional predefined global variables
}
+35 -30
View File
@@ -59,18 +59,20 @@ BaseCurve.prototype._fixedNafMul = function _fixedNafMul(p, k) {
// Translate into more windowed form
var repr = [];
for (var j = 0; j < naf.length; j += doubles.step) {
var nafW = 0;
for (var k = j + doubles.step - 1; k >= j; k--)
nafW = (nafW << 1) + naf[k];
var j;
var nafW;
for (j = 0; j < naf.length; j += doubles.step) {
nafW = 0;
for (var l = j + doubles.step - 1; l >= j; l--)
nafW = (nafW << 1) + naf[l];
repr.push(nafW);
}
var a = this.jpoint(null, null, null);
var b = this.jpoint(null, null, null);
for (var i = I; i > 0; i--) {
for (var j = 0; j < repr.length; j++) {
var nafW = repr[j];
for (j = 0; j < repr.length; j++) {
nafW = repr[j];
if (nafW === i)
b = b.mixedAdd(doubles.points[j]);
else if (nafW === -i)
@@ -96,11 +98,11 @@ BaseCurve.prototype._wnafMul = function _wnafMul(p, k) {
var acc = this.jpoint(null, null, null);
for (var i = naf.length - 1; i >= 0; i--) {
// Count zeroes
for (var k = 0; i >= 0 && naf[i] === 0; i--)
k++;
for (var l = 0; i >= 0 && naf[i] === 0; i--)
l++;
if (i >= 0)
k++;
acc = acc.dblp(k);
l++;
acc = acc.dblp(l);
if (i < 0)
break;
@@ -124,25 +126,28 @@ BaseCurve.prototype._wnafMul = function _wnafMul(p, k) {
};
BaseCurve.prototype._wnafMulAdd = function _wnafMulAdd(defW,
points,
coeffs,
len,
jacobianResult) {
points,
coeffs,
len,
jacobianResult) {
var wndWidth = this._wnafT1;
var wnd = this._wnafT2;
var naf = this._wnafT3;
// Fill all arrays
var max = 0;
for (var i = 0; i < len; i++) {
var p = points[i];
var i;
var j;
var p;
for (i = 0; i < len; i++) {
p = points[i];
var nafPoints = p._getNAFPoints(defW);
wndWidth[i] = nafPoints.wnd;
wnd[i] = nafPoints.points;
}
// Comb small window NAFs
for (var i = len - 1; i >= 1; i -= 2) {
for (i = len - 1; i >= 1; i -= 2) {
var a = i - 1;
var b = i;
if (wndWidth[a] !== 1 || wndWidth[b] !== 1) {
@@ -157,7 +162,7 @@ BaseCurve.prototype._wnafMulAdd = function _wnafMulAdd(defW,
points[a], /* 1 */
null, /* 3 */
null, /* 5 */
points[b] /* 7 */
points[b], /* 7 */
];
// Try to avoid Projective points, if possible
@@ -181,14 +186,14 @@ BaseCurve.prototype._wnafMulAdd = function _wnafMulAdd(defW,
7, /* 0 1 */
5, /* 1 -1 */
1, /* 1 0 */
3 /* 1 1 */
3, /* 1 1 */
];
var jsf = getJSF(coeffs[a], coeffs[b]);
max = Math.max(jsf[0].length, max);
naf[a] = new Array(max);
naf[b] = new Array(max);
for (var j = 0; j < max; j++) {
for (j = 0; j < max; j++) {
var ja = jsf[0][j] | 0;
var jb = jsf[1][j] | 0;
@@ -200,12 +205,12 @@ BaseCurve.prototype._wnafMulAdd = function _wnafMulAdd(defW,
var acc = this.jpoint(null, null, null);
var tmp = this._wnafT4;
for (var i = max; i >= 0; i--) {
for (i = max; i >= 0; i--) {
var k = 0;
while (i >= 0) {
var zero = true;
for (var j = 0; j < len; j++) {
for (j = 0; j < len; j++) {
tmp[j] = naf[j][i] | 0;
if (tmp[j] !== 0)
zero = false;
@@ -221,9 +226,9 @@ BaseCurve.prototype._wnafMulAdd = function _wnafMulAdd(defW,
if (i < 0)
break;
for (var j = 0; j < len; j++) {
for (j = 0; j < len; j++) {
var z = tmp[j];
var p;
p;
if (z === 0)
continue;
else if (z > 0)
@@ -238,7 +243,7 @@ BaseCurve.prototype._wnafMulAdd = function _wnafMulAdd(defW,
}
}
// Zeroify references
for (var i = 0; i < len; i++)
for (i = 0; i < len; i++)
wnd[i] = null;
if (jacobianResult)
@@ -276,7 +281,7 @@ BaseCurve.prototype.decodePoint = function decodePoint(bytes, enc) {
assert(bytes[bytes.length - 1] % 2 === 1);
var res = this.point(bytes.slice(1, 1 + len),
bytes.slice(1 + len, 1 + 2 * len));
bytes.slice(1 + len, 1 + 2 * len));
return res;
} else if ((bytes[0] === 0x02 || bytes[0] === 0x03) &&
@@ -297,7 +302,7 @@ BasePoint.prototype._encode = function _encode(compact) {
if (compact)
return [ this.getY().isEven() ? 0x02 : 0x03 ].concat(x);
return [ 0x04 ].concat(x, this.getY().toArray('be', len)) ;
return [ 0x04 ].concat(x, this.getY().toArray('be', len));
};
BasePoint.prototype.encode = function encode(enc, compact) {
@@ -311,7 +316,7 @@ BasePoint.prototype.precompute = function precompute(power) {
var precomputed = {
doubles: null,
naf: null,
beta: null
beta: null,
};
precomputed.naf = this._getNAFPoints(8);
precomputed.doubles = this._getDoubles(4, power);
@@ -345,7 +350,7 @@ BasePoint.prototype._getDoubles = function _getDoubles(step, power) {
}
return {
step: step,
points: doubles
points: doubles,
};
};
@@ -360,7 +365,7 @@ BasePoint.prototype._getNAFPoints = function _getNAFPoints(wnd) {
res[i] = res[i - 1].add(dbl);
return {
wnd: wnd,
points: res
points: res,
};
};
+12 -9
View File
@@ -221,9 +221,12 @@ Point.prototype._projDbl = function _projDbl() {
var nx;
var ny;
var nz;
var e;
var h;
var j;
if (this.curve.twisted) {
// E = a * C
var e = this.curve._mulA(c);
e = this.curve._mulA(c);
// F = E + D
var f = e.redAdd(d);
if (this.zOne) {
@@ -235,9 +238,9 @@ Point.prototype._projDbl = function _projDbl() {
nz = f.redSqr().redSub(f).redSub(f);
} else {
// H = Z1^2
var h = this.z.redSqr();
h = this.z.redSqr();
// J = F - 2 * H
var j = f.redSub(h).redISub(h);
j = f.redSub(h).redISub(h);
// X3 = (B-C-D)*J
nx = b.redSub(c).redISub(d).redMul(j);
// Y3 = F * (E - D)
@@ -247,11 +250,11 @@ Point.prototype._projDbl = function _projDbl() {
}
} else {
// E = C + D
var e = c.redAdd(d);
e = c.redAdd(d);
// H = (c * Z1)^2
var h = this.curve._mulC(this.z).redSqr();
h = this.curve._mulC(this.z).redSqr();
// J = E - 2 * H
var j = e.redSub(h).redSub(h);
j = e.redSub(h).redSub(h);
// X3 = c * (B - E) * J
nx = this.curve._mulC(b.redISub(e)).redMul(j);
// Y3 = c * E * (C - D)
@@ -388,9 +391,9 @@ Point.prototype.normalize = function normalize() {
Point.prototype.neg = function neg() {
return this.curve.point(this.x.redNeg(),
this.y,
this.z,
this.t && this.t.redNeg());
this.y,
this.z,
this.t && this.t.redNeg());
};
Point.prototype.getX = function getX() {
+45 -44
View File
@@ -60,7 +60,7 @@ ShortCurve.prototype._getEndomorphism = function _getEndomorphism(conf) {
basis = conf.basis.map(function(vec) {
return {
a: new BN(vec.a, 16),
b: new BN(vec.b, 16)
b: new BN(vec.b, 16),
};
});
} else {
@@ -70,7 +70,7 @@ ShortCurve.prototype._getEndomorphism = function _getEndomorphism(conf) {
return {
beta: beta,
lambda: lambda,
basis: basis
basis: basis,
};
};
@@ -161,7 +161,7 @@ ShortCurve.prototype._getEndoBasis = function _getEndoBasis(lambda) {
return [
{ a: a1, b: b1 },
{ a: a2, b: b2 }
{ a: a2, b: b2 },
];
};
@@ -217,36 +217,36 @@ ShortCurve.prototype.validate = function validate(point) {
ShortCurve.prototype._endoWnafMulAdd =
function _endoWnafMulAdd(points, coeffs, jacobianResult) {
var npoints = this._endoWnafT1;
var ncoeffs = this._endoWnafT2;
for (var i = 0; i < points.length; i++) {
var split = this._endoSplit(coeffs[i]);
var p = points[i];
var beta = p._getBeta();
var npoints = this._endoWnafT1;
var ncoeffs = this._endoWnafT2;
for (var i = 0; i < points.length; i++) {
var split = this._endoSplit(coeffs[i]);
var p = points[i];
var beta = p._getBeta();
if (split.k1.negative) {
split.k1.ineg();
p = p.neg(true);
}
if (split.k2.negative) {
split.k2.ineg();
beta = beta.neg(true);
}
if (split.k1.negative) {
split.k1.ineg();
p = p.neg(true);
}
if (split.k2.negative) {
split.k2.ineg();
beta = beta.neg(true);
}
npoints[i * 2] = p;
npoints[i * 2 + 1] = beta;
ncoeffs[i * 2] = split.k1;
ncoeffs[i * 2 + 1] = split.k2;
}
var res = this._wnafMulAdd(1, npoints, ncoeffs, i * 2, jacobianResult);
npoints[i * 2] = p;
npoints[i * 2 + 1] = beta;
ncoeffs[i * 2] = split.k1;
ncoeffs[i * 2 + 1] = split.k2;
}
var res = this._wnafMulAdd(1, npoints, ncoeffs, i * 2, jacobianResult);
// Clean-up references to points and coefficients
for (var j = 0; j < i * 2; j++) {
npoints[j] = null;
ncoeffs[j] = null;
}
return res;
};
// Clean-up references to points and coefficients
for (var j = 0; j < i * 2; j++) {
npoints[j] = null;
ncoeffs[j] = null;
}
return res;
};
function Point(curve, x, y, isRed) {
Base.BasePoint.call(this, curve, 'affine');
@@ -298,12 +298,12 @@ Point.prototype._getBeta = function _getBeta() {
beta: null,
naf: pre.naf && {
wnd: pre.naf.wnd,
points: pre.naf.points.map(endoMul)
points: pre.naf.points.map(endoMul),
},
doubles: pre.doubles && {
step: pre.doubles.step,
points: pre.doubles.points.map(endoMul)
}
points: pre.doubles.points.map(endoMul),
},
};
}
return beta;
@@ -316,12 +316,12 @@ Point.prototype.toJSON = function toJSON() {
return [ this.x, this.y, this.precomputed && {
doubles: this.precomputed.doubles && {
step: this.precomputed.doubles.step,
points: this.precomputed.doubles.points.slice(1)
points: this.precomputed.doubles.points.slice(1),
},
naf: this.precomputed.naf && {
wnd: this.precomputed.naf.wnd,
points: this.precomputed.naf.points.slice(1)
}
points: this.precomputed.naf.points.slice(1),
},
} ];
};
@@ -341,12 +341,12 @@ Point.fromJSON = function fromJSON(curve, obj, red) {
beta: null,
doubles: pre.doubles && {
step: pre.doubles.step,
points: [ res ].concat(pre.doubles.points.map(obj2point))
points: [ res ].concat(pre.doubles.points.map(obj2point)),
},
naf: pre.naf && {
wnd: pre.naf.wnd,
points: [ res ].concat(pre.naf.points.map(obj2point))
}
points: [ res ].concat(pre.naf.points.map(obj2point)),
},
};
return res;
};
@@ -468,12 +468,12 @@ Point.prototype.neg = function neg(_precompute) {
res.precomputed = {
naf: pre.naf && {
wnd: pre.naf.wnd,
points: pre.naf.points.map(negate)
points: pre.naf.points.map(negate),
},
doubles: pre.doubles && {
step: pre.doubles.step,
points: pre.doubles.points.map(negate)
}
points: pre.doubles.points.map(negate),
},
};
}
return res;
@@ -610,9 +610,10 @@ JPoint.prototype.dblp = function dblp(pow) {
if (!pow)
return this.dbl();
var i;
if (this.curve.zeroA || this.curve.threeA) {
var r = this;
for (var i = 0; i < pow; i++)
for (i = 0; i < pow; i++)
r = r.dbl();
return r;
}
@@ -629,7 +630,7 @@ JPoint.prototype.dblp = function dblp(pow) {
// Reuse results
var jyd = jy.redAdd(jy);
for (var i = 0; i < pow; i++) {
for (i = 0; i < pow; i++) {
var jx2 = jx.redSqr();
var jyd2 = jyd.redSqr();
var jyd4 = jyd2.redSqr();
+21 -21
View File
@@ -33,10 +33,10 @@ function defineCurve(name, options) {
Object.defineProperty(curves, name, {
configurable: true,
enumerable: true,
value: curve
value: curve,
});
return curve;
}
},
});
}
@@ -51,8 +51,8 @@ defineCurve('p192', {
gRed: false,
g: [
'188da80e b03090f6 7cbf20eb 43a18800 f4ff0afd 82ff1012',
'07192b95 ffc8da78 631011ed 6b24cdd5 73f977a1 1e794811'
]
'07192b95 ffc8da78 631011ed 6b24cdd5 73f977a1 1e794811',
],
});
defineCurve('p224', {
@@ -66,8 +66,8 @@ defineCurve('p224', {
gRed: false,
g: [
'b70e0cbd 6bb4bf7f 321390b9 4a03c1d3 56c21122 343280d6 115c1d21',
'bd376388 b5f723fb 4c22dfe6 cd4375a0 5a074764 44d58199 85007e34'
]
'bd376388 b5f723fb 4c22dfe6 cd4375a0 5a074764 44d58199 85007e34',
],
});
defineCurve('p256', {
@@ -81,8 +81,8 @@ defineCurve('p256', {
gRed: false,
g: [
'6b17d1f2 e12c4247 f8bce6e5 63a440f2 77037d81 2deb33a0 f4a13945 d898c296',
'4fe342e2 fe1a7f9b 8ee7eb4a 7c0f9e16 2bce3357 6b315ece cbb64068 37bf51f5'
]
'4fe342e2 fe1a7f9b 8ee7eb4a 7c0f9e16 2bce3357 6b315ece cbb64068 37bf51f5',
],
});
defineCurve('p384', {
@@ -102,8 +102,8 @@ defineCurve('p384', {
'aa87ca22 be8b0537 8eb1c71e f320ad74 6e1d3b62 8ba79b98 59f741e0 82542a38 ' +
'5502f25d bf55296c 3a545e38 72760ab7',
'3617de4a 96262c6f 5d9e98bf 9292dc29 f8f41dbd 289a147c e9da3113 b5f0b8c0 ' +
'0a60b1ce 1d7e819d 7a431d7c 90ea0e5f'
]
'0a60b1ce 1d7e819d 7a431d7c 90ea0e5f',
],
});
defineCurve('p521', {
@@ -129,8 +129,8 @@ defineCurve('p521', {
'a2ffa8de 3348b3c1 856a429b f97e7e31 c2e5bd66',
'00000118 39296a78 9a3bc004 5c8a5fb4 2c7d1bd9 98f54449 ' +
'579b4468 17afbd17 273e662c 97ee7299 5ef42640 c550b901 ' +
'3fad0761 353c7086 a272c240 88be9476 9fd16650'
]
'3fad0761 353c7086 a272c240 88be9476 9fd16650',
],
});
defineCurve('curve25519', {
@@ -143,8 +143,8 @@ defineCurve('curve25519', {
hash: hash.sha256,
gRed: false,
g: [
'9'
]
'9',
],
});
defineCurve('ed25519', {
@@ -162,8 +162,8 @@ defineCurve('ed25519', {
'216936d3cd6e53fec0a4e231fdd6dc5c692cc7609525a7b2c9562d608f25d51a',
// 4/5
'6666666666666666666666666666666666666666666666666666666666666658'
]
'6666666666666666666666666666666666666666666666666666666666666658',
],
});
var pre;
@@ -189,18 +189,18 @@ defineCurve('secp256k1', {
basis: [
{
a: '3086d221a7d46bcde86c90e49284eb15',
b: '-e4437ed6010e88286f547fa90abfe4c3'
b: '-e4437ed6010e88286f547fa90abfe4c3',
},
{
a: '114ca50f7a8e2f3f657c1108d9d44cfd8',
b: '3086d221a7d46bcde86c90e49284eb15'
}
b: '3086d221a7d46bcde86c90e49284eb15',
},
],
gRed: false,
g: [
'79be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798',
'483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8',
pre
]
pre,
],
});
+13 -11
View File
@@ -16,7 +16,8 @@ function EC(options) {
// Shortcut `elliptic.ec(curve-name)`
if (typeof options === 'string') {
assert(curves.hasOwnProperty(options), 'Unknown curve ' + options);
assert(Object.prototype.hasOwnProperty.call(curves, options),
'Unknown curve ' + options);
options = curves[options];
}
@@ -62,22 +63,22 @@ EC.prototype.genKeyPair = function genKeyPair(options) {
persEnc: options.persEnc || 'utf8',
entropy: options.entropy || rand(this.hash.hmacStrength),
entropyEnc: options.entropy && options.entropyEnc || 'utf8',
nonce: this.n.toArray()
nonce: this.n.toArray(),
});
var bytes = this.n.byteLength();
var ns2 = this.n.sub(new BN(2));
do {
for (;;) {
var priv = new BN(drbg.generate(bytes));
if (priv.cmp(ns2) > 0)
continue;
priv.iaddn(1);
return this.keyFromPrivate(priv);
} while (true);
}
};
EC.prototype._truncateToN = function truncateToN(msg, truncOnly) {
EC.prototype._truncateToN = function _truncateToN(msg, truncOnly) {
var delta = msg.byteLength() * 8 - this.n.bitLength();
if (delta > 0)
msg = msg.ushrn(delta);
@@ -111,16 +112,16 @@ EC.prototype.sign = function sign(msg, key, enc, options) {
entropy: bkey,
nonce: nonce,
pers: options.pers,
persEnc: options.persEnc || 'utf8'
persEnc: options.persEnc || 'utf8',
});
// Number of bytes to generate
var ns1 = this.n.sub(new BN(1));
for (var iter = 0; true; iter++) {
for (var iter = 0; ; iter++) {
var k = options.k ?
options.k(iter) :
new BN(drbg.generate(this.n.byteLength()));
options.k(iter) :
new BN(drbg.generate(this.n.byteLength()));
k = this._truncateToN(k, true);
if (k.cmpn(1) <= 0 || k.cmp(ns1) >= 0)
continue;
@@ -169,9 +170,10 @@ EC.prototype.verify = function verify(msg, signature, key, enc) {
var sinv = s.invm(this.n);
var u1 = sinv.mul(msg).umod(this.n);
var u2 = sinv.mul(r).umod(this.n);
var p;
if (!this.curve._maxwellTrick) {
var p = this.g.mulAdd(u1, key.getPublic(), u2);
p = this.g.mulAdd(u1, key.getPublic(), u2);
if (p.isInfinity())
return false;
@@ -181,7 +183,7 @@ EC.prototype.verify = function verify(msg, signature, key, enc) {
// NOTE: Greg Maxwell's trick, inspired by:
// https://git.io/vad3K
var p = this.g.jmulAdd(u1, key.getPublic(), u2);
p = this.g.jmulAdd(u1, key.getPublic(), u2);
if (p.isInfinity())
return false;
+2 -2
View File
@@ -23,7 +23,7 @@ KeyPair.fromPublic = function fromPublic(ec, pub, enc) {
return new KeyPair(ec, {
pub: pub,
pubEnc: enc
pubEnc: enc,
});
};
@@ -33,7 +33,7 @@ KeyPair.fromPrivate = function fromPrivate(ec, priv, enc) {
return new KeyPair(ec, {
priv: priv,
privEnc: enc
privEnc: enc,
});
};
+2 -2
View File
@@ -14,7 +14,7 @@ function EDDSA(curve) {
if (!(this instanceof EDDSA))
return new EDDSA(curve);
var curve = curves[curve].curve;
curve = curves[curve].curve;
this.curve = curve;
this.g = curve.g;
this.g.precompute(curve.n.bitLength() + 1);
@@ -38,7 +38,7 @@ EDDSA.prototype.sign = function sign(message, secret) {
var R = this.g.mul(r);
var Rencoded = this.encodePoint(R);
var s_ = this.hashInt(Rencoded, key.pubBytes(), message)
.mul(key.priv());
.mul(key.priv());
var S = r.add(s_).umod(this.curve.n);
return this.makeSignature({ R: R, S: S, Rencoded: Rencoded });
};
+1 -1
View File
@@ -23,7 +23,7 @@ function Signature(eddsa, sig) {
if (Array.isArray(sig)) {
sig = {
R: sig.slice(0, eddsa.encodingLength),
S: sig.slice(eddsa.encodingLength)
S: sig.slice(eddsa.encodingLength),
};
}
+197 -197
View File
@@ -4,777 +4,777 @@ module.exports = {
points: [
[
'e60fce93b59e9ec53011aabc21c23e97b2a31369b87a5ae9c44ee89e2a6dec0a',
'f7e3507399e595929db99f34f57937101296891e44d23f0be1f32cce69616821'
'f7e3507399e595929db99f34f57937101296891e44d23f0be1f32cce69616821',
],
[
'8282263212c609d9ea2a6e3e172de238d8c39cabd5ac1ca10646e23fd5f51508',
'11f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26caf'
'11f8a8098557dfe45e8256e830b60ace62d613ac2f7b17bed31b6eaff6e26caf',
],
[
'175e159f728b865a72f99cc6c6fc846de0b93833fd2222ed73fce5b551e5b739',
'd3506e0d9e3c79eba4ef97a51ff71f5eacb5955add24345c6efa6ffee9fed695'
'd3506e0d9e3c79eba4ef97a51ff71f5eacb5955add24345c6efa6ffee9fed695',
],
[
'363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640',
'4e273adfc732221953b445397f3363145b9a89008199ecb62003c7f3bee9de9'
'4e273adfc732221953b445397f3363145b9a89008199ecb62003c7f3bee9de9',
],
[
'8b4b5f165df3c2be8c6244b5b745638843e4a781a15bcd1b69f79a55dffdf80c',
'4aad0a6f68d308b4b3fbd7813ab0da04f9e336546162ee56b3eff0c65fd4fd36'
'4aad0a6f68d308b4b3fbd7813ab0da04f9e336546162ee56b3eff0c65fd4fd36',
],
[
'723cbaa6e5db996d6bf771c00bd548c7b700dbffa6c0e77bcb6115925232fcda',
'96e867b5595cc498a921137488824d6e2660a0653779494801dc069d9eb39f5f'
'96e867b5595cc498a921137488824d6e2660a0653779494801dc069d9eb39f5f',
],
[
'eebfa4d493bebf98ba5feec812c2d3b50947961237a919839a533eca0e7dd7fa',
'5d9a8ca3970ef0f269ee7edaf178089d9ae4cdc3a711f712ddfd4fdae1de8999'
'5d9a8ca3970ef0f269ee7edaf178089d9ae4cdc3a711f712ddfd4fdae1de8999',
],
[
'100f44da696e71672791d0a09b7bde459f1215a29b3c03bfefd7835b39a48db0',
'cdd9e13192a00b772ec8f3300c090666b7ff4a18ff5195ac0fbd5cd62bc65a09'
'cdd9e13192a00b772ec8f3300c090666b7ff4a18ff5195ac0fbd5cd62bc65a09',
],
[
'e1031be262c7ed1b1dc9227a4a04c017a77f8d4464f3b3852c8acde6e534fd2d',
'9d7061928940405e6bb6a4176597535af292dd419e1ced79a44f18f29456a00d'
'9d7061928940405e6bb6a4176597535af292dd419e1ced79a44f18f29456a00d',
],
[
'feea6cae46d55b530ac2839f143bd7ec5cf8b266a41d6af52d5e688d9094696d',
'e57c6b6c97dce1bab06e4e12bf3ecd5c981c8957cc41442d3155debf18090088'
'e57c6b6c97dce1bab06e4e12bf3ecd5c981c8957cc41442d3155debf18090088',
],
[
'da67a91d91049cdcb367be4be6ffca3cfeed657d808583de33fa978bc1ec6cb1',
'9bacaa35481642bc41f463f7ec9780e5dec7adc508f740a17e9ea8e27a68be1d'
'9bacaa35481642bc41f463f7ec9780e5dec7adc508f740a17e9ea8e27a68be1d',
],
[
'53904faa0b334cdda6e000935ef22151ec08d0f7bb11069f57545ccc1a37b7c0',
'5bc087d0bc80106d88c9eccac20d3c1c13999981e14434699dcb096b022771c8'
'5bc087d0bc80106d88c9eccac20d3c1c13999981e14434699dcb096b022771c8',
],
[
'8e7bcd0bd35983a7719cca7764ca906779b53a043a9b8bcaeff959f43ad86047',
'10b7770b2a3da4b3940310420ca9514579e88e2e47fd68b3ea10047e8460372a'
'10b7770b2a3da4b3940310420ca9514579e88e2e47fd68b3ea10047e8460372a',
],
[
'385eed34c1cdff21e6d0818689b81bde71a7f4f18397e6690a841e1599c43862',
'283bebc3e8ea23f56701de19e9ebf4576b304eec2086dc8cc0458fe5542e5453'
'283bebc3e8ea23f56701de19e9ebf4576b304eec2086dc8cc0458fe5542e5453',
],
[
'6f9d9b803ecf191637c73a4413dfa180fddf84a5947fbc9c606ed86c3fac3a7',
'7c80c68e603059ba69b8e2a30e45c4d47ea4dd2f5c281002d86890603a842160'
'7c80c68e603059ba69b8e2a30e45c4d47ea4dd2f5c281002d86890603a842160',
],
[
'3322d401243c4e2582a2147c104d6ecbf774d163db0f5e5313b7e0e742d0e6bd',
'56e70797e9664ef5bfb019bc4ddaf9b72805f63ea2873af624f3a2e96c28b2a0'
'56e70797e9664ef5bfb019bc4ddaf9b72805f63ea2873af624f3a2e96c28b2a0',
],
[
'85672c7d2de0b7da2bd1770d89665868741b3f9af7643397721d74d28134ab83',
'7c481b9b5b43b2eb6374049bfa62c2e5e77f17fcc5298f44c8e3094f790313a6'
'7c481b9b5b43b2eb6374049bfa62c2e5e77f17fcc5298f44c8e3094f790313a6',
],
[
'948bf809b1988a46b06c9f1919413b10f9226c60f668832ffd959af60c82a0a',
'53a562856dcb6646dc6b74c5d1c3418c6d4dff08c97cd2bed4cb7f88d8c8e589'
'53a562856dcb6646dc6b74c5d1c3418c6d4dff08c97cd2bed4cb7f88d8c8e589',
],
[
'6260ce7f461801c34f067ce0f02873a8f1b0e44dfc69752accecd819f38fd8e8',
'bc2da82b6fa5b571a7f09049776a1ef7ecd292238051c198c1a84e95b2b4ae17'
'bc2da82b6fa5b571a7f09049776a1ef7ecd292238051c198c1a84e95b2b4ae17',
],
[
'e5037de0afc1d8d43d8348414bbf4103043ec8f575bfdc432953cc8d2037fa2d',
'4571534baa94d3b5f9f98d09fb990bddbd5f5b03ec481f10e0e5dc841d755bda'
'4571534baa94d3b5f9f98d09fb990bddbd5f5b03ec481f10e0e5dc841d755bda',
],
[
'e06372b0f4a207adf5ea905e8f1771b4e7e8dbd1c6a6c5b725866a0ae4fce725',
'7a908974bce18cfe12a27bb2ad5a488cd7484a7787104870b27034f94eee31dd'
'7a908974bce18cfe12a27bb2ad5a488cd7484a7787104870b27034f94eee31dd',
],
[
'213c7a715cd5d45358d0bbf9dc0ce02204b10bdde2a3f58540ad6908d0559754',
'4b6dad0b5ae462507013ad06245ba190bb4850f5f36a7eeddff2c27534b458f2'
'4b6dad0b5ae462507013ad06245ba190bb4850f5f36a7eeddff2c27534b458f2',
],
[
'4e7c272a7af4b34e8dbb9352a5419a87e2838c70adc62cddf0cc3a3b08fbd53c',
'17749c766c9d0b18e16fd09f6def681b530b9614bff7dd33e0b3941817dcaae6'
'17749c766c9d0b18e16fd09f6def681b530b9614bff7dd33e0b3941817dcaae6',
],
[
'fea74e3dbe778b1b10f238ad61686aa5c76e3db2be43057632427e2840fb27b6',
'6e0568db9b0b13297cf674deccb6af93126b596b973f7b77701d3db7f23cb96f'
'6e0568db9b0b13297cf674deccb6af93126b596b973f7b77701d3db7f23cb96f',
],
[
'76e64113f677cf0e10a2570d599968d31544e179b760432952c02a4417bdde39',
'c90ddf8dee4e95cf577066d70681f0d35e2a33d2b56d2032b4b1752d1901ac01'
'c90ddf8dee4e95cf577066d70681f0d35e2a33d2b56d2032b4b1752d1901ac01',
],
[
'c738c56b03b2abe1e8281baa743f8f9a8f7cc643df26cbee3ab150242bcbb891',
'893fb578951ad2537f718f2eacbfbbbb82314eef7880cfe917e735d9699a84c3'
'893fb578951ad2537f718f2eacbfbbbb82314eef7880cfe917e735d9699a84c3',
],
[
'd895626548b65b81e264c7637c972877d1d72e5f3a925014372e9f6588f6c14b',
'febfaa38f2bc7eae728ec60818c340eb03428d632bb067e179363ed75d7d991f'
'febfaa38f2bc7eae728ec60818c340eb03428d632bb067e179363ed75d7d991f',
],
[
'b8da94032a957518eb0f6433571e8761ceffc73693e84edd49150a564f676e03',
'2804dfa44805a1e4d7c99cc9762808b092cc584d95ff3b511488e4e74efdf6e7'
'2804dfa44805a1e4d7c99cc9762808b092cc584d95ff3b511488e4e74efdf6e7',
],
[
'e80fea14441fb33a7d8adab9475d7fab2019effb5156a792f1a11778e3c0df5d',
'eed1de7f638e00771e89768ca3ca94472d155e80af322ea9fcb4291b6ac9ec78'
'eed1de7f638e00771e89768ca3ca94472d155e80af322ea9fcb4291b6ac9ec78',
],
[
'a301697bdfcd704313ba48e51d567543f2a182031efd6915ddc07bbcc4e16070',
'7370f91cfb67e4f5081809fa25d40f9b1735dbf7c0a11a130c0d1a041e177ea1'
'7370f91cfb67e4f5081809fa25d40f9b1735dbf7c0a11a130c0d1a041e177ea1',
],
[
'90ad85b389d6b936463f9d0512678de208cc330b11307fffab7ac63e3fb04ed4',
'e507a3620a38261affdcbd9427222b839aefabe1582894d991d4d48cb6ef150'
'e507a3620a38261affdcbd9427222b839aefabe1582894d991d4d48cb6ef150',
],
[
'8f68b9d2f63b5f339239c1ad981f162ee88c5678723ea3351b7b444c9ec4c0da',
'662a9f2dba063986de1d90c2b6be215dbbea2cfe95510bfdf23cbf79501fff82'
'662a9f2dba063986de1d90c2b6be215dbbea2cfe95510bfdf23cbf79501fff82',
],
[
'e4f3fb0176af85d65ff99ff9198c36091f48e86503681e3e6686fd5053231e11',
'1e63633ad0ef4f1c1661a6d0ea02b7286cc7e74ec951d1c9822c38576feb73bc'
'1e63633ad0ef4f1c1661a6d0ea02b7286cc7e74ec951d1c9822c38576feb73bc',
],
[
'8c00fa9b18ebf331eb961537a45a4266c7034f2f0d4e1d0716fb6eae20eae29e',
'efa47267fea521a1a9dc343a3736c974c2fadafa81e36c54e7d2a4c66702414b'
'efa47267fea521a1a9dc343a3736c974c2fadafa81e36c54e7d2a4c66702414b',
],
[
'e7a26ce69dd4829f3e10cec0a9e98ed3143d084f308b92c0997fddfc60cb3e41',
'2a758e300fa7984b471b006a1aafbb18d0a6b2c0420e83e20e8a9421cf2cfd51'
'2a758e300fa7984b471b006a1aafbb18d0a6b2c0420e83e20e8a9421cf2cfd51',
],
[
'b6459e0ee3662ec8d23540c223bcbdc571cbcb967d79424f3cf29eb3de6b80ef',
'67c876d06f3e06de1dadf16e5661db3c4b3ae6d48e35b2ff30bf0b61a71ba45'
'67c876d06f3e06de1dadf16e5661db3c4b3ae6d48e35b2ff30bf0b61a71ba45',
],
[
'd68a80c8280bb840793234aa118f06231d6f1fc67e73c5a5deda0f5b496943e8',
'db8ba9fff4b586d00c4b1f9177b0e28b5b0e7b8f7845295a294c84266b133120'
'db8ba9fff4b586d00c4b1f9177b0e28b5b0e7b8f7845295a294c84266b133120',
],
[
'324aed7df65c804252dc0270907a30b09612aeb973449cea4095980fc28d3d5d',
'648a365774b61f2ff130c0c35aec1f4f19213b0c7e332843967224af96ab7c84'
'648a365774b61f2ff130c0c35aec1f4f19213b0c7e332843967224af96ab7c84',
],
[
'4df9c14919cde61f6d51dfdbe5fee5dceec4143ba8d1ca888e8bd373fd054c96',
'35ec51092d8728050974c23a1d85d4b5d506cdc288490192ebac06cad10d5d'
'35ec51092d8728050974c23a1d85d4b5d506cdc288490192ebac06cad10d5d',
],
[
'9c3919a84a474870faed8a9c1cc66021523489054d7f0308cbfc99c8ac1f98cd',
'ddb84f0f4a4ddd57584f044bf260e641905326f76c64c8e6be7e5e03d4fc599d'
'ddb84f0f4a4ddd57584f044bf260e641905326f76c64c8e6be7e5e03d4fc599d',
],
[
'6057170b1dd12fdf8de05f281d8e06bb91e1493a8b91d4cc5a21382120a959e5',
'9a1af0b26a6a4807add9a2daf71df262465152bc3ee24c65e899be932385a2a8'
'9a1af0b26a6a4807add9a2daf71df262465152bc3ee24c65e899be932385a2a8',
],
[
'a576df8e23a08411421439a4518da31880cef0fba7d4df12b1a6973eecb94266',
'40a6bf20e76640b2c92b97afe58cd82c432e10a7f514d9f3ee8be11ae1b28ec8'
'40a6bf20e76640b2c92b97afe58cd82c432e10a7f514d9f3ee8be11ae1b28ec8',
],
[
'7778a78c28dec3e30a05fe9629de8c38bb30d1f5cf9a3a208f763889be58ad71',
'34626d9ab5a5b22ff7098e12f2ff580087b38411ff24ac563b513fc1fd9f43ac'
'34626d9ab5a5b22ff7098e12f2ff580087b38411ff24ac563b513fc1fd9f43ac',
],
[
'928955ee637a84463729fd30e7afd2ed5f96274e5ad7e5cb09eda9c06d903ac',
'c25621003d3f42a827b78a13093a95eeac3d26efa8a8d83fc5180e935bcd091f'
'c25621003d3f42a827b78a13093a95eeac3d26efa8a8d83fc5180e935bcd091f',
],
[
'85d0fef3ec6db109399064f3a0e3b2855645b4a907ad354527aae75163d82751',
'1f03648413a38c0be29d496e582cf5663e8751e96877331582c237a24eb1f962'
'1f03648413a38c0be29d496e582cf5663e8751e96877331582c237a24eb1f962',
],
[
'ff2b0dce97eece97c1c9b6041798b85dfdfb6d8882da20308f5404824526087e',
'493d13fef524ba188af4c4dc54d07936c7b7ed6fb90e2ceb2c951e01f0c29907'
'493d13fef524ba188af4c4dc54d07936c7b7ed6fb90e2ceb2c951e01f0c29907',
],
[
'827fbbe4b1e880ea9ed2b2e6301b212b57f1ee148cd6dd28780e5e2cf856e241',
'c60f9c923c727b0b71bef2c67d1d12687ff7a63186903166d605b68baec293ec'
'c60f9c923c727b0b71bef2c67d1d12687ff7a63186903166d605b68baec293ec',
],
[
'eaa649f21f51bdbae7be4ae34ce6e5217a58fdce7f47f9aa7f3b58fa2120e2b3',
'be3279ed5bbbb03ac69a80f89879aa5a01a6b965f13f7e59d47a5305ba5ad93d'
'be3279ed5bbbb03ac69a80f89879aa5a01a6b965f13f7e59d47a5305ba5ad93d',
],
[
'e4a42d43c5cf169d9391df6decf42ee541b6d8f0c9a137401e23632dda34d24f',
'4d9f92e716d1c73526fc99ccfb8ad34ce886eedfa8d8e4f13a7f7131deba9414'
'4d9f92e716d1c73526fc99ccfb8ad34ce886eedfa8d8e4f13a7f7131deba9414',
],
[
'1ec80fef360cbdd954160fadab352b6b92b53576a88fea4947173b9d4300bf19',
'aeefe93756b5340d2f3a4958a7abbf5e0146e77f6295a07b671cdc1cc107cefd'
'aeefe93756b5340d2f3a4958a7abbf5e0146e77f6295a07b671cdc1cc107cefd',
],
[
'146a778c04670c2f91b00af4680dfa8bce3490717d58ba889ddb5928366642be',
'b318e0ec3354028add669827f9d4b2870aaa971d2f7e5ed1d0b297483d83efd0'
'b318e0ec3354028add669827f9d4b2870aaa971d2f7e5ed1d0b297483d83efd0',
],
[
'fa50c0f61d22e5f07e3acebb1aa07b128d0012209a28b9776d76a8793180eef9',
'6b84c6922397eba9b72cd2872281a68a5e683293a57a213b38cd8d7d3f4f2811'
'6b84c6922397eba9b72cd2872281a68a5e683293a57a213b38cd8d7d3f4f2811',
],
[
'da1d61d0ca721a11b1a5bf6b7d88e8421a288ab5d5bba5220e53d32b5f067ec2',
'8157f55a7c99306c79c0766161c91e2966a73899d279b48a655fba0f1ad836f1'
'8157f55a7c99306c79c0766161c91e2966a73899d279b48a655fba0f1ad836f1',
],
[
'a8e282ff0c9706907215ff98e8fd416615311de0446f1e062a73b0610d064e13',
'7f97355b8db81c09abfb7f3c5b2515888b679a3e50dd6bd6cef7c73111f4cc0c'
'7f97355b8db81c09abfb7f3c5b2515888b679a3e50dd6bd6cef7c73111f4cc0c',
],
[
'174a53b9c9a285872d39e56e6913cab15d59b1fa512508c022f382de8319497c',
'ccc9dc37abfc9c1657b4155f2c47f9e6646b3a1d8cb9854383da13ac079afa73'
'ccc9dc37abfc9c1657b4155f2c47f9e6646b3a1d8cb9854383da13ac079afa73',
],
[
'959396981943785c3d3e57edf5018cdbe039e730e4918b3d884fdff09475b7ba',
'2e7e552888c331dd8ba0386a4b9cd6849c653f64c8709385e9b8abf87524f2fd'
'2e7e552888c331dd8ba0386a4b9cd6849c653f64c8709385e9b8abf87524f2fd',
],
[
'd2a63a50ae401e56d645a1153b109a8fcca0a43d561fba2dbb51340c9d82b151',
'e82d86fb6443fcb7565aee58b2948220a70f750af484ca52d4142174dcf89405'
'e82d86fb6443fcb7565aee58b2948220a70f750af484ca52d4142174dcf89405',
],
[
'64587e2335471eb890ee7896d7cfdc866bacbdbd3839317b3436f9b45617e073',
'd99fcdd5bf6902e2ae96dd6447c299a185b90a39133aeab358299e5e9faf6589'
'd99fcdd5bf6902e2ae96dd6447c299a185b90a39133aeab358299e5e9faf6589',
],
[
'8481bde0e4e4d885b3a546d3e549de042f0aa6cea250e7fd358d6c86dd45e458',
'38ee7b8cba5404dd84a25bf39cecb2ca900a79c42b262e556d64b1b59779057e'
'38ee7b8cba5404dd84a25bf39cecb2ca900a79c42b262e556d64b1b59779057e',
],
[
'13464a57a78102aa62b6979ae817f4637ffcfed3c4b1ce30bcd6303f6caf666b',
'69be159004614580ef7e433453ccb0ca48f300a81d0942e13f495a907f6ecc27'
'69be159004614580ef7e433453ccb0ca48f300a81d0942e13f495a907f6ecc27',
],
[
'bc4a9df5b713fe2e9aef430bcc1dc97a0cd9ccede2f28588cada3a0d2d83f366',
'd3a81ca6e785c06383937adf4b798caa6e8a9fbfa547b16d758d666581f33c1'
'd3a81ca6e785c06383937adf4b798caa6e8a9fbfa547b16d758d666581f33c1',
],
[
'8c28a97bf8298bc0d23d8c749452a32e694b65e30a9472a3954ab30fe5324caa',
'40a30463a3305193378fedf31f7cc0eb7ae784f0451cb9459e71dc73cbef9482'
'40a30463a3305193378fedf31f7cc0eb7ae784f0451cb9459e71dc73cbef9482',
],
[
'8ea9666139527a8c1dd94ce4f071fd23c8b350c5a4bb33748c4ba111faccae0',
'620efabbc8ee2782e24e7c0cfb95c5d735b783be9cf0f8e955af34a30e62b945'
'620efabbc8ee2782e24e7c0cfb95c5d735b783be9cf0f8e955af34a30e62b945',
],
[
'dd3625faef5ba06074669716bbd3788d89bdde815959968092f76cc4eb9a9787',
'7a188fa3520e30d461da2501045731ca941461982883395937f68d00c644a573'
'7a188fa3520e30d461da2501045731ca941461982883395937f68d00c644a573',
],
[
'f710d79d9eb962297e4f6232b40e8f7feb2bc63814614d692c12de752408221e',
'ea98e67232d3b3295d3b535532115ccac8612c721851617526ae47a9c77bfc82'
]
]
'ea98e67232d3b3295d3b535532115ccac8612c721851617526ae47a9c77bfc82',
],
],
},
naf: {
wnd: 7,
points: [
[
'f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9',
'388f7b0f632de8140fe337e62a37f3566500a99934c2231b6cb9fd7584b8e672'
'388f7b0f632de8140fe337e62a37f3566500a99934c2231b6cb9fd7584b8e672',
],
[
'2f8bde4d1a07209355b4a7250a5c5128e88b84bddc619ab7cba8d569b240efe4',
'd8ac222636e5e3d6d4dba9dda6c9c426f788271bab0d6840dca87d3aa6ac62d6'
'd8ac222636e5e3d6d4dba9dda6c9c426f788271bab0d6840dca87d3aa6ac62d6',
],
[
'5cbdf0646e5db4eaa398f365f2ea7a0e3d419b7e0330e39ce92bddedcac4f9bc',
'6aebca40ba255960a3178d6d861a54dba813d0b813fde7b5a5082628087264da'
'6aebca40ba255960a3178d6d861a54dba813d0b813fde7b5a5082628087264da',
],
[
'acd484e2f0c7f65309ad178a9f559abde09796974c57e714c35f110dfc27ccbe',
'cc338921b0a7d9fd64380971763b61e9add888a4375f8e0f05cc262ac64f9c37'
'cc338921b0a7d9fd64380971763b61e9add888a4375f8e0f05cc262ac64f9c37',
],
[
'774ae7f858a9411e5ef4246b70c65aac5649980be5c17891bbec17895da008cb',
'd984a032eb6b5e190243dd56d7b7b365372db1e2dff9d6a8301d74c9c953c61b'
'd984a032eb6b5e190243dd56d7b7b365372db1e2dff9d6a8301d74c9c953c61b',
],
[
'f28773c2d975288bc7d1d205c3748651b075fbc6610e58cddeeddf8f19405aa8',
'ab0902e8d880a89758212eb65cdaf473a1a06da521fa91f29b5cb52db03ed81'
'ab0902e8d880a89758212eb65cdaf473a1a06da521fa91f29b5cb52db03ed81',
],
[
'd7924d4f7d43ea965a465ae3095ff41131e5946f3c85f79e44adbcf8e27e080e',
'581e2872a86c72a683842ec228cc6defea40af2bd896d3a5c504dc9ff6a26b58'
'581e2872a86c72a683842ec228cc6defea40af2bd896d3a5c504dc9ff6a26b58',
],
[
'defdea4cdb677750a420fee807eacf21eb9898ae79b9768766e4faa04a2d4a34',
'4211ab0694635168e997b0ead2a93daeced1f4a04a95c0f6cfb199f69e56eb77'
'4211ab0694635168e997b0ead2a93daeced1f4a04a95c0f6cfb199f69e56eb77',
],
[
'2b4ea0a797a443d293ef5cff444f4979f06acfebd7e86d277475656138385b6c',
'85e89bc037945d93b343083b5a1c86131a01f60c50269763b570c854e5c09b7a'
'85e89bc037945d93b343083b5a1c86131a01f60c50269763b570c854e5c09b7a',
],
[
'352bbf4a4cdd12564f93fa332ce333301d9ad40271f8107181340aef25be59d5',
'321eb4075348f534d59c18259dda3e1f4a1b3b2e71b1039c67bd3d8bcf81998c'
'321eb4075348f534d59c18259dda3e1f4a1b3b2e71b1039c67bd3d8bcf81998c',
],
[
'2fa2104d6b38d11b0230010559879124e42ab8dfeff5ff29dc9cdadd4ecacc3f',
'2de1068295dd865b64569335bd5dd80181d70ecfc882648423ba76b532b7d67'
'2de1068295dd865b64569335bd5dd80181d70ecfc882648423ba76b532b7d67',
],
[
'9248279b09b4d68dab21a9b066edda83263c3d84e09572e269ca0cd7f5453714',
'73016f7bf234aade5d1aa71bdea2b1ff3fc0de2a887912ffe54a32ce97cb3402'
'73016f7bf234aade5d1aa71bdea2b1ff3fc0de2a887912ffe54a32ce97cb3402',
],
[
'daed4f2be3a8bf278e70132fb0beb7522f570e144bf615c07e996d443dee8729',
'a69dce4a7d6c98e8d4a1aca87ef8d7003f83c230f3afa726ab40e52290be1c55'
'a69dce4a7d6c98e8d4a1aca87ef8d7003f83c230f3afa726ab40e52290be1c55',
],
[
'c44d12c7065d812e8acf28d7cbb19f9011ecd9e9fdf281b0e6a3b5e87d22e7db',
'2119a460ce326cdc76c45926c982fdac0e106e861edf61c5a039063f0e0e6482'
'2119a460ce326cdc76c45926c982fdac0e106e861edf61c5a039063f0e0e6482',
],
[
'6a245bf6dc698504c89a20cfded60853152b695336c28063b61c65cbd269e6b4',
'e022cf42c2bd4a708b3f5126f16a24ad8b33ba48d0423b6efd5e6348100d8a82'
'e022cf42c2bd4a708b3f5126f16a24ad8b33ba48d0423b6efd5e6348100d8a82',
],
[
'1697ffa6fd9de627c077e3d2fe541084ce13300b0bec1146f95ae57f0d0bd6a5',
'b9c398f186806f5d27561506e4557433a2cf15009e498ae7adee9d63d01b2396'
'b9c398f186806f5d27561506e4557433a2cf15009e498ae7adee9d63d01b2396',
],
[
'605bdb019981718b986d0f07e834cb0d9deb8360ffb7f61df982345ef27a7479',
'2972d2de4f8d20681a78d93ec96fe23c26bfae84fb14db43b01e1e9056b8c49'
'2972d2de4f8d20681a78d93ec96fe23c26bfae84fb14db43b01e1e9056b8c49',
],
[
'62d14dab4150bf497402fdc45a215e10dcb01c354959b10cfe31c7e9d87ff33d',
'80fc06bd8cc5b01098088a1950eed0db01aa132967ab472235f5642483b25eaf'
'80fc06bd8cc5b01098088a1950eed0db01aa132967ab472235f5642483b25eaf',
],
[
'80c60ad0040f27dade5b4b06c408e56b2c50e9f56b9b8b425e555c2f86308b6f',
'1c38303f1cc5c30f26e66bad7fe72f70a65eed4cbe7024eb1aa01f56430bd57a'
'1c38303f1cc5c30f26e66bad7fe72f70a65eed4cbe7024eb1aa01f56430bd57a',
],
[
'7a9375ad6167ad54aa74c6348cc54d344cc5dc9487d847049d5eabb0fa03c8fb',
'd0e3fa9eca8726909559e0d79269046bdc59ea10c70ce2b02d499ec224dc7f7'
'd0e3fa9eca8726909559e0d79269046bdc59ea10c70ce2b02d499ec224dc7f7',
],
[
'd528ecd9b696b54c907a9ed045447a79bb408ec39b68df504bb51f459bc3ffc9',
'eecf41253136e5f99966f21881fd656ebc4345405c520dbc063465b521409933'
'eecf41253136e5f99966f21881fd656ebc4345405c520dbc063465b521409933',
],
[
'49370a4b5f43412ea25f514e8ecdad05266115e4a7ecb1387231808f8b45963',
'758f3f41afd6ed428b3081b0512fd62a54c3f3afbb5b6764b653052a12949c9a'
'758f3f41afd6ed428b3081b0512fd62a54c3f3afbb5b6764b653052a12949c9a',
],
[
'77f230936ee88cbbd73df930d64702ef881d811e0e1498e2f1c13eb1fc345d74',
'958ef42a7886b6400a08266e9ba1b37896c95330d97077cbbe8eb3c7671c60d6'
'958ef42a7886b6400a08266e9ba1b37896c95330d97077cbbe8eb3c7671c60d6',
],
[
'f2dac991cc4ce4b9ea44887e5c7c0bce58c80074ab9d4dbaeb28531b7739f530',
'e0dedc9b3b2f8dad4da1f32dec2531df9eb5fbeb0598e4fd1a117dba703a3c37'
'e0dedc9b3b2f8dad4da1f32dec2531df9eb5fbeb0598e4fd1a117dba703a3c37',
],
[
'463b3d9f662621fb1b4be8fbbe2520125a216cdfc9dae3debcba4850c690d45b',
'5ed430d78c296c3543114306dd8622d7c622e27c970a1de31cb377b01af7307e'
'5ed430d78c296c3543114306dd8622d7c622e27c970a1de31cb377b01af7307e',
],
[
'f16f804244e46e2a09232d4aff3b59976b98fac14328a2d1a32496b49998f247',
'cedabd9b82203f7e13d206fcdf4e33d92a6c53c26e5cce26d6579962c4e31df6'
'cedabd9b82203f7e13d206fcdf4e33d92a6c53c26e5cce26d6579962c4e31df6',
],
[
'caf754272dc84563b0352b7a14311af55d245315ace27c65369e15f7151d41d1',
'cb474660ef35f5f2a41b643fa5e460575f4fa9b7962232a5c32f908318a04476'
'cb474660ef35f5f2a41b643fa5e460575f4fa9b7962232a5c32f908318a04476',
],
[
'2600ca4b282cb986f85d0f1709979d8b44a09c07cb86d7c124497bc86f082120',
'4119b88753c15bd6a693b03fcddbb45d5ac6be74ab5f0ef44b0be9475a7e4b40'
'4119b88753c15bd6a693b03fcddbb45d5ac6be74ab5f0ef44b0be9475a7e4b40',
],
[
'7635ca72d7e8432c338ec53cd12220bc01c48685e24f7dc8c602a7746998e435',
'91b649609489d613d1d5e590f78e6d74ecfc061d57048bad9e76f302c5b9c61'
'91b649609489d613d1d5e590f78e6d74ecfc061d57048bad9e76f302c5b9c61',
],
[
'754e3239f325570cdbbf4a87deee8a66b7f2b33479d468fbc1a50743bf56cc18',
'673fb86e5bda30fb3cd0ed304ea49a023ee33d0197a695d0c5d98093c536683'
'673fb86e5bda30fb3cd0ed304ea49a023ee33d0197a695d0c5d98093c536683',
],
[
'e3e6bd1071a1e96aff57859c82d570f0330800661d1c952f9fe2694691d9b9e8',
'59c9e0bba394e76f40c0aa58379a3cb6a5a2283993e90c4167002af4920e37f5'
'59c9e0bba394e76f40c0aa58379a3cb6a5a2283993e90c4167002af4920e37f5',
],
[
'186b483d056a033826ae73d88f732985c4ccb1f32ba35f4b4cc47fdcf04aa6eb',
'3b952d32c67cf77e2e17446e204180ab21fb8090895138b4a4a797f86e80888b'
'3b952d32c67cf77e2e17446e204180ab21fb8090895138b4a4a797f86e80888b',
],
[
'df9d70a6b9876ce544c98561f4be4f725442e6d2b737d9c91a8321724ce0963f',
'55eb2dafd84d6ccd5f862b785dc39d4ab157222720ef9da217b8c45cf2ba2417'
'55eb2dafd84d6ccd5f862b785dc39d4ab157222720ef9da217b8c45cf2ba2417',
],
[
'5edd5cc23c51e87a497ca815d5dce0f8ab52554f849ed8995de64c5f34ce7143',
'efae9c8dbc14130661e8cec030c89ad0c13c66c0d17a2905cdc706ab7399a868'
'efae9c8dbc14130661e8cec030c89ad0c13c66c0d17a2905cdc706ab7399a868',
],
[
'290798c2b6476830da12fe02287e9e777aa3fba1c355b17a722d362f84614fba',
'e38da76dcd440621988d00bcf79af25d5b29c094db2a23146d003afd41943e7a'
'e38da76dcd440621988d00bcf79af25d5b29c094db2a23146d003afd41943e7a',
],
[
'af3c423a95d9f5b3054754efa150ac39cd29552fe360257362dfdecef4053b45',
'f98a3fd831eb2b749a93b0e6f35cfb40c8cd5aa667a15581bc2feded498fd9c6'
'f98a3fd831eb2b749a93b0e6f35cfb40c8cd5aa667a15581bc2feded498fd9c6',
],
[
'766dbb24d134e745cccaa28c99bf274906bb66b26dcf98df8d2fed50d884249a',
'744b1152eacbe5e38dcc887980da38b897584a65fa06cedd2c924f97cbac5996'
'744b1152eacbe5e38dcc887980da38b897584a65fa06cedd2c924f97cbac5996',
],
[
'59dbf46f8c94759ba21277c33784f41645f7b44f6c596a58ce92e666191abe3e',
'c534ad44175fbc300f4ea6ce648309a042ce739a7919798cd85e216c4a307f6e'
'c534ad44175fbc300f4ea6ce648309a042ce739a7919798cd85e216c4a307f6e',
],
[
'f13ada95103c4537305e691e74e9a4a8dd647e711a95e73cb62dc6018cfd87b8',
'e13817b44ee14de663bf4bc808341f326949e21a6a75c2570778419bdaf5733d'
'e13817b44ee14de663bf4bc808341f326949e21a6a75c2570778419bdaf5733d',
],
[
'7754b4fa0e8aced06d4167a2c59cca4cda1869c06ebadfb6488550015a88522c',
'30e93e864e669d82224b967c3020b8fa8d1e4e350b6cbcc537a48b57841163a2'
'30e93e864e669d82224b967c3020b8fa8d1e4e350b6cbcc537a48b57841163a2',
],
[
'948dcadf5990e048aa3874d46abef9d701858f95de8041d2a6828c99e2262519',
'e491a42537f6e597d5d28a3224b1bc25df9154efbd2ef1d2cbba2cae5347d57e'
'e491a42537f6e597d5d28a3224b1bc25df9154efbd2ef1d2cbba2cae5347d57e',
],
[
'7962414450c76c1689c7b48f8202ec37fb224cf5ac0bfa1570328a8a3d7c77ab',
'100b610ec4ffb4760d5c1fc133ef6f6b12507a051f04ac5760afa5b29db83437'
'100b610ec4ffb4760d5c1fc133ef6f6b12507a051f04ac5760afa5b29db83437',
],
[
'3514087834964b54b15b160644d915485a16977225b8847bb0dd085137ec47ca',
'ef0afbb2056205448e1652c48e8127fc6039e77c15c2378b7e7d15a0de293311'
'ef0afbb2056205448e1652c48e8127fc6039e77c15c2378b7e7d15a0de293311',
],
[
'd3cc30ad6b483e4bc79ce2c9dd8bc54993e947eb8df787b442943d3f7b527eaf',
'8b378a22d827278d89c5e9be8f9508ae3c2ad46290358630afb34db04eede0a4'
'8b378a22d827278d89c5e9be8f9508ae3c2ad46290358630afb34db04eede0a4',
],
[
'1624d84780732860ce1c78fcbfefe08b2b29823db913f6493975ba0ff4847610',
'68651cf9b6da903e0914448c6cd9d4ca896878f5282be4c8cc06e2a404078575'
'68651cf9b6da903e0914448c6cd9d4ca896878f5282be4c8cc06e2a404078575',
],
[
'733ce80da955a8a26902c95633e62a985192474b5af207da6df7b4fd5fc61cd4',
'f5435a2bd2badf7d485a4d8b8db9fcce3e1ef8e0201e4578c54673bc1dc5ea1d'
'f5435a2bd2badf7d485a4d8b8db9fcce3e1ef8e0201e4578c54673bc1dc5ea1d',
],
[
'15d9441254945064cf1a1c33bbd3b49f8966c5092171e699ef258dfab81c045c',
'd56eb30b69463e7234f5137b73b84177434800bacebfc685fc37bbe9efe4070d'
'd56eb30b69463e7234f5137b73b84177434800bacebfc685fc37bbe9efe4070d',
],
[
'a1d0fcf2ec9de675b612136e5ce70d271c21417c9d2b8aaaac138599d0717940',
'edd77f50bcb5a3cab2e90737309667f2641462a54070f3d519212d39c197a629'
'edd77f50bcb5a3cab2e90737309667f2641462a54070f3d519212d39c197a629',
],
[
'e22fbe15c0af8ccc5780c0735f84dbe9a790badee8245c06c7ca37331cb36980',
'a855babad5cd60c88b430a69f53a1a7a38289154964799be43d06d77d31da06'
'a855babad5cd60c88b430a69f53a1a7a38289154964799be43d06d77d31da06',
],
[
'311091dd9860e8e20ee13473c1155f5f69635e394704eaa74009452246cfa9b3',
'66db656f87d1f04fffd1f04788c06830871ec5a64feee685bd80f0b1286d8374'
'66db656f87d1f04fffd1f04788c06830871ec5a64feee685bd80f0b1286d8374',
],
[
'34c1fd04d301be89b31c0442d3e6ac24883928b45a9340781867d4232ec2dbdf',
'9414685e97b1b5954bd46f730174136d57f1ceeb487443dc5321857ba73abee'
'9414685e97b1b5954bd46f730174136d57f1ceeb487443dc5321857ba73abee',
],
[
'f219ea5d6b54701c1c14de5b557eb42a8d13f3abbcd08affcc2a5e6b049b8d63',
'4cb95957e83d40b0f73af4544cccf6b1f4b08d3c07b27fb8d8c2962a400766d1'
'4cb95957e83d40b0f73af4544cccf6b1f4b08d3c07b27fb8d8c2962a400766d1',
],
[
'd7b8740f74a8fbaab1f683db8f45de26543a5490bca627087236912469a0b448',
'fa77968128d9c92ee1010f337ad4717eff15db5ed3c049b3411e0315eaa4593b'
'fa77968128d9c92ee1010f337ad4717eff15db5ed3c049b3411e0315eaa4593b',
],
[
'32d31c222f8f6f0ef86f7c98d3a3335ead5bcd32abdd94289fe4d3091aa824bf',
'5f3032f5892156e39ccd3d7915b9e1da2e6dac9e6f26e961118d14b8462e1661'
'5f3032f5892156e39ccd3d7915b9e1da2e6dac9e6f26e961118d14b8462e1661',
],
[
'7461f371914ab32671045a155d9831ea8793d77cd59592c4340f86cbc18347b5',
'8ec0ba238b96bec0cbdddcae0aa442542eee1ff50c986ea6b39847b3cc092ff6'
'8ec0ba238b96bec0cbdddcae0aa442542eee1ff50c986ea6b39847b3cc092ff6',
],
[
'ee079adb1df1860074356a25aa38206a6d716b2c3e67453d287698bad7b2b2d6',
'8dc2412aafe3be5c4c5f37e0ecc5f9f6a446989af04c4e25ebaac479ec1c8c1e'
'8dc2412aafe3be5c4c5f37e0ecc5f9f6a446989af04c4e25ebaac479ec1c8c1e',
],
[
'16ec93e447ec83f0467b18302ee620f7e65de331874c9dc72bfd8616ba9da6b5',
'5e4631150e62fb40d0e8c2a7ca5804a39d58186a50e497139626778e25b0674d'
'5e4631150e62fb40d0e8c2a7ca5804a39d58186a50e497139626778e25b0674d',
],
[
'eaa5f980c245f6f038978290afa70b6bd8855897f98b6aa485b96065d537bd99',
'f65f5d3e292c2e0819a528391c994624d784869d7e6ea67fb18041024edc07dc'
'f65f5d3e292c2e0819a528391c994624d784869d7e6ea67fb18041024edc07dc',
],
[
'78c9407544ac132692ee1910a02439958ae04877151342ea96c4b6b35a49f51',
'f3e0319169eb9b85d5404795539a5e68fa1fbd583c064d2462b675f194a3ddb4'
'f3e0319169eb9b85d5404795539a5e68fa1fbd583c064d2462b675f194a3ddb4',
],
[
'494f4be219a1a77016dcd838431aea0001cdc8ae7a6fc688726578d9702857a5',
'42242a969283a5f339ba7f075e36ba2af925ce30d767ed6e55f4b031880d562c'
'42242a969283a5f339ba7f075e36ba2af925ce30d767ed6e55f4b031880d562c',
],
[
'a598a8030da6d86c6bc7f2f5144ea549d28211ea58faa70ebf4c1e665c1fe9b5',
'204b5d6f84822c307e4b4a7140737aec23fc63b65b35f86a10026dbd2d864e6b'
'204b5d6f84822c307e4b4a7140737aec23fc63b65b35f86a10026dbd2d864e6b',
],
[
'c41916365abb2b5d09192f5f2dbeafec208f020f12570a184dbadc3e58595997',
'4f14351d0087efa49d245b328984989d5caf9450f34bfc0ed16e96b58fa9913'
'4f14351d0087efa49d245b328984989d5caf9450f34bfc0ed16e96b58fa9913',
],
[
'841d6063a586fa475a724604da03bc5b92a2e0d2e0a36acfe4c73a5514742881',
'73867f59c0659e81904f9a1c7543698e62562d6744c169ce7a36de01a8d6154'
'73867f59c0659e81904f9a1c7543698e62562d6744c169ce7a36de01a8d6154',
],
[
'5e95bb399a6971d376026947f89bde2f282b33810928be4ded112ac4d70e20d5',
'39f23f366809085beebfc71181313775a99c9aed7d8ba38b161384c746012865'
'39f23f366809085beebfc71181313775a99c9aed7d8ba38b161384c746012865',
],
[
'36e4641a53948fd476c39f8a99fd974e5ec07564b5315d8bf99471bca0ef2f66',
'd2424b1b1abe4eb8164227b085c9aa9456ea13493fd563e06fd51cf5694c78fc'
'd2424b1b1abe4eb8164227b085c9aa9456ea13493fd563e06fd51cf5694c78fc',
],
[
'336581ea7bfbbb290c191a2f507a41cf5643842170e914faeab27c2c579f726',
'ead12168595fe1be99252129b6e56b3391f7ab1410cd1e0ef3dcdcabd2fda224'
'ead12168595fe1be99252129b6e56b3391f7ab1410cd1e0ef3dcdcabd2fda224',
],
[
'8ab89816dadfd6b6a1f2634fcf00ec8403781025ed6890c4849742706bd43ede',
'6fdcef09f2f6d0a044e654aef624136f503d459c3e89845858a47a9129cdd24e'
'6fdcef09f2f6d0a044e654aef624136f503d459c3e89845858a47a9129cdd24e',
],
[
'1e33f1a746c9c5778133344d9299fcaa20b0938e8acff2544bb40284b8c5fb94',
'60660257dd11b3aa9c8ed618d24edff2306d320f1d03010e33a7d2057f3b3b6'
'60660257dd11b3aa9c8ed618d24edff2306d320f1d03010e33a7d2057f3b3b6',
],
[
'85b7c1dcb3cec1b7ee7f30ded79dd20a0ed1f4cc18cbcfcfa410361fd8f08f31',
'3d98a9cdd026dd43f39048f25a8847f4fcafad1895d7a633c6fed3c35e999511'
'3d98a9cdd026dd43f39048f25a8847f4fcafad1895d7a633c6fed3c35e999511',
],
[
'29df9fbd8d9e46509275f4b125d6d45d7fbe9a3b878a7af872a2800661ac5f51',
'b4c4fe99c775a606e2d8862179139ffda61dc861c019e55cd2876eb2a27d84b'
'b4c4fe99c775a606e2d8862179139ffda61dc861c019e55cd2876eb2a27d84b',
],
[
'a0b1cae06b0a847a3fea6e671aaf8adfdfe58ca2f768105c8082b2e449fce252',
'ae434102edde0958ec4b19d917a6a28e6b72da1834aff0e650f049503a296cf2'
'ae434102edde0958ec4b19d917a6a28e6b72da1834aff0e650f049503a296cf2',
],
[
'4e8ceafb9b3e9a136dc7ff67e840295b499dfb3b2133e4ba113f2e4c0e121e5',
'cf2174118c8b6d7a4b48f6d534ce5c79422c086a63460502b827ce62a326683c'
'cf2174118c8b6d7a4b48f6d534ce5c79422c086a63460502b827ce62a326683c',
],
[
'd24a44e047e19b6f5afb81c7ca2f69080a5076689a010919f42725c2b789a33b',
'6fb8d5591b466f8fc63db50f1c0f1c69013f996887b8244d2cdec417afea8fa3'
'6fb8d5591b466f8fc63db50f1c0f1c69013f996887b8244d2cdec417afea8fa3',
],
[
'ea01606a7a6c9cdd249fdfcfacb99584001edd28abbab77b5104e98e8e3b35d4',
'322af4908c7312b0cfbfe369f7a7b3cdb7d4494bc2823700cfd652188a3ea98d'
'322af4908c7312b0cfbfe369f7a7b3cdb7d4494bc2823700cfd652188a3ea98d',
],
[
'af8addbf2b661c8a6c6328655eb96651252007d8c5ea31be4ad196de8ce2131f',
'6749e67c029b85f52a034eafd096836b2520818680e26ac8f3dfbcdb71749700'
'6749e67c029b85f52a034eafd096836b2520818680e26ac8f3dfbcdb71749700',
],
[
'e3ae1974566ca06cc516d47e0fb165a674a3dabcfca15e722f0e3450f45889',
'2aeabe7e4531510116217f07bf4d07300de97e4874f81f533420a72eeb0bd6a4'
'2aeabe7e4531510116217f07bf4d07300de97e4874f81f533420a72eeb0bd6a4',
],
[
'591ee355313d99721cf6993ffed1e3e301993ff3ed258802075ea8ced397e246',
'b0ea558a113c30bea60fc4775460c7901ff0b053d25ca2bdeee98f1a4be5d196'
'b0ea558a113c30bea60fc4775460c7901ff0b053d25ca2bdeee98f1a4be5d196',
],
[
'11396d55fda54c49f19aa97318d8da61fa8584e47b084945077cf03255b52984',
'998c74a8cd45ac01289d5833a7beb4744ff536b01b257be4c5767bea93ea57a4'
'998c74a8cd45ac01289d5833a7beb4744ff536b01b257be4c5767bea93ea57a4',
],
[
'3c5d2a1ba39c5a1790000738c9e0c40b8dcdfd5468754b6405540157e017aa7a',
'b2284279995a34e2f9d4de7396fc18b80f9b8b9fdd270f6661f79ca4c81bd257'
'b2284279995a34e2f9d4de7396fc18b80f9b8b9fdd270f6661f79ca4c81bd257',
],
[
'cc8704b8a60a0defa3a99a7299f2e9c3fbc395afb04ac078425ef8a1793cc030',
'bdd46039feed17881d1e0862db347f8cf395b74fc4bcdc4e940b74e3ac1f1b13'
'bdd46039feed17881d1e0862db347f8cf395b74fc4bcdc4e940b74e3ac1f1b13',
],
[
'c533e4f7ea8555aacd9777ac5cad29b97dd4defccc53ee7ea204119b2889b197',
'6f0a256bc5efdf429a2fb6242f1a43a2d9b925bb4a4b3a26bb8e0f45eb596096'
'6f0a256bc5efdf429a2fb6242f1a43a2d9b925bb4a4b3a26bb8e0f45eb596096',
],
[
'c14f8f2ccb27d6f109f6d08d03cc96a69ba8c34eec07bbcf566d48e33da6593',
'c359d6923bb398f7fd4473e16fe1c28475b740dd098075e6c0e8649113dc3a38'
'c359d6923bb398f7fd4473e16fe1c28475b740dd098075e6c0e8649113dc3a38',
],
[
'a6cbc3046bc6a450bac24789fa17115a4c9739ed75f8f21ce441f72e0b90e6ef',
'21ae7f4680e889bb130619e2c0f95a360ceb573c70603139862afd617fa9b9f'
'21ae7f4680e889bb130619e2c0f95a360ceb573c70603139862afd617fa9b9f',
],
[
'347d6d9a02c48927ebfb86c1359b1caf130a3c0267d11ce6344b39f99d43cc38',
'60ea7f61a353524d1c987f6ecec92f086d565ab687870cb12689ff1e31c74448'
'60ea7f61a353524d1c987f6ecec92f086d565ab687870cb12689ff1e31c74448',
],
[
'da6545d2181db8d983f7dcb375ef5866d47c67b1bf31c8cf855ef7437b72656a',
'49b96715ab6878a79e78f07ce5680c5d6673051b4935bd897fea824b77dc208a'
'49b96715ab6878a79e78f07ce5680c5d6673051b4935bd897fea824b77dc208a',
],
[
'c40747cc9d012cb1a13b8148309c6de7ec25d6945d657146b9d5994b8feb1111',
'5ca560753be2a12fc6de6caf2cb489565db936156b9514e1bb5e83037e0fa2d4'
'5ca560753be2a12fc6de6caf2cb489565db936156b9514e1bb5e83037e0fa2d4',
],
[
'4e42c8ec82c99798ccf3a610be870e78338c7f713348bd34c8203ef4037f3502',
'7571d74ee5e0fb92a7a8b33a07783341a5492144cc54bcc40a94473693606437'
'7571d74ee5e0fb92a7a8b33a07783341a5492144cc54bcc40a94473693606437',
],
[
'3775ab7089bc6af823aba2e1af70b236d251cadb0c86743287522a1b3b0dedea',
'be52d107bcfa09d8bcb9736a828cfa7fac8db17bf7a76a2c42ad961409018cf7'
'be52d107bcfa09d8bcb9736a828cfa7fac8db17bf7a76a2c42ad961409018cf7',
],
[
'cee31cbf7e34ec379d94fb814d3d775ad954595d1314ba8846959e3e82f74e26',
'8fd64a14c06b589c26b947ae2bcf6bfa0149ef0be14ed4d80f448a01c43b1c6d'
'8fd64a14c06b589c26b947ae2bcf6bfa0149ef0be14ed4d80f448a01c43b1c6d',
],
[
'b4f9eaea09b6917619f6ea6a4eb5464efddb58fd45b1ebefcdc1a01d08b47986',
'39e5c9925b5a54b07433a4f18c61726f8bb131c012ca542eb24a8ac07200682a'
'39e5c9925b5a54b07433a4f18c61726f8bb131c012ca542eb24a8ac07200682a',
],
[
'd4263dfc3d2df923a0179a48966d30ce84e2515afc3dccc1b77907792ebcc60e',
'62dfaf07a0f78feb30e30d6295853ce189e127760ad6cf7fae164e122a208d54'
'62dfaf07a0f78feb30e30d6295853ce189e127760ad6cf7fae164e122a208d54',
],
[
'48457524820fa65a4f8d35eb6930857c0032acc0a4a2de422233eeda897612c4',
'25a748ab367979d98733c38a1fa1c2e7dc6cc07db2d60a9ae7a76aaa49bd0f77'
'25a748ab367979d98733c38a1fa1c2e7dc6cc07db2d60a9ae7a76aaa49bd0f77',
],
[
'dfeeef1881101f2cb11644f3a2afdfc2045e19919152923f367a1767c11cceda',
'ecfb7056cf1de042f9420bab396793c0c390bde74b4bbdff16a83ae09a9a7517'
'ecfb7056cf1de042f9420bab396793c0c390bde74b4bbdff16a83ae09a9a7517',
],
[
'6d7ef6b17543f8373c573f44e1f389835d89bcbc6062ced36c82df83b8fae859',
'cd450ec335438986dfefa10c57fea9bcc521a0959b2d80bbf74b190dca712d10'
'cd450ec335438986dfefa10c57fea9bcc521a0959b2d80bbf74b190dca712d10',
],
[
'e75605d59102a5a2684500d3b991f2e3f3c88b93225547035af25af66e04541f',
'f5c54754a8f71ee540b9b48728473e314f729ac5308b06938360990e2bfad125'
'f5c54754a8f71ee540b9b48728473e314f729ac5308b06938360990e2bfad125',
],
[
'eb98660f4c4dfaa06a2be453d5020bc99a0c2e60abe388457dd43fefb1ed620c',
'6cb9a8876d9cb8520609af3add26cd20a0a7cd8a9411131ce85f44100099223e'
'6cb9a8876d9cb8520609af3add26cd20a0a7cd8a9411131ce85f44100099223e',
],
[
'13e87b027d8514d35939f2e6892b19922154596941888336dc3563e3b8dba942',
'fef5a3c68059a6dec5d624114bf1e91aac2b9da568d6abeb2570d55646b8adf1'
'fef5a3c68059a6dec5d624114bf1e91aac2b9da568d6abeb2570d55646b8adf1',
],
[
'ee163026e9fd6fe017c38f06a5be6fc125424b371ce2708e7bf4491691e5764a',
'1acb250f255dd61c43d94ccc670d0f58f49ae3fa15b96623e5430da0ad6c62b2'
'1acb250f255dd61c43d94ccc670d0f58f49ae3fa15b96623e5430da0ad6c62b2',
],
[
'b268f5ef9ad51e4d78de3a750c2dc89b1e626d43505867999932e5db33af3d80',
'5f310d4b3c99b9ebb19f77d41c1dee018cf0d34fd4191614003e945a1216e423'
'5f310d4b3c99b9ebb19f77d41c1dee018cf0d34fd4191614003e945a1216e423',
],
[
'ff07f3118a9df035e9fad85eb6c7bfe42b02f01ca99ceea3bf7ffdba93c4750d',
'438136d603e858a3a5c440c38eccbaddc1d2942114e2eddd4740d098ced1f0d8'
'438136d603e858a3a5c440c38eccbaddc1d2942114e2eddd4740d098ced1f0d8',
],
[
'8d8b9855c7c052a34146fd20ffb658bea4b9f69e0d825ebec16e8c3ce2b526a1',
'cdb559eedc2d79f926baf44fb84ea4d44bcf50fee51d7ceb30e2e7f463036758'
'cdb559eedc2d79f926baf44fb84ea4d44bcf50fee51d7ceb30e2e7f463036758',
],
[
'52db0b5384dfbf05bfa9d472d7ae26dfe4b851ceca91b1eba54263180da32b63',
'c3b997d050ee5d423ebaf66a6db9f57b3180c902875679de924b69d84a7b375'
'c3b997d050ee5d423ebaf66a6db9f57b3180c902875679de924b69d84a7b375',
],
[
'e62f9490d3d51da6395efd24e80919cc7d0f29c3f3fa48c6fff543becbd43352',
'6d89ad7ba4876b0b22c2ca280c682862f342c8591f1daf5170e07bfd9ccafa7d'
'6d89ad7ba4876b0b22c2ca280c682862f342c8591f1daf5170e07bfd9ccafa7d',
],
[
'7f30ea2476b399b4957509c88f77d0191afa2ff5cb7b14fd6d8e7d65aaab1193',
'ca5ef7d4b231c94c3b15389a5f6311e9daff7bb67b103e9880ef4bff637acaec'
'ca5ef7d4b231c94c3b15389a5f6311e9daff7bb67b103e9880ef4bff637acaec',
],
[
'5098ff1e1d9f14fb46a210fada6c903fef0fb7b4a1dd1d9ac60a0361800b7a00',
'9731141d81fc8f8084d37c6e7542006b3ee1b40d60dfe5362a5b132fd17ddc0'
'9731141d81fc8f8084d37c6e7542006b3ee1b40d60dfe5362a5b132fd17ddc0',
],
[
'32b78c7de9ee512a72895be6b9cbefa6e2f3c4ccce445c96b9f2c81e2778ad58',
'ee1849f513df71e32efc3896ee28260c73bb80547ae2275ba497237794c8753c'
'ee1849f513df71e32efc3896ee28260c73bb80547ae2275ba497237794c8753c',
],
[
'e2cb74fddc8e9fbcd076eef2a7c72b0ce37d50f08269dfc074b581550547a4f7',
'd3aa2ed71c9dd2247a62df062736eb0baddea9e36122d2be8641abcb005cc4a4'
'd3aa2ed71c9dd2247a62df062736eb0baddea9e36122d2be8641abcb005cc4a4',
],
[
'8438447566d4d7bedadc299496ab357426009a35f235cb141be0d99cd10ae3a8',
'c4e1020916980a4da5d01ac5e6ad330734ef0d7906631c4f2390426b2edd791f'
'c4e1020916980a4da5d01ac5e6ad330734ef0d7906631c4f2390426b2edd791f',
],
[
'4162d488b89402039b584c6fc6c308870587d9c46f660b878ab65c82c711d67e',
'67163e903236289f776f22c25fb8a3afc1732f2b84b4e95dbda47ae5a0852649'
'67163e903236289f776f22c25fb8a3afc1732f2b84b4e95dbda47ae5a0852649',
],
[
'3fad3fa84caf0f34f0f89bfd2dcf54fc175d767aec3e50684f3ba4a4bf5f683d',
'cd1bc7cb6cc407bb2f0ca647c718a730cf71872e7d0d2a53fa20efcdfe61826'
'cd1bc7cb6cc407bb2f0ca647c718a730cf71872e7d0d2a53fa20efcdfe61826',
],
[
'674f2600a3007a00568c1a7ce05d0816c1fb84bf1370798f1c69532faeb1a86b',
'299d21f9413f33b3edf43b257004580b70db57da0b182259e09eecc69e0d38a5'
'299d21f9413f33b3edf43b257004580b70db57da0b182259e09eecc69e0d38a5',
],
[
'd32f4da54ade74abb81b815ad1fb3b263d82d6c692714bcff87d29bd5ee9f08f',
'f9429e738b8e53b968e99016c059707782e14f4535359d582fc416910b3eea87'
'f9429e738b8e53b968e99016c059707782e14f4535359d582fc416910b3eea87',
],
[
'30e4e670435385556e593657135845d36fbb6931f72b08cb1ed954f1e3ce3ff6',
'462f9bce619898638499350113bbc9b10a878d35da70740dc695a559eb88db7b'
'462f9bce619898638499350113bbc9b10a878d35da70740dc695a559eb88db7b',
],
[
'be2062003c51cc3004682904330e4dee7f3dcd10b01e580bf1971b04d4cad297',
'62188bc49d61e5428573d48a74e1c655b1c61090905682a0d5558ed72dccb9bc'
'62188bc49d61e5428573d48a74e1c655b1c61090905682a0d5558ed72dccb9bc',
],
[
'93144423ace3451ed29e0fb9ac2af211cb6e84a601df5993c419859fff5df04a',
'7c10dfb164c3425f5c71a3f9d7992038f1065224f72bb9d1d902a6d13037b47c'
'7c10dfb164c3425f5c71a3f9d7992038f1065224f72bb9d1d902a6d13037b47c',
],
[
'b015f8044f5fcbdcf21ca26d6c34fb8197829205c7b7d2a7cb66418c157b112c',
'ab8c1e086d04e813744a655b2df8d5f83b3cdc6faa3088c1d3aea1454e3a1d5f'
'ab8c1e086d04e813744a655b2df8d5f83b3cdc6faa3088c1d3aea1454e3a1d5f',
],
[
'd5e9e1da649d97d89e4868117a465a3a4f8a18de57a140d36b3f2af341a21b52',
'4cb04437f391ed73111a13cc1d4dd0db1693465c2240480d8955e8592f27447a'
'4cb04437f391ed73111a13cc1d4dd0db1693465c2240480d8955e8592f27447a',
],
[
'd3ae41047dd7ca065dbf8ed77b992439983005cd72e16d6f996a5316d36966bb',
'bd1aeb21ad22ebb22a10f0303417c6d964f8cdd7df0aca614b10dc14d125ac46'
'bd1aeb21ad22ebb22a10f0303417c6d964f8cdd7df0aca614b10dc14d125ac46',
],
[
'463e2763d885f958fc66cdd22800f0a487197d0a82e377b49f80af87c897b065',
'bfefacdb0e5d0fd7df3a311a94de062b26b80c61fbc97508b79992671ef7ca7f'
'bfefacdb0e5d0fd7df3a311a94de062b26b80c61fbc97508b79992671ef7ca7f',
],
[
'7985fdfd127c0567c6f53ec1bb63ec3158e597c40bfe747c83cddfc910641917',
'603c12daf3d9862ef2b25fe1de289aed24ed291e0ec6708703a5bd567f32ed03'
'603c12daf3d9862ef2b25fe1de289aed24ed291e0ec6708703a5bd567f32ed03',
],
[
'74a1ad6b5f76e39db2dd249410eac7f99e74c59cb83d2d0ed5ff1543da7703e9',
'cc6157ef18c9c63cd6193d83631bbea0093e0968942e8c33d5737fd790e0db08'
'cc6157ef18c9c63cd6193d83631bbea0093e0968942e8c33d5737fd790e0db08',
],
[
'30682a50703375f602d416664ba19b7fc9bab42c72747463a71d0896b22f6da3',
'553e04f6b018b4fa6c8f39e7f311d3176290d0e0f19ca73f17714d9977a22ff8'
'553e04f6b018b4fa6c8f39e7f311d3176290d0e0f19ca73f17714d9977a22ff8',
],
[
'9e2158f0d7c0d5f26c3791efefa79597654e7a2b2464f52b1ee6c1347769ef57',
'712fcdd1b9053f09003a3481fa7762e9ffd7c8ef35a38509e2fbf2629008373'
'712fcdd1b9053f09003a3481fa7762e9ffd7c8ef35a38509e2fbf2629008373',
],
[
'176e26989a43c9cfeba4029c202538c28172e566e3c4fce7322857f3be327d66',
'ed8cc9d04b29eb877d270b4878dc43c19aefd31f4eee09ee7b47834c1fa4b1c3'
'ed8cc9d04b29eb877d270b4878dc43c19aefd31f4eee09ee7b47834c1fa4b1c3',
],
[
'75d46efea3771e6e68abb89a13ad747ecf1892393dfc4f1b7004788c50374da8',
'9852390a99507679fd0b86fd2b39a868d7efc22151346e1a3ca4726586a6bed8'
'9852390a99507679fd0b86fd2b39a868d7efc22151346e1a3ca4726586a6bed8',
],
[
'809a20c67d64900ffb698c4c825f6d5f2310fb0451c869345b7319f645605721',
'9e994980d9917e22b76b061927fa04143d096ccc54963e6a5ebfa5f3f8e286c1'
'9e994980d9917e22b76b061927fa04143d096ccc54963e6a5ebfa5f3f8e286c1',
],
[
'1b38903a43f7f114ed4500b4eac7083fdefece1cf29c63528d563446f972c180',
'4036edc931a60ae889353f77fd53de4a2708b26b6f5da72ad3394119daf408f9'
]
]
}
'4036edc931a60ae889353f77fd53de4a2708b26b6f5da72ad3394119daf408f9',
],
],
},
};
+6 -6
View File
@@ -44,15 +44,15 @@ utils.getNAF = getNAF;
function getJSF(k1, k2) {
var jsf = [
[],
[]
[],
];
k1 = k1.clone();
k2 = k2.clone();
var d1 = 0;
var d2 = 0;
var m8;
while (k1.cmpn(-d1) > 0 || k2.cmpn(-d2) > 0) {
// First phase
var m14 = (k1.andln(3) + d1) & 3;
var m24 = (k2.andln(3) + d2) & 3;
@@ -64,7 +64,7 @@ function getJSF(k1, k2) {
if ((m14 & 1) === 0) {
u1 = 0;
} else {
var m8 = (k1.andln(7) + d1) & 7;
m8 = (k1.andln(7) + d1) & 7;
if ((m8 === 3 || m8 === 5) && m24 === 2)
u1 = -m14;
else
@@ -76,7 +76,7 @@ function getJSF(k1, k2) {
if ((m24 & 1) === 0) {
u2 = 0;
} else {
var m8 = (k2.andln(7) + d2) & 7;
m8 = (k2.andln(7) + d2) & 7;
if ((m8 === 3 || m8 === 5) && m14 === 2)
u2 = -m24;
else
@@ -101,14 +101,14 @@ function cachedProperty(obj, name, computer) {
var key = '_' + name;
obj.prototype[name] = function cachedProperty() {
return this[key] !== undefined ? this[key] :
this[key] = computer.call(this);
this[key] = computer.call(this);
};
}
utils.cachedProperty = cachedProperty;
function parseBytes(bytes) {
return typeof bytes === 'string' ? utils.toArray(bytes, 'hex') :
bytes;
bytes;
}
utils.parseBytes = parseBytes;
+1892 -2646
View File
File diff suppressed because it is too large Load Diff
+19 -21
View File
@@ -7,9 +7,8 @@
"lib"
],
"scripts": {
"jscs": "jscs benchmarks/*.js lib/*.js lib/**/*.js lib/**/**/*.js test/index.js",
"jshint": "jscs benchmarks/*.js lib/*.js lib/**/*.js lib/**/**/*.js test/index.js",
"lint": "npm run jscs && npm run jshint",
"lint": "eslint lib test",
"lint:fix": "npm run lint -- --fix",
"unit": "istanbul test _mocha --reporter=spec test/index.js",
"test": "npm run lint && npm run unit",
"version": "grunt dist && git add dist/"
@@ -31,28 +30,27 @@
},
"homepage": "https://github.com/indutny/elliptic",
"devDependencies": {
"brfs": "^1.4.3",
"coveralls": "^3.0.8",
"grunt": "^1.0.4",
"grunt-browserify": "^5.0.0",
"grunt-cli": "^1.2.0",
"grunt-contrib-connect": "^1.0.0",
"brfs": "^2.0.2",
"coveralls": "^3.1.0",
"eslint": "^7.6.0",
"grunt": "^1.2.1",
"grunt-browserify": "^5.3.0",
"grunt-cli": "^1.3.2",
"grunt-contrib-connect": "^3.0.0",
"grunt-contrib-copy": "^1.0.0",
"grunt-contrib-uglify": "^1.0.1",
"grunt-mocha-istanbul": "^3.0.1",
"grunt-contrib-uglify": "^5.0.0",
"grunt-mocha-istanbul": "^5.0.2",
"grunt-saucelabs": "^9.0.1",
"istanbul": "^0.4.2",
"jscs": "^3.0.7",
"jshint": "^2.10.3",
"mocha": "^6.2.2"
"istanbul": "^0.4.5",
"mocha": "^8.0.1"
},
"dependencies": {
"bn.js": "^4.4.0",
"brorand": "^1.0.1",
"bn.js": "^4.11.9",
"brorand": "^1.1.0",
"hash.js": "^1.0.0",
"hmac-drbg": "^1.0.0",
"inherits": "^2.0.1",
"minimalistic-assert": "^1.0.0",
"minimalistic-crypto-utils": "^1.0.0"
"hmac-drbg": "^1.0.1",
"inherits": "^2.0.4",
"minimalistic-assert": "^1.0.1",
"minimalistic-crypto-utils": "^1.0.1"
}
}
+4 -1
View File
@@ -1,3 +1,6 @@
/* eslint-env node, mocha */
'use strict';
var assert = require('assert');
var elliptic = require('../');
@@ -11,7 +14,7 @@ describe('EC API', function() {
it('should throw error with invalid curve', function() {
assert.throws(function() {
var ec = new elliptic.ec('nonexistent-curve');
new elliptic.ec('nonexistent-curve');
}, Error);
});
});
+44 -43
View File
@@ -1,3 +1,4 @@
/* eslint-env node, mocha */
'use strict';
var assert = require('assert');
@@ -9,7 +10,7 @@ describe('Curve', function() {
var curve = new elliptic.curve.short({
p: '1d',
a: '4',
b: '14'
b: '14',
});
var p = curve.point('18', '16');
@@ -35,22 +36,22 @@ describe('Curve', function() {
g: [
new BN('0396f77094ccc0eb985310e8bc7d519311846453b8ba232935640b2b0' +
'340f868ae208d6ee95bf0e59103b2ead08d6f19', 16, 'le'),
new BN('11', 16, 'le')
]
new BN('11', 16, 'le'),
],
});
var point = [
'21fd21b36cbdbe0d77ad8692c25d918774f5d3bc179c4cb0ae3c364bf1bea981d0' +
'2e9f97cc62f20acacf0c553887e5fb',
'29f994329799dba72aa12ceb06312300167b6e18fbed607c63709826c57292cf29' +
'f5bab4f5c99c739cf107a3833bb553'
'f5bab4f5c99c739cf107a3833bb553',
];
var double = [
'0561c8722cf82b2f0d7c36bc72e34539dcbf181e8d98f5244480e79f5b51a4a541' +
'457016c9c0509d49078eb5909a1121',
'05b7812fae9d164ee9249c56a16e29a1ad2cdc6353227074dd96d59df363a0bcb5' +
'bc67d50b44843ea833156bdc0ac6a2'
'bc67d50b44843ea833156bdc0ac6a2',
];
var p = curve.pointFromJSON(point);
@@ -60,31 +61,31 @@ describe('Curve', function() {
it('should be able to find a point given y coordinate for all edwards curves',
function() {
var curve = new elliptic.curve.edwards({
p: new BN('f7' +
var curve = new elliptic.curve.edwards({
p: new BN('f7' +
'ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff07',
16, 'le'),
q: new BN('71' +
q: new BN('71' +
'c966d15fd444893407d3dfc46579f7ffffffffffffffffffffffffffffff01',
16, 'le'),
r: '4',
a: '1',
// -1174 mod p
d: new BN('61' +
r: '4',
a: '1',
// -1174 mod p
d: new BN('61' +
'fbffffffffffffffffffffffffffffffffffffffffffffffffffffffffff07',
16, 'le'),
c: '1'
});
c: '1',
});
var target = curve.point(
'05d040ddaa645bf27d2d2f302c5697231425185fd9a410f220ac5c5c7fbeb8a1',
'02f8ca771306cd23e929775177f2c213843a017a6487b2ec5f9b2a3808108ef2'
);
var target = curve.point(
'05d040ddaa645bf27d2d2f302c5697231425185fd9a410f220ac5c5c7fbeb8a1',
'02f8ca771306cd23e929775177f2c213843a017a6487b2ec5f9b2a3808108ef2',
);
var point = curve.pointFromY('02' +
var point = curve.pointFromY('02' +
'f8ca771306cd23e929775177f2c213843a017a6487b2ec5f9b2a3808108ef2');
assert(point.eq(target));
});
assert(point.eq(target));
});
it('should find an odd point given a y coordinate', function() {
var curve = new elliptic.curve.edwards({
@@ -99,11 +100,11 @@ describe('Curve', function() {
'216936d3cd6e53fec0a4e231fdd6dc5c692cc7609525a7b2c9562d608f25d51a',
// 4/5
'6666666666666666666666666666666666666666666666666666666666666658'
]
'6666666666666666666666666666666666666666666666666666666666666658',
],
});
var bytes = new Uint8Array([5, 69, 248, 173, 171, 254, 19, 253, 143, 140, 146, 174, 26, 128, 3, 52, 106, 55, 112, 245, 62, 127, 42, 93, 0, 81, 47, 177, 30, 25, 39, 70]);
var bytes = new Uint8Array([ 5, 69, 248, 173, 171, 254, 19, 253, 143, 140, 146, 174, 26, 128, 3, 52, 106, 55, 112, 245, 62, 127, 42, 93, 0, 81, 47, 177, 30, 25, 39, 70 ]);
var y = new BN(bytes, 16, 'le');
var point = curve.pointFromY(y, true);
var target = '2cd591ae3789fd62dc420a152002f79973a387eacecadc6a9a00c1a89488c15d';
@@ -114,7 +115,7 @@ describe('Curve', function() {
var curve = new elliptic.curve.short({
p: 'db7c 2abf62e3 5e668076 bead208b',
a: 'db7c 2abf62e3 5e668076 bead2088',
b: '659e f8ba0439 16eede89 11702b22'
b: '659e f8ba0439 16eede89 11702b22',
});
var p = curve.point(
@@ -134,13 +135,13 @@ describe('Curve', function() {
'baaedce6 af48a03b bfd25e8c d0364141',
g: [
'79be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798',
'483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8'
]
'483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8',
],
});
var p = curve.point(
'79be667e f9dcbbac 55a06295 ce870b07 029bfcdb 2dce28d9 59f2815b 16f81798',
'483ada77 26a3c465 5da4fbfc 0e1108a8 fd17b448 a6855419 9c47d08f fb10d4b8'
'483ada77 26a3c465 5da4fbfc 0e1108a8 fd17b448 a6855419 9c47d08f fb10d4b8',
);
assert(p.validate());
assert(p.dbl().validate());
@@ -173,7 +174,7 @@ describe('Curve', function() {
var g2 = curve.point(g1.getX(), g1.getY()); // not precomputed g
assert(!g2.precomputed);
var a = new BN(
'6d1229a6b24c2e775c062870ad26bc261051e0198c67203167273c7c62538846', 16);
'6d1229a6b24c2e775c062870ad26bc261051e0198c67203167273c7c62538846', 16);
var p1 = g1.mul(a);
var p2 = g2.mul(a);
assert(p1.eq(p2));
@@ -187,9 +188,9 @@ describe('Curve', function() {
assert(!g2.precomputed);
var a = new BN(
'6d1229a6b24c2e775c062870ad26bc26' +
'6d1229a6b24c2e775c062870ad26bc26' +
'1051e0198c67203167273c7c6253884612345678',
16);
16);
var p1 = g1.mul(a);
var p2 = g2.mul(a);
assert(p1.eq(p2));
@@ -198,9 +199,9 @@ describe('Curve', function() {
it('should not fail on secp256k1 regression', function() {
var curve = elliptic.curves.secp256k1.curve;
var k1 = new BN(
'32efeba414cd0c830aed727749e816a01c471831536fd2fce28c56b54f5a3bb1', 16);
'32efeba414cd0c830aed727749e816a01c471831536fd2fce28c56b54f5a3bb1', 16);
var k2 = new BN(
'5f2e49b5d64e53f9811545434706cde4de528af97bfd49fde1f6cf792ee37a8c', 16);
'5f2e49b5d64e53f9811545434706cde4de528af97bfd49fde1f6cf792ee37a8c', 16);
var p1 = curve.g.mul(k1);
var p2 = curve.g.mul(k2);
@@ -225,13 +226,13 @@ describe('Curve', function() {
var bad = {
x: '026a2073b1ef6fab47ace18e60e728a05180a82755bbcec9a0abc08ad9f7a3d4',
y: '9cd8cb48c3281596139f147c1364a3ede88d3f310fdb0eb98c924e599ca1b3c9',
z: 'd78587ad45e4102f48b54b5d85598296e069ce6085002e169c6bad78ddc6d9bd'
z: 'd78587ad45e4102f48b54b5d85598296e069ce6085002e169c6bad78ddc6d9bd',
};
var good = {
x: 'e7789226739ac2eb3c7ccb2a9a910066beeed86cdb4e0f8a7fee8eeb29dc7016',
y: '4b76b191fd6d47d07828ea965e275b76d0e3e0196cd5056d38384fbb819f9fcb',
z: 'cbf8d99056618ba132d6145b904eee1ce566e0feedb9595139c45f84e90cfa7d'
z: 'cbf8d99056618ba132d6145b904eee1ce566e0feedb9595139c45f84e90cfa7d',
};
var curve = elliptic.curves.secp256k1.curve;
@@ -297,7 +298,7 @@ describe('Point codec', function () {
var shortPointEvenY = {
coordinates: {
x: '79be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798',
y: '483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8'
y: '483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8',
},
compactEncoded:
'02' +
@@ -309,13 +310,13 @@ describe('Point codec', function () {
hybrid:
'06' +
'79be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798' +
'483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8'
'483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8',
};
var shortPointOddY = {
coordinates: {
x: 'fff97bd5755eeea420453a14355235d382f6472f8568a18b2f057a1460297556',
y: 'ae12777aacfbb620f3be96017f45c560de80f0f6518fe4a03c870c36b075f297'
y: 'ae12777aacfbb620f3be96017f45c560de80f0f6518fe4a03c870c36b075f297',
},
compactEncoded:
'03' +
@@ -327,7 +328,7 @@ describe('Point codec', function () {
hybrid:
'07' +
'fff97bd5755eeea420453a14355235d382f6472f8568a18b2f057a1460297556' +
'ae12777aacfbb620f3be96017f45c560de80f0f6518fe4a03c870c36b075f297'
'ae12777aacfbb620f3be96017f45c560de80f0f6518fe4a03c870c36b075f297',
};
it('should throw when trying to decode random bytes', function() {
@@ -339,18 +340,18 @@ describe('Point codec', function () {
});
it('should be able to encode/decode a short curve point with even Y',
makeShortTest(shortPointEvenY));
makeShortTest(shortPointEvenY));
it('should be able to encode/decode a short curve point with odd Y',
makeShortTest(shortPointOddY));
makeShortTest(shortPointOddY));
it('should be able to encode/decode a mont curve point', makeMontTest({
coordinates: {
// curve25519.curve.g.mul(new BN('6')).getX().toString(16, 2)
x: '26954ccdc99ebf34f8f1dde5e6bb080685fec73640494c28f9fe0bfa8c794531',
z: '1'
z: '1',
},
encoded:
'26954ccdc99ebf34f8f1dde5e6bb080685fec73640494c28f9fe0bfa8c794531'
'26954ccdc99ebf34f8f1dde5e6bb080685fec73640494c28f9fe0bfa8c794531',
}));
});
+7 -5
View File
@@ -1,6 +1,8 @@
/* eslint-env node, mocha */
'use strict';
var assert = require('assert');
var elliptic = require('../');
var hash = require('hash.js');
describe('ECDH', function() {
function test(name) {
@@ -13,10 +15,10 @@ describe('ECDH', function() {
assert.equal(sh1.toString(16), sh2.toString(16));
var sh1 = s1.derive(ecdh.keyFromPublic(s2.getPublic('hex'), 'hex')
.getPublic());
var sh2 = s2.derive(ecdh.keyFromPublic(s1.getPublic('hex'), 'hex')
.getPublic());
sh1 = s1.derive(ecdh.keyFromPublic(s2.getPublic('hex'), 'hex')
.getPublic());
sh2 = s2.derive(ecdh.keyFromPublic(s1.getPublic('hex'), 'hex')
.getPublic());
assert.equal(sh1.toString(16), sh2.toString(16));
});
}
+65 -61
View File
@@ -1,12 +1,15 @@
/* eslint-env node, mocha */
'use strict';
var assert = require('assert');
var elliptic = require('../');
var Signature = require('../lib/elliptic/ec/signature')
var Signature = require('../lib/elliptic/ec/signature');
var BN = require('bn.js');
var hash = require('hash.js');
var entropy = [
1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
21, 22, 23, 24, 25
21, 22, 23, 24, 25,
];
var msg = 'deadbeef';
@@ -16,6 +19,7 @@ describe('ECDSA', function() {
describe('curve ' + name, function() {
var curve;
var ecdsa;
var keys;
beforeEach(function() {
curve = elliptic.curves[name];
@@ -23,7 +27,7 @@ describe('ECDSA', function() {
ecdsa = new elliptic.ec(curve);
keys = ecdsa.genKeyPair({
entropy: entropy
entropy: entropy,
});
});
@@ -32,7 +36,7 @@ describe('ECDSA', function() {
if (name === 'p384') {
keylen = 96;
} else if (name === 'p521') {
keylen = 132
keylen = 132;
}
// Get keys out of pair
assert(keys.getPublic().x && keys.getPublic().y);
@@ -70,7 +74,7 @@ describe('ECDSA', function() {
k: function(iter) {
assert(iter >= 0);
return new BN(1358);
}
},
});
assert(ecdsa.verify(msg, sign, keys), 'custom-k verify');
});
@@ -79,7 +83,7 @@ describe('ECDSA', function() {
var sign1 = keys.sign(msg);
var sign2 = keys.sign(msg, { pers: '1234', persEnc: 'hex' });
assert.notEqual(sign1.r.toArray().concat(sign1.s.toArray()),
sign2.r.toArray().concat(sign2.s.toArray()));
sign2.r.toArray().concat(sign2.s.toArray()));
});
it('should load public key from compact hex value', function() {
@@ -133,7 +137,7 @@ describe('ECDSA', function() {
opt.cases.forEach(function(c) {
var ecdsa = elliptic.ec({
curve: opt.curve,
hash: c.hash
hash: c.hash,
});
var descr = 'should not fail on "' + opt.name + '" ' +
'and hash ' + c.hash.name + ' on "' + c.message + '"';
@@ -143,9 +147,9 @@ describe('ECDSA', function() {
assert.equal(sign.r.toString(16), c.r);
assert.equal(sign.s.toString(16), c.s);
assert.ok(ecdsa.keyFromPublic(opt.pub).validate().result,
'Invalid public key');
'Invalid public key');
assert.ok(ecdsa.verify(dgst, sign, opt.pub),
'Invalid signature');
'Invalid signature');
});
});
}
@@ -156,34 +160,34 @@ describe('ECDSA', function() {
key: '6fab034934e4c0fc9ae67f5b5659a9d7d1fefd187ee09fd4',
pub: {
x: 'ac2c77f529f91689fea0ea5efec7f210d8eea0b9e047ed56',
y: '3bc723e57670bd4887ebc732c523063d0a7c957bc97c1c43'
y: '3bc723e57670bd4887ebc732c523063d0a7c957bc97c1c43',
},
cases: [
{
message: 'sample',
hash: hash.sha224,
r: 'a1f00dad97aeec91c95585f36200c65f3c01812aa60378f5',
s: 'e07ec1304c7c6c9debbe980b9692668f81d4de7922a0f97a'
s: 'e07ec1304c7c6c9debbe980b9692668f81d4de7922a0f97a',
},
{
message: 'sample',
hash: hash.sha256,
r: '4b0b8ce98a92866a2820e20aa6b75b56382e0f9bfd5ecb55',
s: 'ccdb006926ea9565cbadc840829d8c384e06de1f1e381b85'
s: 'ccdb006926ea9565cbadc840829d8c384e06de1f1e381b85',
},
{
message: 'test',
hash: hash.sha224,
r: '6945a1c1d1b2206b8145548f633bb61cef04891baf26ed34',
s: 'b7fb7fdfc339c0b9bd61a9f5a8eaf9be58fc5cba2cb15293'
s: 'b7fb7fdfc339c0b9bd61a9f5a8eaf9be58fc5cba2cb15293',
},
{
message: 'test',
hash: hash.sha256,
r: '3a718bd8b4926c3b52ee6bbe67ef79b18cb6eb62b1ad97ae',
s: '5662e6848a4a19b1f1ae2f72acd4b8bbe50f1eac65d9124f'
}
]
s: '5662e6848a4a19b1f1ae2f72acd4b8bbe50f1eac65d9124f',
},
],
});
test({
@@ -192,34 +196,34 @@ describe('ECDSA', function() {
key: 'f220266e1105bfe3083e03ec7a3a654651f45e37167e88600bf257c1',
pub: {
x: '00cf08da5ad719e42707fa431292dea11244d64fc51610d94b130d6c',
y: 'eeab6f3debe455e3dbf85416f7030cbd94f34f2d6f232c69f3c1385a'
y: 'eeab6f3debe455e3dbf85416f7030cbd94f34f2d6f232c69f3c1385a',
},
cases: [
{
message: 'sample',
hash: hash.sha224,
r: '1cdfe6662dde1e4a1ec4cdedf6a1f5a2fb7fbd9145c12113e6abfd3e',
s: 'a6694fd7718a21053f225d3f46197ca699d45006c06f871808f43ebc'
s: 'a6694fd7718a21053f225d3f46197ca699d45006c06f871808f43ebc',
},
{
message: 'sample',
hash: hash.sha256,
r: '61aa3da010e8e8406c656bc477a7a7189895e7e840cdfe8ff42307ba',
s: 'bc814050dab5d23770879494f9e0a680dc1af7161991bde692b10101'
s: 'bc814050dab5d23770879494f9e0a680dc1af7161991bde692b10101',
},
{
message: 'test',
hash: hash.sha224,
r: 'c441ce8e261ded634e4cf84910e4c5d1d22c5cf3b732bb204dbef019',
s: '902f42847a63bdc5f6046ada114953120f99442d76510150f372a3f4'
s: '902f42847a63bdc5f6046ada114953120f99442d76510150f372a3f4',
},
{
message: 'test',
hash: hash.sha256,
r: 'ad04dde87b84747a243a631ea47a1ba6d1faa059149ad2440de6fba6',
s: '178d49b1ae90e3d8b629be3db5683915f4e8c99fdf6e666cf37adcfd'
}
]
s: '178d49b1ae90e3d8b629be3db5683915f4e8c99fdf6e666cf37adcfd',
},
],
});
test({
@@ -228,34 +232,34 @@ describe('ECDSA', function() {
key: 'c9afa9d845ba75166b5c215767b1d6934e50c3db36e89b127b8a622b120f6721',
pub: {
x: '60fed4ba255a9d31c961eb74c6356d68c049b8923b61fa6ce669622e60f29fb6',
y: '7903fe1008b8bc99a41ae9e95628bc64f2f1b20c2d7e9f5177a3c294d4462299'
y: '7903fe1008b8bc99a41ae9e95628bc64f2f1b20c2d7e9f5177a3c294d4462299',
},
cases: [
{
message: 'sample',
hash: hash.sha224,
r: '53b2fff5d1752b2c689df257c04c40a587fababb3f6fc2702f1343af7ca9aa3f',
s: 'b9afb64fdc03dc1a131c7d2386d11e349f070aa432a4acc918bea988bf75c74c'
s: 'b9afb64fdc03dc1a131c7d2386d11e349f070aa432a4acc918bea988bf75c74c',
},
{
message: 'sample',
hash: hash.sha256,
r: 'efd48b2aacb6a8fd1140dd9cd45e81d69d2c877b56aaf991c34d0ea84eaf3716',
s: 'f7cb1c942d657c41d436c7a1b6e29f65f3e900dbb9aff4064dc4ab2f843acda8'
s: 'f7cb1c942d657c41d436c7a1b6e29f65f3e900dbb9aff4064dc4ab2f843acda8',
},
{
message: 'test',
hash: hash.sha224,
r: 'c37edb6f0ae79d47c3c27e962fa269bb4f441770357e114ee511f662ec34a692',
s: 'c820053a05791e521fcaad6042d40aea1d6b1a540138558f47d0719800e18f2d'
s: 'c820053a05791e521fcaad6042d40aea1d6b1a540138558f47d0719800e18f2d',
},
{
message: 'test',
hash: hash.sha256,
r: 'f1abb023518351cd71d881567b1ea663ed3efcf6c5132b354f28d3b0b7d38367',
s: '19f4113742a2b14bd25926b49c649155f267e60d3814b4c0cc84250e46f0083'
}
]
s: '19f4113742a2b14bd25926b49c649155f267e60d3814b4c0cc84250e46f0083',
},
],
});
test({
@@ -267,7 +271,7 @@ describe('ECDSA', function() {
x: 'ec3a4e415b4e19a4568618029f427fa5da9a8bc4ae92e02e06aae5286b30' +
'0c64def8f0ea9055866064a254515480bc13',
y: '8015d9b72d7d57244ea8ef9ac0c621896708a59367f9dfb9f54ca84b3f' +
'1c9db1288b231c3ae0d4fe7344fd2533264720'
'1c9db1288b231c3ae0d4fe7344fd2533264720',
},
cases: [
{
@@ -276,7 +280,7 @@ describe('ECDSA', function() {
r: '42356e76b55a6d9b4631c865445dbe54e056d3b3431766d05092447' +
'93c3f9366450f76ee3de43f5a125333a6be060122',
s: '9da0c81787064021e78df658f2fbb0b042bf304665db721f077a429' +
'8b095e4834c082c03d83028efbf93a3c23940ca8d'
'8b095e4834c082c03d83028efbf93a3c23940ca8d',
},
{
message: 'sample',
@@ -284,7 +288,7 @@ describe('ECDSA', function() {
r: '94edbb92a5ecb8aad4736e56c691916b3f88140666ce9fa73d6' +
'4c4ea95ad133c81a648152e44acf96e36dd1e80fabe46',
s: '99ef4aeb15f178cea1fe40db2603138f130e740a19624526203b' +
'6351d0a3a94fa329c145786e679e7b82c71a38628ac8'
'6351d0a3a94fa329c145786e679e7b82c71a38628ac8',
},
{
message: 'test',
@@ -292,9 +296,9 @@ describe('ECDSA', function() {
r: '8203b63d3c853e8d77227fb377bcf7b7b772e97892a80f36a' +
'b775d509d7a5feb0542a7f0812998da8f1dd3ca3cf023db',
s: 'ddd0760448d42d8a43af45af836fce4de8be06b485e9b61b827c2f13' +
'173923e06a739f040649a667bf3b828246baa5a5'
}
]
'173923e06a739f040649a667bf3b828246baa5a5',
},
],
});
test({
@@ -308,7 +312,7 @@ describe('ECDSA', function() {
'71123d46e45db6b5d5370a7f20fb633155d38ffa16d2bd761dcac474b9a2f502' +
'3a4',
y: '0493101c962cd4d2fddf782285e64584139c2f91b47f87ff82354d6630f746a2' +
'8a0db25741b5b34a828008b22acc23f924faafbd4d33f81ea66956dfeaa2bfdfcf5'
'8a0db25741b5b34a828008b22acc23f924faafbd4d33f81ea66956dfeaa2bfdfcf5',
},
cases: [
{
@@ -319,7 +323,7 @@ describe('ECDSA', function() {
'd50c67451',
s: '1f21a3cee066e1961025fb048bd5fe2b7924d0cd797babe0a83b66f1e35ee' +
'af5fde143fa85dc394a7dee766523393784484bdf3e00114a1c857cde1aa2' +
'03db65d61'
'03db65d61',
},
{
message: 'sample',
@@ -329,7 +333,7 @@ describe('ECDSA', function() {
'77fa',
s: '617cce7cf5064806c467f678d3b4080d6f1cc50af26ca209417308281b68af2' +
'82623eaa63e5b5c0723d8b8c37ff0777b1a20f8ccb1dccc43997f1ee0e44da4' +
'a67a'
'a67a',
},
{
message: 'test',
@@ -339,9 +343,9 @@ describe('ECDSA', function() {
'babd47ee6d',
s: '1fbd0013c674aa79cb39849527916ce301c66ea7ce8b80682786ad60f98' +
'f7e78a19ca69eff5c57400e3b3a0ad66ce0978214d13baf4e9ac60752f7b15' +
'5e2de4dce3'
}
]
'5e2de4dce3',
},
],
});
});
@@ -362,7 +366,7 @@ describe('ECDSA', function() {
'd0c6b2d5217a5c16e8371062737aa1dae1',
message: msg,
sig: '3006020106020104',
result: true
result: true,
},
{
curve: p256,
@@ -371,7 +375,7 @@ describe('ECDSA', function() {
'4cfbc761c12edae974a0759750c8324f9a',
message: msg,
sig: '3006020106020104',
result: true
result: true,
},
{
curve: p256,
@@ -380,7 +384,7 @@ describe('ECDSA', function() {
'ddc39e8367147abab3084142ed3ea170e4',
message: msg,
sig: '301502104319055358e8617b0c46353d039cdaae020104',
result: true
result: true,
},
{
curve: p256,
@@ -389,7 +393,7 @@ describe('ECDSA', function() {
'8a560fff30a3d14aa160be0c5e7edcd887',
message: msg,
sig: '301502104319055358e8617b0c46353d039cdaae020104',
result: false
result: false,
},
{
curve: p384,
@@ -399,7 +403,7 @@ describe('ECDSA', function() {
'463c6186864888f6c0b67b304441f82aab031279e48f047c31',
message: msg,
sig: '3006020103020104',
result: true
result: true,
},
{
curve: p384,
@@ -409,7 +413,7 @@ describe('ECDSA', function() {
'526a7dfe616091b78d293552bc093dfde9b31cae69d51d3afb',
message: msg,
sig: '3006020103020104',
result: true
result: true,
},
{
curve: p384,
@@ -419,7 +423,7 @@ describe('ECDSA', function() {
'417c83dbcad631421f360d84d64658c98a62d685b220f5aad4',
message: msg,
sig: '301d0218389cb27e0bc8d21fa7e5f24cb74f58851313e696333ad68e020104',
result: true
result: true,
},
{
curve: p384,
@@ -429,8 +433,8 @@ describe('ECDSA', function() {
'2ef2f20d679777b84192ce86e781c14b1bbb77eacd6e0520e2',
message: msg,
sig: '301d0218389cb27e0bc8d21fa7e5f24cb74f58851313e696333ad68e020104',
result: false
}
result: false,
},
];
vectors.forEach(function(vector, i) {
@@ -453,7 +457,7 @@ describe('ECDSA', function() {
var ecdsa = new elliptic.ec(curve);
var keys = ecdsa.genKeyPair({
pers: 'my.pers.string',
entropy: hash.sha256().update('hello world').digest()
entropy: hash.sha256().update('hello world').digest(),
});
assert.equal(
keys.getPrivate('hex'),
@@ -471,19 +475,19 @@ describe('ECDSA', function() {
});
it('should fail to recover key when no quadratic residue available',
function() {
var ec = new elliptic.ec('secp256k1');
function() {
var ec = new elliptic.ec('secp256k1');
var message =
var message =
'f75c6b18a72fabc0f0b888c3da58e004f0af1fe14f7ca5d8c897fe164925d5e9';
assert.throws(function() {
ecdsa.recoverPubKey(message, {
r: 'fffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364140',
s: '8887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3'
}, 0);
assert.throws(function() {
ec.recoverPubKey(message, {
r: 'fffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364140',
s: '8887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3',
}, 0);
});
});
});
describe('Signature', function () {
it('recoveryParam is 0', function () {
+4 -3
View File
@@ -1,3 +1,4 @@
/* eslint-env node, mocha */
'use strict';
var assert = require('assert');
@@ -30,7 +31,7 @@ describe('ed25519 derivations', function() {
var key = ed25519.keyFromSecret(secret);
assert.equal(toHex(key.privBytes()), test.a_hex);
var xRecovered = toHex(ed25519.encodeInt(
ed25519.decodePoint(key.pubBytes()).getX()));
ed25519.decodePoint(key.pubBytes()).getX()));
assert.equal(xRecovered, test.A_P.x);
assert.equal(toHex(key.pubBytes()), test.A_hex);
});
@@ -72,8 +73,8 @@ describe('sign.input ed25519 test vectors', function() {
assert(key.verify(msg, sig));
var forged = msg.length === 0 ? [ 0x78 ] /*ord('x')*/:
msg.slice(0, msg.length - 1).concat(
(msg[(msg.length - 1)] + 1) % 256);
msg.slice(0, msg.length - 1).concat(
(msg[(msg.length - 1)] + 1) % 256);
assert.equal(msg.length || 1, forged.length);
assert(!key.verify(forged, sig));
+3839 -3839
View File
File diff suppressed because it is too large Load Diff
+3
View File
@@ -1,3 +1,6 @@
/* eslint-env node, mocha */
'use strict';
describe('Test specs', function () {
require('./api-test.js');
require('./curve-test.js');