@li0ard/dstu 0.1.3 → 0.1.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dstu4145/ec/expand.js +11 -11
- package/dstu4145/ec/index.d.ts +1 -3
- package/dstu4145/ec/index.js +16 -18
- package/dstu4145/ec/math.d.ts +0 -2
- package/dstu4145/ec/math.js +14 -40
- package/dstu4145/ec/onb.js +6 -6
- package/dstu4145/index.js +6 -6
- package/package.json +2 -2
package/dstu4145/ec/expand.js
CHANGED
|
@@ -10,30 +10,30 @@ export const expandPoint = (xBytes, params) => {
|
|
|
10
10
|
const bInt = field.fromHexStringOrBytes(params.b);
|
|
11
11
|
const b = (onb && converter) ? converter.onbToPb(bInt) : bInt;
|
|
12
12
|
const x = field.fromHexStringOrBytes(xBytes);
|
|
13
|
-
const bit =
|
|
13
|
+
const bit = x.testn(0);
|
|
14
14
|
let xClean = x.clone();
|
|
15
|
-
xClean
|
|
15
|
+
xClean.setn(0, 0);
|
|
16
16
|
const traceX = onb ? field.traceOnb(xClean) : field.trace(xClean);
|
|
17
17
|
if ((traceX === 1 && a === 0) || (traceX === 0 && a === 1))
|
|
18
|
-
xClean
|
|
19
|
-
const
|
|
18
|
+
xClean.setn(0, 1);
|
|
19
|
+
const xOut = xClean.clone();
|
|
20
20
|
if (onb && converter)
|
|
21
21
|
xClean = converter.onbToPb(xClean);
|
|
22
22
|
const x2 = field.sqr(xClean);
|
|
23
|
-
|
|
23
|
+
const rhs = field.mul(x2, xClean);
|
|
24
24
|
if (a === 1)
|
|
25
|
-
rhs
|
|
25
|
+
rhs.ixor(x2);
|
|
26
26
|
if (b)
|
|
27
|
-
rhs
|
|
28
|
-
|
|
27
|
+
rhs.ixor(b);
|
|
28
|
+
const z = field.solve_quad(field.mul(rhs, field.invert(x2)));
|
|
29
29
|
const traceZ = field.trace(z);
|
|
30
|
-
if ((traceZ === 0 && bit
|
|
31
|
-
z
|
|
30
|
+
if ((traceZ === 0 && bit) || (traceZ === 1 && !bit))
|
|
31
|
+
z.setn(0, !z.testn(0));
|
|
32
32
|
let y = field.mul(z, xClean);
|
|
33
33
|
if (onb && converter)
|
|
34
34
|
y = converter.pbToOnb(y);
|
|
35
35
|
return {
|
|
36
|
-
x: field.toBytes(
|
|
36
|
+
x: field.toBytes(xOut, field.LENGTH),
|
|
37
37
|
y: field.toBytes(y, field.LENGTH)
|
|
38
38
|
};
|
|
39
39
|
};
|
package/dstu4145/ec/index.d.ts
CHANGED
|
@@ -10,8 +10,6 @@ export declare const binaryWeierstrass: (parameters: DSTUParameters) => Readonly
|
|
|
10
10
|
sqr: (x: BN) => BN;
|
|
11
11
|
invert: (f: BN) => BN;
|
|
12
12
|
solve_quad: (v: BN) => BN;
|
|
13
|
-
testBit: (x: BN, i: number) => 0 | 1;
|
|
14
|
-
setBit: (x: BN, i: number, v: number) => BN;
|
|
15
13
|
trace: (x: BN) => 0 | 1;
|
|
16
14
|
traceOnb: (x: BN) => 0 | 1;
|
|
17
15
|
hashToField: (hash: TArg<Uint8Array>) => BN;
|
|
@@ -136,6 +134,7 @@ export declare const binaryWeierstrass: (parameters: DSTUParameters) => Readonly
|
|
|
136
134
|
};
|
|
137
135
|
};
|
|
138
136
|
ORDER: BN;
|
|
137
|
+
MASK: number;
|
|
139
138
|
parameters: DSTUParameters;
|
|
140
139
|
lengths: Readonly<{
|
|
141
140
|
fieldByteLength: number;
|
|
@@ -144,7 +143,6 @@ export declare const binaryWeierstrass: (parameters: DSTUParameters) => Readonly
|
|
|
144
143
|
signatureByteLength: number;
|
|
145
144
|
}>;
|
|
146
145
|
isOnb: boolean;
|
|
147
|
-
truncate: (x: BN) => BN;
|
|
148
146
|
toInternalField: (f: BN) => BN;
|
|
149
147
|
toExternalField: (f: BN) => BN;
|
|
150
148
|
}>;
|
package/dstu4145/ec/index.js
CHANGED
|
@@ -43,8 +43,8 @@ export const binaryWeierstrass = (parameters) => {
|
|
|
43
43
|
lbd = field.mul(tmp, field.invert(tmp2));
|
|
44
44
|
x2 = field.sqr(lbd);
|
|
45
45
|
if (parameters.a === 1)
|
|
46
|
-
x2
|
|
47
|
-
x2
|
|
46
|
+
x2.setn(0, !x2.testn(0));
|
|
47
|
+
x2.ixor(lbd).ixor(x0).ixor(x1);
|
|
48
48
|
}
|
|
49
49
|
else {
|
|
50
50
|
if (y1.cmp(y0) !== 0)
|
|
@@ -54,8 +54,8 @@ export const binaryWeierstrass = (parameters) => {
|
|
|
54
54
|
lbd = x1.xor(field.mul(p.y, field.invert(p.x)));
|
|
55
55
|
x2 = field.sqr(lbd);
|
|
56
56
|
if (parameters.a === 1)
|
|
57
|
-
x2
|
|
58
|
-
x2
|
|
57
|
+
x2.setn(0, !x2.testn(0));
|
|
58
|
+
x2.ixor(lbd);
|
|
59
59
|
}
|
|
60
60
|
const y2 = field.mul(lbd, x1.xor(x2)).xor(x2).xor(y1);
|
|
61
61
|
pz.x = x2;
|
|
@@ -81,7 +81,7 @@ export const binaryWeierstrass = (parameters) => {
|
|
|
81
81
|
isZero() { return this.x.isZero() && this.y.isZero(); }
|
|
82
82
|
compress() {
|
|
83
83
|
const tmp = field.mul(field.invert(this.x), this.y);
|
|
84
|
-
return
|
|
84
|
+
return toExternal(this.x).setn(0, field.trace(tmp));
|
|
85
85
|
}
|
|
86
86
|
toBytes(isCompressed = false) {
|
|
87
87
|
if (isCompressed)
|
|
@@ -146,23 +146,23 @@ export const binaryWeierstrass = (parameters) => {
|
|
|
146
146
|
return R;
|
|
147
147
|
}
|
|
148
148
|
static expand(xExt) {
|
|
149
|
-
const bit =
|
|
150
|
-
|
|
151
|
-
xCleanExt
|
|
149
|
+
const bit = xExt.testn(0);
|
|
150
|
+
const xCleanExt = xExt.clone();
|
|
151
|
+
xCleanExt.setn(0, 0);
|
|
152
152
|
const traceX = onb ? field.traceOnb(xCleanExt) : field.trace(xCleanExt);
|
|
153
153
|
if ((traceX === 1 && parameters.a === 0) || (traceX === 0 && parameters.a === 1))
|
|
154
|
-
xCleanExt
|
|
154
|
+
xCleanExt.setn(0, 1);
|
|
155
155
|
const xClean = toInternal(xCleanExt);
|
|
156
156
|
const x2 = field.sqr(xClean);
|
|
157
|
-
|
|
157
|
+
const rhs = field.mul(x2, xClean);
|
|
158
158
|
if (parameters.a === 1)
|
|
159
|
-
rhs
|
|
159
|
+
rhs.ixor(x2);
|
|
160
160
|
if (b)
|
|
161
|
-
rhs
|
|
162
|
-
|
|
161
|
+
rhs.ixor(b);
|
|
162
|
+
const z = field.solve_quad(field.mul(rhs, field.invert(x2)));
|
|
163
163
|
const traceZ = field.trace(z);
|
|
164
|
-
if ((traceZ === 0 && bit
|
|
165
|
-
z
|
|
164
|
+
if ((traceZ === 0 && bit) || (traceZ === 1 && !bit))
|
|
165
|
+
z.setn(0, !z.testn(0));
|
|
166
166
|
return new Point(xClean, field.mul(z, xClean));
|
|
167
167
|
}
|
|
168
168
|
static fromBytes(bytes) {
|
|
@@ -174,16 +174,14 @@ export const binaryWeierstrass = (parameters) => {
|
|
|
174
174
|
throw new Error(`Invalid bytes length. Must be ${pointByteLength} for uncompressed and ${field.LENGTH} for compressed`);
|
|
175
175
|
}
|
|
176
176
|
}
|
|
177
|
-
const k = order.bitLength() - 1;
|
|
178
|
-
const truncate = (x) => x.maskn(k);
|
|
179
177
|
// Precompute
|
|
180
178
|
Point.BASE.mulWnaf(new BN(3));
|
|
181
179
|
return Object.freeze({
|
|
182
180
|
Field: field, Point,
|
|
183
181
|
ORDER: order,
|
|
182
|
+
MASK: order.bitLength() - 1,
|
|
184
183
|
parameters, lengths,
|
|
185
184
|
isOnb: !!onb,
|
|
186
|
-
truncate,
|
|
187
185
|
toInternalField: toInternal,
|
|
188
186
|
toExternalField: toExternal
|
|
189
187
|
});
|
package/dstu4145/ec/math.d.ts
CHANGED
|
@@ -11,8 +11,6 @@ export declare const createField: (m: number, ks: number[]) => Readonly<{
|
|
|
11
11
|
sqr: (x: BN) => BN;
|
|
12
12
|
invert: (f: BN) => BN;
|
|
13
13
|
solve_quad: (v: BN) => BN;
|
|
14
|
-
testBit: (x: BN, i: number) => 0 | 1;
|
|
15
|
-
setBit: (x: BN, i: number, v: number) => BN;
|
|
16
14
|
trace: (x: BN) => 0 | 1;
|
|
17
15
|
traceOnb: (x: BN) => 0 | 1;
|
|
18
16
|
hashToField: (hash: TArg<Uint8Array>) => BN;
|
package/dstu4145/ec/math.js
CHANGED
|
@@ -81,38 +81,13 @@ export const computeMod = (m, ks) => {
|
|
|
81
81
|
};
|
|
82
82
|
/** Create `GF(2^m)` field */
|
|
83
83
|
export const createField = (m, ks) => {
|
|
84
|
-
const modulo = computeMod(m, ks);
|
|
85
|
-
/*const mod = (f: BN): BN => {
|
|
86
|
-
const cmp = f.cmp(modulo);
|
|
87
|
-
if(cmp === 0) return new BN(0);
|
|
88
|
-
if(cmp < 0) return f.clone();
|
|
89
|
-
|
|
90
|
-
let bag = f;
|
|
91
|
-
const vl = modulo.bitLength();
|
|
92
|
-
while(true) {
|
|
93
|
-
bag = bag.xor(modulo.ushln(bag.bitLength() - vl));
|
|
94
|
-
if (bag.bitLength() < vl) return bag;
|
|
95
|
-
}
|
|
96
|
-
}
|
|
97
|
-
|
|
98
|
-
const mul = (x: BN, v: BN): BN => {
|
|
99
|
-
let bag = new BN(0), shift = x;
|
|
100
|
-
for(let i = 0; i < v.bitLength(); i++) {
|
|
101
|
-
if(v.testn(i)) bag = bag.xor(shift);
|
|
102
|
-
shift = shift.ushln(1);
|
|
103
|
-
}
|
|
104
|
-
|
|
105
|
-
return mod(bag);
|
|
106
|
-
}*/
|
|
107
|
-
const wordsPerElement = Math.ceil(m / WORD_BITS);
|
|
108
|
-
const wordsForProduct = 2 * wordsPerElement;
|
|
109
|
-
const vl = modulo.bitLength();
|
|
84
|
+
const modulo = computeMod(m, ks), wordsPerElement = Math.ceil(m / WORD_BITS), wordsForProduct = 2 * wordsPerElement, vl = modulo.bitLength();
|
|
110
85
|
const bMod = (f) => {
|
|
111
86
|
if (f.bitLength() <= m)
|
|
112
|
-
return f
|
|
113
|
-
|
|
87
|
+
return f;
|
|
88
|
+
const bag = f;
|
|
114
89
|
while (bag.bitLength() > m)
|
|
115
|
-
bag
|
|
90
|
+
bag.ixor(modulo.ushln(bag.bitLength() - vl));
|
|
116
91
|
return bag;
|
|
117
92
|
};
|
|
118
93
|
const mod = (f) => {
|
|
@@ -140,7 +115,7 @@ export const createField = (m, ks) => {
|
|
|
140
115
|
table[i] = table[i ^ lowBit].xor(x.ushln(lowBitIdx));
|
|
141
116
|
}
|
|
142
117
|
const vb = v.bitLength();
|
|
143
|
-
|
|
118
|
+
const acc = new BN(0);
|
|
144
119
|
for (let win = Math.ceil(vb / MUL_WINDOW) - 1; win >= 0; win--) {
|
|
145
120
|
let windowVal = 0;
|
|
146
121
|
for (let b = 0; b < MUL_WINDOW; b++) {
|
|
@@ -148,7 +123,7 @@ export const createField = (m, ks) => {
|
|
|
148
123
|
if (bitPos < vb && v.testn(bitPos))
|
|
149
124
|
windowVal |= (1 << b);
|
|
150
125
|
}
|
|
151
|
-
acc
|
|
126
|
+
acc.iushln(MUL_WINDOW).ixor(table[windowVal]);
|
|
152
127
|
}
|
|
153
128
|
return mod(acc);
|
|
154
129
|
};
|
|
@@ -163,11 +138,10 @@ export const createField = (m, ks) => {
|
|
|
163
138
|
return mod(new BN(out));
|
|
164
139
|
};
|
|
165
140
|
const testBit = (x, i) => x.testn(i) ? 1 : 0;
|
|
166
|
-
const setBit = (x, i, v) => x.setn(i, v == 1);
|
|
167
141
|
const trace = (x) => {
|
|
168
142
|
let t = x;
|
|
169
143
|
for (let i = 1; i < m; i++)
|
|
170
|
-
t = sqr(t).
|
|
144
|
+
t = sqr(t).ixor(x);
|
|
171
145
|
return testBit(t, 0);
|
|
172
146
|
};
|
|
173
147
|
const traceOnb = (x) => {
|
|
@@ -179,11 +153,11 @@ export const createField = (m, ks) => {
|
|
|
179
153
|
const htrace = (x) => {
|
|
180
154
|
let ht = x;
|
|
181
155
|
for (let i = 1; i <= Math.floor((m - 1) / 2); i++)
|
|
182
|
-
ht = sqr(sqr(ht)).
|
|
156
|
+
ht = sqr(sqr(ht)).ixor(x);
|
|
183
157
|
return ht;
|
|
184
158
|
};
|
|
185
159
|
const invert = (f) => {
|
|
186
|
-
let r = mod(f), s = modulo;
|
|
160
|
+
let r = mod(f), s = modulo.clone();
|
|
187
161
|
let u = new BN(1), v = new BN(0);
|
|
188
162
|
while (r.bitLength() > 1) {
|
|
189
163
|
let j = s.bitLength() - r.bitLength();
|
|
@@ -196,27 +170,27 @@ export const createField = (m, ks) => {
|
|
|
196
170
|
v = buf;
|
|
197
171
|
j = -j;
|
|
198
172
|
}
|
|
199
|
-
s
|
|
200
|
-
v
|
|
173
|
+
s.ixor(r.ushln(j));
|
|
174
|
+
v.ixor(u.ushln(j));
|
|
201
175
|
}
|
|
202
176
|
return u;
|
|
203
177
|
};
|
|
204
178
|
const solve_quad = (v) => {
|
|
205
179
|
const a = mod(v), z = htrace(a);
|
|
206
|
-
if (sqr(z).
|
|
180
|
+
if (sqr(z).ixor(z).cmp(a) == 0)
|
|
207
181
|
return mod(z);
|
|
208
182
|
throw new Error("squad eq fail: no square root exists");
|
|
209
183
|
};
|
|
210
184
|
const hashToField = (hash) => {
|
|
211
185
|
const h = new BN(hash);
|
|
212
|
-
return h.
|
|
186
|
+
return h.imaskn(Math.min(m, h.bitLength()));
|
|
213
187
|
};
|
|
214
188
|
const fromHexStringOrBytes = (v) => new BN(v, 16);
|
|
215
189
|
const toBytes = (x, length) => new Uint8Array(x.toArray("be", length));
|
|
216
190
|
return Object.freeze({
|
|
217
191
|
MODULO: modulo, LENGTH: Math.ceil(m / 8),
|
|
218
192
|
mod, mul, sqr, invert, solve_quad,
|
|
219
|
-
|
|
193
|
+
trace, traceOnb, hashToField,
|
|
220
194
|
fromHexStringOrBytes, toBytes
|
|
221
195
|
});
|
|
222
196
|
};
|
package/dstu4145/ec/onb.js
CHANGED
|
@@ -5,11 +5,11 @@ const decompress_matrix = (compress_mulp, mulp) => {
|
|
|
5
5
|
const mlen = Math.ceil(compress_mulp.bitLength() / 9);
|
|
6
6
|
if (mlen === 0)
|
|
7
7
|
return;
|
|
8
|
-
|
|
8
|
+
const temp = compress_mulp;
|
|
9
9
|
const mask = new BN(0x1ff);
|
|
10
10
|
for (let j = mlen - 1; j >= 0; j--) {
|
|
11
11
|
mulp[j] = temp.and(mask).toNumber();
|
|
12
|
-
temp
|
|
12
|
+
temp.ishrn(9);
|
|
13
13
|
}
|
|
14
14
|
};
|
|
15
15
|
export const init_onb_parameters = (parameters) => {
|
|
@@ -57,17 +57,17 @@ export const init_onb_parameters = (parameters) => {
|
|
|
57
57
|
const toOnb = _toOnb.map(reverseBits);
|
|
58
58
|
return Object.freeze({
|
|
59
59
|
onbToPb: (x) => {
|
|
60
|
-
|
|
60
|
+
const r = new BN(0);
|
|
61
61
|
for (let p = 0; p < m; p++)
|
|
62
62
|
if (x.testn(p))
|
|
63
|
-
r
|
|
63
|
+
r.ixor(toPb[m - 1 - p]);
|
|
64
64
|
return r;
|
|
65
65
|
},
|
|
66
66
|
pbToOnb: (x) => {
|
|
67
|
-
|
|
67
|
+
const r = new BN(0);
|
|
68
68
|
for (let j = 0; j < m; j++)
|
|
69
69
|
if (x.testn(j))
|
|
70
|
-
r
|
|
70
|
+
r.ixor(toOnb[j]);
|
|
71
71
|
return r;
|
|
72
72
|
}
|
|
73
73
|
});
|
package/dstu4145/index.js
CHANGED
|
@@ -5,13 +5,13 @@ import BN from "bn.js";
|
|
|
5
5
|
/** Create DSTU 4145-2002 signer (Big-Endian) */
|
|
6
6
|
export const dstu4145 = (parameters) => {
|
|
7
7
|
const curve = binaryWeierstrass(parameters);
|
|
8
|
-
const { Field, Point,
|
|
8
|
+
const { Field, Point, MASK, lengths } = curve;
|
|
9
9
|
const getPublicKey = (secretKey, isCompressed = false) => Point.BASE.mul(Field.fromHexStringOrBytes(secretKey)).negate().toBytes(isCompressed);
|
|
10
|
-
const randomPrivateKey = () => Field.toBytes(
|
|
10
|
+
const randomPrivateKey = () => Field.toBytes(new BN(randomBytes(lengths.scalarByteLength)).imaskn(MASK), lengths.scalarByteLength);
|
|
11
11
|
const computePresign = (rand) => {
|
|
12
|
-
const e =
|
|
12
|
+
const e = (rand
|
|
13
13
|
? new BN(rand)
|
|
14
|
-
: new BN(randomBytes(lengths.scalarByteLength)));
|
|
14
|
+
: new BN(randomBytes(lengths.scalarByteLength))).imaskn(MASK);
|
|
15
15
|
if (rand && e.isZero())
|
|
16
16
|
throw new Error("Invalid custom rand for presign (rand = 0)");
|
|
17
17
|
if (e.isZero())
|
|
@@ -29,7 +29,7 @@ export const dstu4145 = (parameters) => {
|
|
|
29
29
|
};
|
|
30
30
|
const sign = (secretKey, digest, rand) => {
|
|
31
31
|
const d = new BN(secretKey), h = prepareHash(digest), { Fe, e } = computePresign(rand);
|
|
32
|
-
const r =
|
|
32
|
+
const r = curve.toExternalField(Field.mul(h, Fe)).imaskn(MASK);
|
|
33
33
|
if (r.isZero())
|
|
34
34
|
return sign(secretKey, digest, rand);
|
|
35
35
|
const s = e.add(d.mul(r)).mod(curve.ORDER);
|
|
@@ -46,7 +46,7 @@ export const dstu4145 = (parameters) => {
|
|
|
46
46
|
return false;
|
|
47
47
|
const h = prepareHash(digest);
|
|
48
48
|
const R = Point.BASE.mulWnaf(s).add(Q.mulWnaf(r));
|
|
49
|
-
const y =
|
|
49
|
+
const y = curve.toExternalField(Field.mul(h, R.x)).imaskn(MASK);
|
|
50
50
|
return y.eq(r);
|
|
51
51
|
};
|
|
52
52
|
const keygen = (isCompressed = false) => {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@li0ard/dstu",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.4",
|
|
4
4
|
"main": "index.js",
|
|
5
5
|
"types": "index.d.ts",
|
|
6
6
|
"type": "module",
|
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
"typescript": "^5"
|
|
42
42
|
},
|
|
43
43
|
"dependencies": {
|
|
44
|
-
"@noble/hashes": "^2.
|
|
44
|
+
"@noble/hashes": "^2.3.0",
|
|
45
45
|
"bn.js": "^5.2.3"
|
|
46
46
|
},
|
|
47
47
|
"files": ["**/*.js", "**/*.d.ts"],
|