From 87b94ee6d812716e127f983ab30c9d08099315f7 Mon Sep 17 00:00:00 2001 From: Chris Duncan Date: Fri, 21 Aug 2026 10:42:59 -0700 Subject: [PATCH] Naming convention. --- src/assembly/constants.ts | 2 +- src/assembly/ge.ts | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/assembly/constants.ts b/src/assembly/constants.ts index 3b41cd9..6f18584 100644 --- a/src/assembly/constants.ts +++ b/src/assembly/constants.ts @@ -2,7 +2,7 @@ //! SPDX-License-Identifier: ISC /* sqrt(-1) */ -export const fe25519_sqrtm1 = StaticArray.fromArray([ +export const fe_sqrtm1 = StaticArray.fromArray([ -32595792, -7943725, 9377950, 3500415, 12389472, -272473, -25146209, -2005654, 326686, 11406482 ]) diff --git a/src/assembly/ge.ts b/src/assembly/ge.ts index 7e04541..5b22656 100644 --- a/src/assembly/ge.ts +++ b/src/assembly/ge.ts @@ -18,7 +18,7 @@ */ import { base } from './base' import { base2 } from './base2' -import { ed25519_d, fe25519_sqrtm1 } from './constants' +import { ed25519_d, fe_sqrtm1 } from './constants' import { FieldElement, fe, fe_1, fe_add, fe_cmov, fe_copy, fe_frombytes, fe_isnegative, fe_iszero, fe_mul, fe_neg, fe_pow22523, fe_sq, fe_sub } from './fe' import { ge_add_cached, ge_add_precomp, ge_cached, ge_p1p1, ge_p1p1_to_p2, ge_p1p1_to_p3, ge_p2, ge_p2_0, ge_p2_dbl, ge_p2_to_p3, ge_p3, ge_p3_0, ge_p3_dbl, ge_p3_to_cached, ge_p3_tobytes, ge_precomp, ge_precomp_0, ge_sub_cached, ge_sub_precomp } from './p' import { equal, negative } from './utils' @@ -31,11 +31,11 @@ function ge_cmov (t: ge_precomp, u: ge_precomp, b: u8): void { fe_cmov(t.xy2d, u.xy2d, b) } -const ge25519_cmov8_minust: ge_precomp = new ge_precomp() +const ge_cmov8_minust: ge_precomp = new ge_precomp() //@ts-expect-error @inline function ge_cmov8_base (t: ge_precomp, pos: i32, b: i8): void { - const minust = ge25519_cmov8_minust + const minust = ge_cmov8_minust const bnegative: u8 = negative(b) const babs: u8 = b - (((-bnegative) & b) * (i8(1) << 1)) const precomp = base(pos) @@ -88,7 +88,7 @@ export function ge_frombytes_negate_vartime (h: ge_p3, s: StaticArray): i32 if (fe_iszero(p_root_check) == 0) { return -1 } - fe_mul(h.X, h.X, fe25519_sqrtm1) + fe_mul(h.X, h.X, fe_sqrtm1) } if (fe_isnegative(h.X) == (load(changetype(s), 31) >> 7)) { /* vartime function - compiler optimization is fine */ @@ -134,7 +134,7 @@ export function ge_frombytes (h: ge_p3, s: StaticArray): i32 { fe_add(p_root_check, vxx, u) /* vx^2+u */ has_m_root = fe_iszero(m_root_check) has_p_root = fe_iszero(p_root_check) - fe_mul(x_sqrtm1, h.X, fe25519_sqrtm1) /* x*sqrt(-1) */ + fe_mul(x_sqrtm1, h.X, fe_sqrtm1) /* x*sqrt(-1) */ fe_cmov(h.X, x_sqrtm1, 1 - has_m_root) fe_neg(negx, h.X) @@ -155,7 +155,7 @@ export function ge_has_small_order (p: ge_p3): i32 { ret |= fe_iszero(p.X) ret |= fe_iszero(p.Y) ret |= fe_iszero(p.Z) - fe_mul(y_sqrtm1, p.Y, fe25519_sqrtm1) + fe_mul(y_sqrtm1, p.Y, fe_sqrtm1) fe_sub(c, y_sqrtm1, p.X) ret |= fe_iszero(c) fe_add(c, y_sqrtm1, p.X) -- 2.52.0