Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Addressing audit Issue Y #765

Merged
merged 2 commits into from
Jun 22, 2022
Merged

Addressing audit Issue Y #765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f8af51c
fix: add more modulos
IlyasRidhuan Jun 16, 2022
95d70ca
fix: more in number theory
IlyasRidhuan Jun 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions common-files/utils/crypto/number-theory.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,13 +102,13 @@ function squareRootModPrime(n, p) {
// TODO Refactor while loop
// eslint-disable-next-line no-constant-condition
while (true) {
if (t % p === BigInt(1)) return R;
if (((t % p) + p) % p === BigInt(1)) return R;

// Find the smallest i (0 < i < M) such that t^{2^i} = 1
let u = t;
let i;
for (i = BigInt(1); i < M; i++) {
u = (u * u) % p;
u = (((u * u) % p) + p) % p;
if (u === BigInt(1)) break;
}

Expand All @@ -118,14 +118,14 @@ function squareRootModPrime(n, p) {
// Set b = c^{2^{M-i-1}}
let b = c;
while (i < M) {
b = (b * b) % p;
b = (((b * b) % p) + p) % p;
i++;
}

M = minimumI;
R = (R * b) % p;
t = (t * b * b) % p;
c = (b * b) % p;
R = (((R * b) % p) + p) % p;
t = (((t * b * b) % p) + p) % p;
c = (((b * b) % p) + p) % p;
}
}

Expand Down
8 changes: 4 additions & 4 deletions nightfall-client/src/utils/crypto/encryption/elgamal.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ const Fq = JUBJUBE / JUBJUBC;

function isOnCurve(p) {
const { JUBJUBA: a, JUBJUBD: d } = BABYJUBJUB;
const uu = (p[0] * p[0]) % Fp;
const vv = (p[1] * p[1]) % Fp;
const uuvv = (uu * vv) % Fp;
return (a * uu + vv) % Fp === (one + d * uuvv) % Fp;
const uu = (((p[0] * p[0]) % Fp) + Fp) % Fp;
const vv = (((p[1] * p[1]) % Fp) + Fp) % Fp;
const uuvv = (((uu * vv) % Fp) + Fp) % Fp;
return (((a * uu + vv) % Fp) + Fp) % Fp === (((one + d * uuvv) % Fp) + Fp) % Fp;
}

// // is On Montgomery curve By^2 = x^3 + Ax^2 + x
Expand Down
17 changes: 9 additions & 8 deletions nightfall-client/src/utils/crypto/encryption/elligator2.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ function chi(a) {

// if value > p-1//2, then negative
function isNegative(value) {
return value % Fp > modDivide(Fp - BigInt(1), BigInt(2), Fp);
return ((value % Fp) + Fp) % Fp > modDivide(Fp - BigInt(1), BigInt(2), Fp);
}

// if value == 0 or chi(value) == 1
Expand All @@ -38,9 +38,10 @@ function isSquare(value) {
// r∈Fq :1+ur^2!=0, A^2ur^2!=B(1+ur^2)^2
function checkR(r) {
return (
(BigInt(1) + ((U * r * r) % Fp)) % Fp !== BigInt(0) &&
(MONTA * MONTA * U * r * r) % Fp !==
(MONTB * (BigInt(1) + ((U * r * r) % Fp)) * (BigInt(1) + ((U * r * r) % Fp))) % Fp
(BigInt(1) + ((((U * r * r) % Fp) + Fp) % Fp)) % Fp !== BigInt(0) &&
(((MONTA * MONTA * U * r * r) % Fp) + Fp) % Fp !==
(((MONTB * (BigInt(1) + ((U * r * r) % Fp)) * (BigInt(1) + ((U * r * r) % Fp))) % Fp) + Fp) %
Fp
);
}

Expand All @@ -53,8 +54,8 @@ export function hashToCurve(r) {
if (r === BigInt(0)) return [BigInt(0), BigInt(0)];
if (checkR(r) !== true) throw new Error(`This value can't be hashed to curve using Elligator2`);
const v = modDivide(-MONTA, one + U * r * r, Fp);
const e = chi((v * v * v + MONTA * v * v + MONTB * v) % Fp);
const x = ((e * v) % Fp) - modDivide((one - e) * MONTA, BigInt(2), Fp);
const e = (chi((v * v * v + MONTA * v * v + MONTB * v) % Fp) + Fp) % Fp;
const x = ((((e * v) % Fp) + Fp) % Fp) - modDivide((one - e) * MONTA, BigInt(2), Fp);
let y2 = squareRootModPrime((x * x * x + MONTA * x * x + MONTB * x) % Fp, Fp);
// Ensure returned value is the principal root (i.e. sqrt(x) ∈ [0, (Fp -1) / 2] )
if (y2 > (Fp - BigInt(1)) / BigInt(2)) y2 = Fp - y2;
Expand All @@ -66,8 +67,8 @@ export function hashToCurve(r) {
// square roots is the number for constraint efficiency
export function hashToCurveYSqrt(r) {
const v = modDivide(-MONTA, one + U * r * r, Fp);
const e = chi((v * v * v + MONTA * v * v + MONTB * v) % Fp);
const x = ((e * v) % Fp) - modDivide((one - e) * MONTA, BigInt(2), Fp);
const e = (chi((v * v * v + MONTA * v * v + MONTB * v) % Fp) + Fp) % Fp;
const x = ((((e * v) % Fp) + Fp) % Fp) - modDivide((one - e) * MONTA, BigInt(2), Fp);
let y2 = squareRootModPrime((x * x * x + MONTA * x * x + MONTB * x) % Fp, Fp);
// Ensure returned value is the principal root (i.e. sqrt(x) ∈ [0, (Fp -1) / 2] )
if (y2 > (Fp - BigInt(1)) / BigInt(2)) y2 = Fp - y2;
Expand Down