@li0ard/gost 0.1.3 → 0.1.5

package/gost3410/const.d.ts

@@ -45,3 +45,15 @@ export declare const ID_GOSTR3410_2012_512_PARAM_SET_A: Readonly<GostCurveParame
 export declare const ID_GOSTR3410_2012_512_PARAM_SET_B: Readonly<GostCurveParameters>;
 /** GOST R 34.10-2012 512 bit `C` param set */
 export declare const ID_GOSTR3410_2012_512_PARAM_SET_C: Readonly<GostCurveParameters>;
+export declare const CURVES: {
+    ID_GOSTR3410_2001_PARAM_SET_CC: Readonly<GostCurveParameters>;
+    ID_GOSTR3410_2001_TEST_PARAM_SET: Readonly<GostCurveParameters>;
+    ID_GOSTR3410_2012_256_PARAM_SET_A: Readonly<GostCurveParameters>;
+    ID_GOSTR3410_2012_256_PARAM_SET_B: Readonly<GostCurveParameters>;
+    ID_GOSTR3410_2012_256_PARAM_SET_C: Readonly<GostCurveParameters>;
+    ID_GOSTR3410_2012_256_PARAM_SET_D: Readonly<GostCurveParameters>;
+    ID_GOSTR3410_2012_512_TEST_PARAM_SET: Readonly<GostCurveParameters>;
+    ID_GOSTR3410_2012_512_PARAM_SET_A: Readonly<GostCurveParameters>;
+    ID_GOSTR3410_2012_512_PARAM_SET_B: Readonly<GostCurveParameters>;
+    ID_GOSTR3410_2012_512_PARAM_SET_C: Readonly<GostCurveParameters>;
+};

package/gost3410/const.js

@@ -124,3 +124,15 @@ export const ID_GOSTR3410_2012_512_PARAM_SET_C = ({
     st: [0x186c289cffa09c983b168c30c829006c952ff4aaf99c73850875d7e77bebef18d653187d6ba8fe533ec74c6f061872585b97cc0f50f57752cd73f4913304621en, 0x9a628f975594ecefd89ba28a2539ffb79c8ab238aeed0851fa5c1abb02b80b44c6734501b83a011dd625cd0b5145091a6d9acd4b1f5c5b1e21b2b249ddfd1271n],
     oids: ["1.2.643.7.1.2.1.2.3"]
 });
+export const CURVES = {
+    ID_GOSTR3410_2001_PARAM_SET_CC,
+    ID_GOSTR3410_2001_TEST_PARAM_SET,
+    ID_GOSTR3410_2012_256_PARAM_SET_A,
+    ID_GOSTR3410_2012_256_PARAM_SET_B,
+    ID_GOSTR3410_2012_256_PARAM_SET_C,
+    ID_GOSTR3410_2012_256_PARAM_SET_D,
+    ID_GOSTR3410_2012_512_TEST_PARAM_SET,
+    ID_GOSTR3410_2012_512_PARAM_SET_A,
+    ID_GOSTR3410_2012_512_PARAM_SET_B,
+    ID_GOSTR3410_2012_512_PARAM_SET_C
+};

package/gost3410/conversion.d.ts

@@ -1,9 +1,6 @@
 import type { AffinePoint } from "@noble/curves/abstract/curve.js";
 import type { GostCurveParameters } from "./const.js";
