sm-crypto-v2 1.6.0 → 1.7.0

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [1.7.0](https://github.com/Cubelrti/sm-crypto-v2/compare/v1.6.0...v1.7.0) (2023-07-17)
+
+
+### Features
+
+* **sm2:** support precompute sm2 point ([ae347bf](https://github.com/Cubelrti/sm-crypto-v2/commit/ae347bfff6c306318276a31f5958290ac7f07b9c))
+
 ## [1.6.0](https://github.com/Cubelrti/sm-crypto-v2/compare/v1.5.1...v1.6.0) (2023-07-11)
 
 

package/README.md

@@ -127,6 +127,21 @@ import { sm2 } from 'sm-crypto-v2'
 let point = sm2.getPoint() // 获取一个椭圆曲线点，可在sm2签名时传入
 ```
 
+### 预计算公钥
+
+```js
+import { sm2 } from 'sm-crypto-v2'
+let keypair = sm2.generateKeyPairHex()
+
+const precomputedPublicKey = sm2.precomputePublicKey(keypair.publicKey)
+// 加密和验签可以传入预计算后的点
+let encryptData = sm2.doEncrypt(msgString, precomputedPublicKey, cipherMode) // 加密结果
+let verifyResult4 = sm2.doVerifySignature(msg, sigValueHex4, precomputedPublicKey, {
+    hash: true,
+}) // 验签结果
+
+```
+
 ## sm3
 
 ```js

package/dist/index.d.ts

@@ -1,3 +1,5 @@
+import { ProjPointType } from '@noble/curves/abstract/weierstrass';
+
 interface KeyPair {
     privateKey: string;
     publicKey: string;
@@ -47,7 +49,7 @@ declare const EmptyArray: Uint8Array;
 /**
  * 加密
  */
-declare function doEncrypt(msg: string | Uint8Array, publicKey: string, cipherMode?: number): string;
+declare function doEncrypt(msg: string | Uint8Array, publicKey: string | ProjPointType<bigint>, cipherMode?: number): string;
 /**
  * 解密
  */
@@ -74,7 +76,7 @@ declare function doSignature(msg: Uint8Array | string, privateKey: string, optio
 /**
  * 验签
  */
-declare function doVerifySignature(msg: string | Uint8Array, signHex: string, publicKey: string, options?: {
+declare function doVerifySignature(msg: string | Uint8Array, signHex: string, publicKey: string | ProjPointType<bigint>, options?: {
     der?: boolean;
     hash?: boolean;
     userId?: string;
@@ -84,6 +86,14 @@ declare function getZ(publicKey: string, userId?: string): Uint8Array;
  * sm3杂凑算法
  */
 declare function getHash(hashHex: string | Uint8Array, publicKey: string, userId?: string): string;
+/**
+ * 预计算公钥点，可用于提升加密性能
+ * @export
+ * @param {string} publicKey 公钥
+ * @param windowSize 计算窗口大小，默认为 8
+ * @returns {ProjPointType<bigint>} 预计算的点
+ */
+declare function precomputePublicKey(publicKey: string, windowSize?: number): ProjPointType<bigint>;
 /**
  * 计算公钥
  */
@@ -106,6 +116,7 @@ declare const index$1_doSignature: typeof doSignature;
 declare const index$1_doVerifySignature: typeof doVerifySignature;
 declare const index$1_getZ: typeof getZ;
 declare const index$1_getHash: typeof getHash;
+declare const index$1_precomputePublicKey: typeof precomputePublicKey;
 declare const index$1_getPublicKeyFromPrivateKey: typeof getPublicKeyFromPrivateKey;
 declare const index$1_getPoint: typeof getPoint;
 declare const index$1_initRNGPool: typeof initRNGPool;
@@ -130,6 +141,7 @@ declare namespace index$1 {
     index$1_doVerifySignature as doVerifySignature,
     index$1_getZ as getZ,
     index$1_getHash as getHash,
+    index$1_precomputePublicKey as precomputePublicKey,
     index$1_getPublicKeyFromPrivateKey as getPublicKeyFromPrivateKey,
     index$1_getPoint as getPoint,
     index$1_initRNGPool as initRNGPool,

package/dist/index.js

@@ -53,6 +53,7 @@ __export(sm2_exports, {
   hexToArray: () => hexToArray,
   initRNGPool: () => initRNGPool,
   leftPad: () => leftPad,
+  precomputePublicKey: () => precomputePublicKey,
   utf8ToHex: () => utf8ToHex,
   verifyPublicKey: () => verifyPublicKey
 });
@@ -640,9 +641,12 @@ function verifyPublicKey(publicKey) {
   const point = sm2Curve.ProjectivePoint.fromHex(publicKey);
   if (!point)
     return false;
-  const x2 = point.x;
-  const y = point.y;
-  return sm2Fp.sqr(y) === sm2Fp.add(sm2Fp.addN(sm2Fp.mulN(x2, sm2Fp.sqrN(x2)), sm2Fp.mulN(x2, sm2Curve.CURVE.a)), sm2Curve.CURVE.b);
+  try {
+    point.assertValidity();
+    return true;
+  } catch (error) {
+    return false;
+  }
 }
 function comparePublicKeyHex(publicKey1, publicKey2) {
   const point1 = sm2Curve.ProjectivePoint.fromHex(publicKey1);
@@ -712,7 +716,7 @@ var C1C2C3 = 0;
 var EmptyArray = new Uint8Array();
 function doEncrypt(msg, publicKey, cipherMode = 1) {
   const msgArr = typeof msg === "string" ? hexToArray(utf8ToHex(msg)) : Uint8Array.from(msg);
-  const publicKeyPoint = sm2Curve.ProjectivePoint.fromHex(publicKey);
+  const publicKeyPoint = typeof publicKey === "string" ? sm2Curve.ProjectivePoint.fromHex(publicKey) : publicKey;
   const keypair = generateKeyPairHex();
   const k = utils4.hexToNumber(keypair.privateKey);
   let c1 = keypair.publicKey;
@@ -812,8 +816,9 @@ function doVerifySignature(msg, signHex, publicKey, options = {}) {
     der,
     userId
   } = options;
+  const publicKeyHex = typeof publicKey === "string" ? publicKey : publicKey.toHex(false);
   if (hash) {
-    hashHex = getHash(typeof msg === "string" ? utf8ToHex(msg) : msg, publicKey, userId);
+    hashHex = getHash(typeof msg === "string" ? utf8ToHex(msg) : msg, publicKeyHex, userId);
   } else {
     hashHex = typeof msg === "string" ? utf8ToHex(msg) : arrayToHex(Array.from(msg));
   }
@@ -827,7 +832,7 @@ function doVerifySignature(msg, signHex, publicKey, options = {}) {
     r = utils4.hexToNumber(signHex.substring(0, 64));
     s = utils4.hexToNumber(signHex.substring(64));
   }
-  const PA = sm2Curve.ProjectivePoint.fromHex(publicKey);
+  const PA = typeof publicKey === "string" ? sm2Curve.ProjectivePoint.fromHex(publicKey) : publicKey;
   const e = utils4.hexToNumber(hashHex);
   const t = field.add(r, s);
   if (t === ZERO)
@@ -861,6 +866,10 @@ function getHash(hashHex, publicKey, userId = "1234567812345678") {
   const z = getZ(publicKey, userId);
   return bytesToHex(sm3(utils4.concatBytes(z, typeof hashHex === "string" ? hexToArray(hashHex) : hashHex)));
 }
+function precomputePublicKey(publicKey, windowSize) {
+  const point = sm2Curve.ProjectivePoint.fromHex(publicKey);
+  return sm2Curve.utils.precompute(windowSize, point);
+}
 function getPublicKeyFromPrivateKey(privateKey) {
   const pubKey = sm2Curve.getPublicKey(privateKey, false);
   const pubPad = leftPad(utils4.bytesToHex(pubKey), 64);

package/dist/index.mjs

@@ -25,6 +25,7 @@ __export(sm2_exports, {
   hexToArray: () => hexToArray,
   initRNGPool: () => initRNGPool,
   leftPad: () => leftPad,
+  precomputePublicKey: () => precomputePublicKey,
   utf8ToHex: () => utf8ToHex,
   verifyPublicKey: () => verifyPublicKey
 });
@@ -612,9 +613,12 @@ function verifyPublicKey(publicKey) {
   const point = sm2Curve.ProjectivePoint.fromHex(publicKey);
   if (!point)
     return false;
-  const x2 = point.x;
-  const y = point.y;
-  return sm2Fp.sqr(y) === sm2Fp.add(sm2Fp.addN(sm2Fp.mulN(x2, sm2Fp.sqrN(x2)), sm2Fp.mulN(x2, sm2Curve.CURVE.a)), sm2Curve.CURVE.b);
+  try {
+    point.assertValidity();
+    return true;
+  } catch (error) {
+    return false;
+  }
 }
 function comparePublicKeyHex(publicKey1, publicKey2) {
   const point1 = sm2Curve.ProjectivePoint.fromHex(publicKey1);
@@ -684,7 +688,7 @@ var C1C2C3 = 0;
 var EmptyArray = new Uint8Array();
 function doEncrypt(msg, publicKey, cipherMode = 1) {
   const msgArr = typeof msg === "string" ? hexToArray(utf8ToHex(msg)) : Uint8Array.from(msg);
-  const publicKeyPoint = sm2Curve.ProjectivePoint.fromHex(publicKey);
+  const publicKeyPoint = typeof publicKey === "string" ? sm2Curve.ProjectivePoint.fromHex(publicKey) : publicKey;
   const keypair = generateKeyPairHex();
   const k = utils4.hexToNumber(keypair.privateKey);
   let c1 = keypair.publicKey;
@@ -784,8 +788,9 @@ function doVerifySignature(msg, signHex, publicKey, options = {}) {
     der,
     userId
   } = options;
+  const publicKeyHex = typeof publicKey === "string" ? publicKey : publicKey.toHex(false);
   if (hash) {
-    hashHex = getHash(typeof msg === "string" ? utf8ToHex(msg) : msg, publicKey, userId);
+    hashHex = getHash(typeof msg === "string" ? utf8ToHex(msg) : msg, publicKeyHex, userId);
   } else {
     hashHex = typeof msg === "string" ? utf8ToHex(msg) : arrayToHex(Array.from(msg));
   }
@@ -799,7 +804,7 @@ function doVerifySignature(msg, signHex, publicKey, options = {}) {
     r = utils4.hexToNumber(signHex.substring(0, 64));
     s = utils4.hexToNumber(signHex.substring(64));
   }
-  const PA = sm2Curve.ProjectivePoint.fromHex(publicKey);
+  const PA = typeof publicKey === "string" ? sm2Curve.ProjectivePoint.fromHex(publicKey) : publicKey;
   const e = utils4.hexToNumber(hashHex);
   const t = field.add(r, s);
   if (t === ZERO)
@@ -833,6 +838,10 @@ function getHash(hashHex, publicKey, userId = "1234567812345678") {
   const z = getZ(publicKey, userId);
   return bytesToHex(sm3(utils4.concatBytes(z, typeof hashHex === "string" ? hexToArray(hashHex) : hashHex)));
 }
+function precomputePublicKey(publicKey, windowSize) {
+  const point = sm2Curve.ProjectivePoint.fromHex(publicKey);
+  return sm2Curve.utils.precompute(windowSize, point);
+}
 function getPublicKeyFromPrivateKey(privateKey) {
   const pubKey = sm2Curve.getPublicKey(privateKey, false);
   const pubPad = leftPad(utils4.bytesToHex(pubKey), 64);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sm-crypto-v2",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "description": "sm-crypto-v2",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -33,6 +33,7 @@
     "@noble/curves": "^1.1.0"
   },
   "devDependencies": {
+    "@swc-node/register": "^1.6.6",
     "@swc/core": "^1.3.62",
     "@types/node": "^16",
     "@typescript-eslint/eslint-plugin": "^5.23.0",
@@ -40,6 +41,7 @@
     "@vitest/coverage-c8": "^0.31.0",
     "@vitest/coverage-istanbul": "^0.31.0",
     "@vitest/expect": "^0.31.4",
+    "@vitest/runner": "^0.33.0",
     "@vitest/ui": "^0.31.0",
     "conventional-changelog-cli": "^2.2.2",
     "eslint": "^8.15.0",

package/src/sm2/index.ts

@@ -6,6 +6,7 @@ import * as utils from '@noble/curves/abstract/utils';
 import { field, sm2Curve } from './ec';
 import { ONE, ZERO } from './bn';
 import { bytesToHex } from '@/sm3/utils';
+import { ProjPointType } from '@noble/curves/abstract/weierstrass';
 
 export * from './utils'
 export { initRNGPool } from './rng'
@@ -17,10 +18,11 @@ export const EmptyArray = new Uint8Array()
 /**
  * 加密
  */
-export function doEncrypt(msg: string | Uint8Array, publicKey: string, cipherMode = 1) {
+export function doEncrypt(msg: string | Uint8Array, publicKey: string | ProjPointType<bigint>, cipherMode = 1) {
 
   const msgArr = typeof msg === 'string' ? hexToArray(utf8ToHex(msg)) : Uint8Array.from(msg)
-  const publicKeyPoint = sm2Curve.ProjectivePoint.fromHex(publicKey)
+  const publicKeyPoint = typeof publicKey === 'string' ? sm2Curve.ProjectivePoint.fromHex(publicKey) :
+    publicKey
 
   const keypair = generateKeyPairHex()
   const k = utils.hexToNumber(keypair.privateKey)
@@ -28,7 +30,7 @@ export function doEncrypt(msg: string | Uint8Array, publicKey: string, cipherMod
   // c1 = k * G
   let c1 = keypair.publicKey
   if (c1.length > 128) c1 = c1.substring(c1.length - 128)
-  const p = publicKeyPoint!.multiply(k)
+  const p = publicKeyPoint.multiply(k)
   
   // (x2, y2) = k * publicKey
   const x2 = hexToArray(leftPad(utils.numberToHexUnpadded(p.x), 64))
@@ -165,16 +167,17 @@ export function doSignature(msg: Uint8Array | string, privateKey: string, option
 /**
  * 验签
  */
-export function doVerifySignature(msg: string | Uint8Array, signHex: string, publicKey: string, options: { der?: boolean, hash?: boolean, userId?: string } = {}) {
+export function doVerifySignature(msg: string | Uint8Array, signHex: string, publicKey: string | ProjPointType<bigint>, options: { der?: boolean, hash?: boolean, userId?: string } = {}) {
   let hashHex: string
   const {
     hash,
     der,
     userId,
   } = options
+  const publicKeyHex = typeof publicKey === 'string' ? publicKey : publicKey.toHex(false)
   if (hash) {
     // sm3杂凑
-    hashHex = getHash(typeof msg === 'string' ? utf8ToHex(msg) : msg, publicKey, userId)
+    hashHex = getHash(typeof msg === 'string' ? utf8ToHex(msg) : msg, publicKeyHex, userId)
   } else {
     hashHex = typeof msg === 'string' ? utf8ToHex(msg) : arrayToHex(Array.from(msg))
   }
@@ -190,7 +193,7 @@ export function doVerifySignature(msg: string | Uint8Array, signHex: string, pub
     s = utils.hexToNumber(signHex.substring(64))
   }
   
-  const PA = sm2Curve.ProjectivePoint.fromHex(publicKey)!
+  const PA = typeof publicKey === 'string' ? sm2Curve.ProjectivePoint.fromHex(publicKey) : publicKey
   const e = utils.hexToNumber(hashHex)
   
   // t = (r + s) mod n
@@ -250,6 +253,18 @@ export function getHash(hashHex: string | Uint8Array, publicKey: string, userId
   return bytesToHex(sm3(utils.concatBytes(z, typeof hashHex === 'string' ? hexToArray(hashHex) : hashHex)))
 }
 
+/**
+ * 预计算公钥点，可用于提升加密性能
+ * @export
+ * @param {string} publicKey 公钥
+ * @param windowSize 计算窗口大小，默认为 8
+ * @returns {ProjPointType<bigint>} 预计算的点
+ */
+export function precomputePublicKey(publicKey: string, windowSize?: number) {
+  const point = sm2Curve.ProjectivePoint.fromHex(publicKey)
+  return sm2Curve.utils.precompute(windowSize, point)
+}
+
 /**
  * 计算公钥
  */

package/src/sm2/utils.ts

@@ -142,11 +142,12 @@ export function hexToArray(hexStr: string) {
 export function verifyPublicKey(publicKey: string) {
   const point = sm2Curve.ProjectivePoint.fromHex(publicKey)
   if (!point) return false
-
-  const x = point.x
-  const y = point.y
-  // 验证 y^2 是否等于 x^3 + ax + b
-  return sm2Fp.sqr(y) === sm2Fp.add(sm2Fp.addN(sm2Fp.mulN(x, sm2Fp.sqrN(x)), sm2Fp.mulN(x, sm2Curve.CURVE.a)), sm2Curve.CURVE.b)
+  try {
+    point.assertValidity()
+    return true
+  } catch (error) {
+    return false
+  }
 }
 
 /**

package/src/sm3/index.ts

@@ -1,6 +1,6 @@
 import { hmac } from '@/sm2/hmac'
 import { sm3 as sm2sm3 } from '../sm2/sm3'
-import { arrayToHex, hexToArray, leftPad } from '../sm2/utils'
+import { hexToArray } from '../sm2/utils'
 import { bytesToHex } from './utils'
 
 /**