@@ -59,18 +59,20 @@ BaseCurve.prototype._fixedNafMul = function _fixedNafMul(p, k) {
59
59
60
60
// Translate into more windowed form
61
61
var repr = [ ] ;
62
- for ( var j = 0 ; j < naf . length ; j += doubles . step ) {
63
- var nafW = 0 ;
64
- for ( var k = j + doubles . step - 1 ; k >= j ; k -- )
65
- nafW = ( nafW << 1 ) + naf [ k ] ;
62
+ var j ;
63
+ var nafW ;
64
+ for ( j = 0 ; j < naf . length ; j += doubles . step ) {
65
+ nafW = 0 ;
66
+ for ( var l = j + doubles . step - 1 ; l >= j ; l -- )
67
+ nafW = ( nafW << 1 ) + naf [ l ] ;
66
68
repr . push ( nafW ) ;
67
69
}
68
70
69
71
var a = this . jpoint ( null , null , null ) ;
70
72
var b = this . jpoint ( null , null , null ) ;
71
73
for ( var i = I ; i > 0 ; i -- ) {
72
- for ( var j = 0 ; j < repr . length ; j ++ ) {
73
- var nafW = repr [ j ] ;
74
+ for ( j = 0 ; j < repr . length ; j ++ ) {
75
+ nafW = repr [ j ] ;
74
76
if ( nafW === i )
75
77
b = b . mixedAdd ( doubles . points [ j ] ) ;
76
78
else if ( nafW === - i )
@@ -96,11 +98,11 @@ BaseCurve.prototype._wnafMul = function _wnafMul(p, k) {
96
98
var acc = this . jpoint ( null , null , null ) ;
97
99
for ( var i = naf . length - 1 ; i >= 0 ; i -- ) {
98
100
// Count zeroes
99
- for ( var k = 0 ; i >= 0 && naf [ i ] === 0 ; i -- )
100
- k ++ ;
101
+ for ( var l = 0 ; i >= 0 && naf [ i ] === 0 ; i -- )
102
+ l ++ ;
101
103
if ( i >= 0 )
102
- k ++ ;
103
- acc = acc . dblp ( k ) ;
104
+ l ++ ;
105
+ acc = acc . dblp ( l ) ;
104
106
105
107
if ( i < 0 )
106
108
break ;
@@ -124,25 +126,28 @@ BaseCurve.prototype._wnafMul = function _wnafMul(p, k) {
124
126
} ;
125
127
126
128
BaseCurve . prototype . _wnafMulAdd = function _wnafMulAdd ( defW ,
127
- points ,
128
- coeffs ,
129
- len ,
130
- jacobianResult ) {
129
+ points ,
130
+ coeffs ,
131
+ len ,
132
+ jacobianResult ) {
131
133
var wndWidth = this . _wnafT1 ;
132
134
var wnd = this . _wnafT2 ;
133
135
var naf = this . _wnafT3 ;
134
136
135
137
// Fill all arrays
136
138
var max = 0 ;
137
- for ( var i = 0 ; i < len ; i ++ ) {
138
- var p = points [ i ] ;
139
+ var i ;
140
+ var j ;
141
+ var p ;
142
+ for ( i = 0 ; i < len ; i ++ ) {
143
+ p = points [ i ] ;
139
144
var nafPoints = p . _getNAFPoints ( defW ) ;
140
145
wndWidth [ i ] = nafPoints . wnd ;
141
146
wnd [ i ] = nafPoints . points ;
142
147
}
143
148
144
149
// Comb small window NAFs
145
- for ( var i = len - 1 ; i >= 1 ; i -= 2 ) {
150
+ for ( i = len - 1 ; i >= 1 ; i -= 2 ) {
146
151
var a = i - 1 ;
147
152
var b = i ;
148
153
if ( wndWidth [ a ] !== 1 || wndWidth [ b ] !== 1 ) {
@@ -157,7 +162,7 @@ BaseCurve.prototype._wnafMulAdd = function _wnafMulAdd(defW,
157
162
points [ a ] , /* 1 */
158
163
null , /* 3 */
159
164
null , /* 5 */
160
- points [ b ] /* 7 */
165
+ points [ b ] , /* 7 */
161
166
] ;
162
167
163
168
// Try to avoid Projective points, if possible
@@ -181,14 +186,14 @@ BaseCurve.prototype._wnafMulAdd = function _wnafMulAdd(defW,
181
186
7 , /* 0 1 */
182
187
5 , /* 1 -1 */
183
188
1 , /* 1 0 */
184
- 3 /* 1 1 */
189
+ 3 , /* 1 1 */
185
190
] ;
186
191
187
192
var jsf = getJSF ( coeffs [ a ] , coeffs [ b ] ) ;
188
193
max = Math . max ( jsf [ 0 ] . length , max ) ;
189
194
naf [ a ] = new Array ( max ) ;
190
195
naf [ b ] = new Array ( max ) ;
191
- for ( var j = 0 ; j < max ; j ++ ) {
196
+ for ( j = 0 ; j < max ; j ++ ) {
192
197
var ja = jsf [ 0 ] [ j ] | 0 ;
193
198
var jb = jsf [ 1 ] [ j ] | 0 ;
194
199
@@ -200,12 +205,12 @@ BaseCurve.prototype._wnafMulAdd = function _wnafMulAdd(defW,
200
205
201
206
var acc = this . jpoint ( null , null , null ) ;
202
207
var tmp = this . _wnafT4 ;
203
- for ( var i = max ; i >= 0 ; i -- ) {
208
+ for ( i = max ; i >= 0 ; i -- ) {
204
209
var k = 0 ;
205
210
206
211
while ( i >= 0 ) {
207
212
var zero = true ;
208
- for ( var j = 0 ; j < len ; j ++ ) {
213
+ for ( j = 0 ; j < len ; j ++ ) {
209
214
tmp [ j ] = naf [ j ] [ i ] | 0 ;
210
215
if ( tmp [ j ] !== 0 )
211
216
zero = false ;
@@ -221,9 +226,9 @@ BaseCurve.prototype._wnafMulAdd = function _wnafMulAdd(defW,
221
226
if ( i < 0 )
222
227
break ;
223
228
224
- for ( var j = 0 ; j < len ; j ++ ) {
229
+ for ( j = 0 ; j < len ; j ++ ) {
225
230
var z = tmp [ j ] ;
226
- var p ;
231
+ p ;
227
232
if ( z === 0 )
228
233
continue ;
229
234
else if ( z > 0 )
@@ -238,7 +243,7 @@ BaseCurve.prototype._wnafMulAdd = function _wnafMulAdd(defW,
238
243
}
239
244
}
240
245
// Zeroify references
241
- for ( var i = 0 ; i < len ; i ++ )
246
+ for ( i = 0 ; i < len ; i ++ )
242
247
wnd [ i ] = null ;
243
248
244
249
if ( jacobianResult )
@@ -276,7 +281,7 @@ BaseCurve.prototype.decodePoint = function decodePoint(bytes, enc) {
276
281
assert ( bytes [ bytes . length - 1 ] % 2 === 1 ) ;
277
282
278
283
var res = this . point ( bytes . slice ( 1 , 1 + len ) ,
279
- bytes . slice ( 1 + len , 1 + 2 * len ) ) ;
284
+ bytes . slice ( 1 + len , 1 + 2 * len ) ) ;
280
285
281
286
return res ;
282
287
} else if ( ( bytes [ 0 ] === 0x02 || bytes [ 0 ] === 0x03 ) &&
@@ -297,7 +302,7 @@ BasePoint.prototype._encode = function _encode(compact) {
297
302
if ( compact )
298
303
return [ this . getY ( ) . isEven ( ) ? 0x02 : 0x03 ] . concat ( x ) ;
299
304
300
- return [ 0x04 ] . concat ( x , this . getY ( ) . toArray ( 'be' , len ) ) ;
305
+ return [ 0x04 ] . concat ( x , this . getY ( ) . toArray ( 'be' , len ) ) ;
301
306
} ;
302
307
303
308
BasePoint . prototype . encode = function encode ( enc , compact ) {
@@ -311,7 +316,7 @@ BasePoint.prototype.precompute = function precompute(power) {
311
316
var precomputed = {
312
317
doubles : null ,
313
318
naf : null ,
314
- beta : null
319
+ beta : null ,
315
320
} ;
316
321
precomputed . naf = this . _getNAFPoints ( 8 ) ;
317
322
precomputed . doubles = this . _getDoubles ( 4 , power ) ;
@@ -345,7 +350,7 @@ BasePoint.prototype._getDoubles = function _getDoubles(step, power) {
345
350
}
346
351
return {
347
352
step : step ,
348
- points : doubles
353
+ points : doubles ,
349
354
} ;
350
355
} ;
351
356
@@ -360,7 +365,7 @@ BasePoint.prototype._getNAFPoints = function _getNAFPoints(wnd) {
360
365
res [ i ] = res [ i - 1 ] . add ( dbl ) ;
361
366
return {
362
367
wnd : wnd ,
363
- points : res
368
+ points : res ,
364
369
} ;
365
370
} ;
366
371
0 commit comments