-/**
- * Compute parameters (`s`, `t`) for conversion
- * @param curve Curve to use
- */
+/** Compute parameters (`s`, `t`) for conversion */
 export declare const computeST: (curve: GostCurveParameters) => bigint[];
 /**
  * Convert Twisted Edwards point (`u`, `v`) to Weierstrass (`x`, `y`)

package/gost3410/conversion.js

@@ -1,8 +1,5 @@
 import { Field } from "@noble/curves/abstract/modular.js";
-/**
- * Compute parameters (`s`, `t`) for conversion
- * @param curve Curve to use
- */
+/** Compute parameters (`s`, `t`) for conversion */
 export const computeST = (curve) => {
     if (!curve.e || !curve.d)
         throw new Error("No Twisted Edwards parameters");

package/gost3410/index.d.ts

@@ -13,7 +13,7 @@ export declare const getPublicKey: (parameters: GostCurveParameters, prv: TArg<U
  * @param prv Private key
  * @param digest Digest to sign
  * @param rand Optional. Predefined random data for `r` and `k` generation
- * @returns {TRet<Uint8Array>} Concated `r` and `s`
+ * @returns {TRet<Uint8Array>} Concated `r` and `s` (in BE order)
  */
 export declare const sign: (parameters: GostCurveParameters, prv: TArg<Uint8Array>, digest: TArg<Uint8Array>, rand?: TArg<Uint8Array>) => TRet<Uint8Array>;
 /**
@@ -21,9 +21,11 @@ export declare const sign: (parameters: GostCurveParameters, prv: TArg<Uint8Arra
  * @param parameters Curve parameters
  * @param pub Public key
  * @param digest Digest to verify
- * @param signature Signature (Concated `r` and `s`)
+ * @param signature Signature (Concated `r` and `s`) (in BE order)
  */
 export declare const verify: (parameters: GostCurveParameters, pub: TArg<Uint8Array>, digest: TArg<Uint8Array>, signature: TArg<Uint8Array>) => boolean;
+/** Swap `r` and `s` in signature */
+export declare const swapPoint: (curve: GostCurveParameters, point: TArg<Uint8Array>) => TRet<Uint8Array>;
 export * from "./const.js";
 export * from "./vko.js";
 export * from "./conversion.js";

package/gost3410/index.js

@@ -1,5 +1,5 @@
 import { bytesToNumberBE, concatBytes, numberToBytesBE, randomBytes } from "@noble/curves/utils.js";
-import {} from "./const.js";
+import { CURVES } from "./const.js";
 import { mod } from "@noble/curves/abstract/modular.js";
 import { weierstrass } from "@noble/curves/abstract/weierstrass.js";
 /**
@@ -15,16 +15,16 @@ export const getPublicKey = (parameters, prv) => weierstrass(parameters).BASE.mu
  * @param prv Private key
  * @param digest Digest to sign
  * @param rand Optional. Predefined random data for `r` and `k` generation
- * @returns {TRet<Uint8Array>} Concated `r` and `s`
+ * @returns {TRet<Uint8Array>} Concated `r` and `s` (in BE order)
  */
 export const sign = (parameters, prv, digest, rand) => {
     const size = parameters.length;
     const curve = weierstrass(parameters);
     const Fn = curve.Fn;
-    let e = Fn.fromBytes(digest);
+    let e = mod(bytesToNumberBE(digest), Fn.ORDER); //Fn.fromBytes(digest);
     if (e === 0n)
         e = 1n;
-    const prvNum = Fn.fromBytes(prv);
+    const prvNum = mod(bytesToNumberBE(prv), Fn.ORDER); //Fn.fromBytes(prv);
     while (true) {
         rand ||= randomBytes(size);
         const k = mod(bytesToNumberBE(rand), parameters.n);
@@ -52,7 +52,7 @@ export const sign = (parameters, prv, digest, rand) => {
  * @param parameters Curve parameters
  * @param pub Public key
  * @param digest Digest to verify
- * @param signature Signature (Concated `r` and `s`)
+ * @param signature Signature (Concated `r` and `s`) (in BE order)
  */
 export const verify = (parameters, pub, digest, signature) => {
     const size = parameters.length;
@@ -60,11 +60,11 @@ export const verify = (parameters, pub, digest, signature) => {
     const Fn = curve.Fn;
     if (signature.length != size * 2)
         throw new Error("Invalid signature");
-    const r = bytesToNumberBE(signature.slice(0, size));
-    const s = bytesToNumberBE(signature.slice(size));
+    const r = bytesToNumberBE(signature.subarray(0, size));
+    const s = bytesToNumberBE(signature.subarray(size));
     if (r <= 0 || r >= parameters.n || s <= 0 || s >= parameters.n)
         return false;
-    let e = Fn.fromBytes(digest);
+    let e = mod(bytesToNumberBE(digest), Fn.ORDER); //Fn.fromBytes(digest);
     if (e === 0n)
         e = 1n;
     const v = Fn.inv(e);
@@ -79,6 +79,8 @@ export const verify = (parameters, pub, digest, signature) => {
     }
     return Fn.create(P.add(Q).x) === r;
 };
+/** Swap `r` and `s` in signature */
+export const swapPoint = (curve, point) => concatBytes(point.subarray(curve.length), point.subarray(0, curve.length));
 export * from "./const.js";
 export * from "./vko.js";
 export * from "./conversion.js";

package/gost3410/vko.d.ts

@@ -5,8 +5,8 @@ import { type TArg, type TRet } from "@noble/curves/utils.js";
  * @param parameters Curve parameters
  * @param prv Private key
  * @param pub Public key
- * @param ukm User keying material (aka salt)
- * @returns {TRet<Uint8Array>} Shared key
+ * @param ukm User keying material (aka salt, VKO-factor)
+ * @returns {TRet<Uint8Array>} Shared key (Not hashed)
  */
 export declare const kek: (parameters: GostCurveParameters, prv: TArg<Uint8Array>, pub: TArg<Uint8Array>, ukm: TArg<Uint8Array>) => TRet<Uint8Array>;
 /**
@@ -14,7 +14,7 @@ export declare const kek: (parameters: GostCurveParameters, prv: TArg<Uint8Array
  * @param parameters Curve parameters
  * @param prv Private key
  * @param pub Public key
- * @param ukm User keying material (aka salt)
+ * @param ukm User keying material (aka salt, VKO-factor)
  * @returns {TRet<Uint8Array>} Shared key
  */
 export declare const kek_34102001: (parameters: GostCurveParameters, prv: TArg<Uint8Array>, pub: TArg<Uint8Array>, ukm: TArg<Uint8Array>) => TRet<Uint8Array>;
@@ -23,7 +23,7 @@ export declare const kek_34102001: (parameters: GostCurveParameters, prv: TArg<U
  * @param parameters Curve parameters
  * @param prv Private key
  * @param pub Public key
- * @param ukm User keying material (aka salt)
+ * @param ukm User keying material (aka salt, VKO-factor)
  * @returns {TRet<Uint8Array>} Shared key
  */
 export declare const kek_34102012256: (parameters: GostCurveParameters, prv: TArg<Uint8Array>, pub: TArg<Uint8Array>, ukm: TArg<Uint8Array>) => TRet<Uint8Array>;
@@ -32,7 +32,7 @@ export declare const kek_34102012256: (parameters: GostCurveParameters, prv: TAr
  * @param parameters Curve parameters
  * @param prv Private key
  * @param pub Public key
- * @param ukm User keying material (aka salt)
+ * @param ukm User keying material (aka salt, VKO-factor)
  * @returns {TRet<Uint8Array>} Shared key
  */
 export declare const kek_34102012512: (parameters: GostCurveParameters, prv: TArg<Uint8Array>, pub: TArg<Uint8Array>, ukm: TArg<Uint8Array>) => TRet<Uint8Array>;

package/gost3410/vko.js

@@ -8,8 +8,8 @@ import { bytesToNumberBE, concatBytes, numberToBytesLE } from "@noble/curves/uti
  * @param parameters Curve parameters
  * @param prv Private key
  * @param pub Public key
- * @param ukm User keying material (aka salt)
- * @returns {TRet<Uint8Array>} Shared key
+ * @param ukm User keying material (aka salt, VKO-factor)
+ * @returns {TRet<Uint8Array>} Shared key (Not hashed)
  */
 export const kek = (parameters, prv, pub, ukm) => {
     const Fn = Field(parameters.n);
@@ -23,7 +23,7 @@ export const kek = (parameters, prv, pub, ukm) => {
  * @param parameters Curve parameters
  * @param prv Private key
  * @param pub Public key
- * @param ukm User keying material (aka salt)
+ * @param ukm User keying material (aka salt, VKO-factor)
  * @returns {TRet<Uint8Array>} Shared key
  */
 export const kek_34102001 = (parameters, prv, pub, ukm) => gost341194(kek(parameters, prv, pub, ukm));
@@ -32,7 +32,7 @@ export const kek_34102001 = (parameters, prv, pub, ukm) => gost341194(kek(parame
  * @param parameters Curve parameters
  * @param prv Private key
  * @param pub Public key
- * @param ukm User keying material (aka salt)
+ * @param ukm User keying material (aka salt, VKO-factor)
  * @returns {TRet<Uint8Array>} Shared key
  */
 export const kek_34102012256 = (parameters, prv, pub, ukm) => streebog256(kek(parameters, prv, pub, ukm));
@@ -41,7 +41,7 @@ export const kek_34102012256 = (parameters, prv, pub, ukm) => streebog256(kek(pa
  * @param parameters Curve parameters
  * @param prv Private key
  * @param pub Public key
- * @param ukm User keying material (aka salt)
+ * @param ukm User keying material (aka salt, VKO-factor)
  * @returns {TRet<Uint8Array>} Shared key
  */
 export const kek_34102012512 = (parameters, prv, pub, ukm) => streebog512(kek(parameters, prv, pub, ukm));

package/index.d.ts

@@ -3,6 +3,7 @@ export * from "./gost341194/index.js";
 export * from "./kuznyechik/index.js";
 export * from "./magma/index.js";
 export * from "./modes/index.js";
+export * from "./oids/index.js";
 export * from "./streebog/index.js";
 export * from "./hmac.js";
 export * from "./kdf.js";

package/index.js

@@ -3,6 +3,7 @@ export * from "./gost341194/index.js";
 export * from "./kuznyechik/index.js";
 export * from "./magma/index.js";
 export * from "./modes/index.js";
+export * from "./oids/index.js";
 export * from "./streebog/index.js";
 export * from "./hmac.js";
 export * from "./kdf.js";

package/modes/_keytransform.js

@@ -3,22 +3,19 @@ import { Magma } from "../magma/index.js";
 import { ID_GOST_28147_89_CRYPTO_PRO_A_PARAM_SET } from "../magma/const.js";
 import { cfb } from "./cfb.js";
 import { ctr } from "./ctr.js";
-import { hexToBytes } from "@noble/hashes/utils.js";
-import { ecb } from "./ecb.js";
 export const cp_kek_diversify = (kek, ukm, sbox = ID_GOST_28147_89_CRYPTO_PRO_A_PARAM_SET) => {
     let out = copyBytes(kek);
     for (let i = 0; i < 8; i++) {
         let s1 = 0, s2 = 0;
         for (let j = 0; j < 8; j++) {
-            const k = Number(bytesToNumberLE(out.subarray(j * 4, j * 4 + 4))); //((out[j * 4]) | (out[j * 4 + 1] << 8) | (out[j * 4 + 2] << 16) | (out[j * 4 + 3] << 24)) >>> 0;
+            const k = Number(bytesToNumberLE(out.subarray(j * 4, j * 4 + 4)));
             if ((ukm[i] >> j) & 1)
                 s1 += k;
             else
                 s2 += k;
         }
         const iv = concatBytes(numberToBytesLE(s1 >>> 0, 4), numberToBytesLE(s2 >>> 0, 4));
-        const cipher = new Magma(out, sbox, true);
-        out = cfb(cipher, iv).encrypt(out);
+        out = cfb(new Magma(out, sbox, true), iv).encrypt(out);
     }
     return out;
 };

package/oids/index.d.ts

@@ -0,0 +1,6 @@
+import { type GostCurveParameters } from "../gost3410/const.js";
+import type { HashFunctionWrapper } from "../types.js";
+/** Get curve parameters by OID */
+export declare const getCurveByOid: (oid: string) => GostCurveParameters | undefined;
+/** Get hash function by OID */
+export declare const getHashByOid: (oid: string) => HashFunctionWrapper | undefined;

package/oids/index.js

@@ -0,0 +1,16 @@
+import { CURVES } from "../gost3410/const.js";
+import { gost341194 } from "../gost341194/index.js";
+import { streebog256, streebog512 } from "../streebog/index.js";
+const HASHES_OID = {
+    "1.2.643.7.1.1.2.1": gost341194,
+    "1.2.643.7.1.1.2.2": streebog256,
+    "1.2.643.7.1.1.2.3": streebog512
+};
+/** Get curve parameters by OID */
+export const getCurveByOid = (oid) => {
+    for (const [_, params] of Object.entries(CURVES))
+        if (params.oids?.includes(oid))
+            return params;
+};
+/** Get hash function by OID */
+export const getHashByOid = (oid) => HASHES_OID[oid];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@li0ard/gost",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "main": "index.js",
   "types": "index.d.ts",
   "type": "module",
@@ -9,8 +9,9 @@
     "./gost3410.js": "./gost3410/index.js",
     "./gost341194.js": "./gost341194/index.js",
     "./kuznyechik.js": "./kuznyechik/index.js",
-    "./magma.js": "./kuznyechik/magma.js",
+    "./magma.js": "./magma/index.js",
     "./modes.js": "./modes/index.js",
+    "./oids.js": "./oids/index.js",
     "./streebog.js": "./streebog/index.js",
     "./hmac.js": "./hmac.js",
     "./kdf.js": "./kdf.js",
@@ -33,6 +34,8 @@
     "docs": "typedoc --options .config/typedoc/config.cjs"
   },
   "devDependencies": {
+    "@peculiar/asn1-schema": "^2.7.0",
+    "@peculiar/asn1-x509": "^2.7.0",
     "@types/bun": "latest",
     "typedoc": "^0.28.19"
   },

package/types.d.ts

@@ -1,4 +1,5 @@
 import type { TArg, TRet } from "@noble/hashes/utils.js";
+export type HashFunctionWrapper = (msg: TArg<Uint8Array>) => TRet<Uint8Array>;
 /** Cipher core */
 export type Cipher = {
     /** Block size */