@noble/curves 1.9.4 → 1.9.6

package/src/abstract/modular.ts

@@ -384,7 +384,7 @@ type FieldOpts = Partial<{
   sqrt: SqrtFn;
   isLE: boolean;
   BITS: number;
-  modOnDecode: boolean; // bls12-381 requires mod(n) instead of rejecting keys >= n
+  modFromBytes: boolean; // bls12-381 requires mod(n) instead of rejecting keys >= n
   allowedLengths?: readonly number[]; // for P521 (adds padding for smaller sizes)
 }>;
 /**
@@ -415,7 +415,7 @@ export function Field(
   if (ORDER <= _0n) throw new Error('invalid field: expected ORDER > 0, got ' + ORDER);
   let _nbitLength: number | undefined = undefined;
   let _sqrt: SqrtFn | undefined = undefined;
-  let modOnDecode: boolean = false;
+  let modFromBytes: boolean = false;
   let allowedLengths: undefined | readonly number[] = undefined;
   if (typeof bitLenOrOpts === 'object' && bitLenOrOpts != null) {
     if (opts.sqrt || isLE) throw new Error('cannot specify opts in two arguments');
@@ -423,7 +423,7 @@ export function Field(
     if (_opts.BITS) _nbitLength = _opts.BITS;
     if (_opts.sqrt) _sqrt = _opts.sqrt;
     if (typeof _opts.isLE === 'boolean') isLE = _opts.isLE;
-    if (typeof _opts.modOnDecode === 'boolean') modOnDecode = _opts.modOnDecode;
+    if (typeof _opts.modFromBytes === 'boolean') modFromBytes = _opts.modFromBytes;
     allowedLengths = _opts.allowedLengths;
   } else {
     if (typeof bitLenOrOpts === 'number') _nbitLength = bitLenOrOpts;
@@ -490,7 +490,7 @@ export function Field(
       if (bytes.length !== BYTES)
         throw new Error('Field.fromBytes: expected ' + BYTES + ' bytes, got ' + bytes.length);
       let scalar = isLE ? bytesToNumberLE(bytes) : bytesToNumberBE(bytes);
-      if (modOnDecode) scalar = mod(scalar, ORDER);
+      if (modFromBytes) scalar = mod(scalar, ORDER);
       if (!skipValidation)
         if (!f.isValid(scalar)) throw new Error('invalid field element: outside of range 0..ORDER');
       // NOTE: we don't validate scalar here, please use isValid. This done such way because some

package/src/abstract/montgomery.ts

@@ -7,13 +7,14 @@
 /*! noble-curves - MIT License (c) 2022 Paul Miller (paulmillr.com) */
 import {
   _validateObject,
+  abytes,
   aInRange,
   bytesToNumberLE,
   ensureBytes,
   numberToBytesLE,
   randomBytes,
 } from '../utils.ts';
-import type { CurveInfo } from './curve.ts';
+import type { CurveLengths } from './curve.ts';
 import { mod } from './modular.ts';
 
 const _0n = BigInt(0);
@@ -40,11 +41,7 @@ export type MontgomeryECDH = {
     randomPrivateKey: () => Uint8Array;
   };
   GuBytes: Uint8Array;
-  info: {
-    type: 'montgomery';
-    lengths: Omit<CurveInfo['lengths'], 'signature'>;
-    publicKeyHasPrefix?: boolean;
-  };
+  lengths: CurveLengths;
   keygen: (seed?: Uint8Array) => { secretKey: Uint8Array; publicKey: Uint8Array };
 };
 export type CurveFn = MontgomeryECDH;
@@ -167,19 +164,22 @@ export function montgomery(curveDef: CurveType): MontgomeryECDH {
     const z2 = powPminus2(z_2); // `Fp.pow(x, P - _2n)` is much slower equivalent
     return modP(x_2 * z2); // Return x_2 * (z_2^(p - 2))
   }
-  const randomSecretKey = (seed = randomBytes_(fieldLen)) => seed;
-  const utils = {
-    randomSecretKey,
-    randomPrivateKey: randomSecretKey,
+  const lengths = {
+    secretKey: fieldLen,
+    publicKey: fieldLen,
+    seed: fieldLen,
+  };
+  const randomSecretKey = (seed = randomBytes_(fieldLen)) => {
+    abytes(seed, lengths.seed);
+    return seed;
   };
   function keygen(seed?: Uint8Array) {
-    const secretKey = utils.randomSecretKey(seed);
+    const secretKey = randomSecretKey(seed);
     return { secretKey, publicKey: scalarMultBase(secretKey) };
   }
-  const lengths = {
-    secret: fieldLen,
-    public: fieldLen,
-    seed: fieldLen,
+  const utils = {
+    randomSecretKey,
+    randomPrivateKey: randomSecretKey,
   };
   return {
     keygen,
@@ -189,6 +189,6 @@ export function montgomery(curveDef: CurveType): MontgomeryECDH {
     scalarMultBase,
     utils,
     GuBytes: GuBytes.slice(),
-    info: { type: 'montgomery' as const, lengths },
+    lengths,
   };
 }