sm-crypto-v2 1.2.0 → 1.2.2

package/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 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.2.2](https://github.com/Cubelrti/sm-crypto-v2/compare/v1.2.1...v1.2.2) (2023-06-07)
+
+
+### Bug Fixes
+
+* **sm2:** add test for prng ([6502a34](https://github.com/Cubelrti/sm-crypto-v2/commit/6502a3440dae2ecfe62603239448076a11c760cf))
+
+### [1.2.1](https://github.com/Cubelrti/sm-crypto-v2/compare/v1.2.0...v1.2.1) (2023-06-07)
+
 ## [1.2.0](https://github.com/Cubelrti/sm-crypto-v2/compare/v1.1.0...v1.2.0) (2023-06-07)
 
 

package/README.md

@@ -1,5 +1,6 @@
 # sm-crypto-v2
 
+[![npm version](https://badge.fury.io/js/sm-crypto-v2.svg)](https://badge.fury.io/js/sm-crypto-v2)
 [![status](https://img.shields.io/github/actions/workflow/status/cubelrti/sm-crypto-v2/test.yml?branch=master)](https://github.com/cubelrti/sm-crypto-v2/actions)
 [![cov](https://cubelrti.github.io/sm-crypto-v2/badges/coverage.svg)](https://github.com/cubelrti/sm-crypto-v2/actions)
 

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 /**
  * 生成密钥对：publicKey = privateKey * G
  */
-declare function generateKeyPairHex(): {
+declare function generateKeyPairHex(str?: string): {
     privateKey: string;
     publicKey: string;
 };

package/dist/index.js

@@ -360,7 +360,7 @@ function sm32(input, options) {
 
 // src/sm2/ec.ts
 var DEFAULT_PRNG_POOL_SIZE = 4096;
-var prngPool = new Uint8Array(DEFAULT_PRNG_POOL_SIZE);
+var prngPool = new Uint8Array(0);
 async function FillPRNGPoolIfNeeded() {
   if ("crypto" in globalThis)
     return;
@@ -405,7 +405,8 @@ function randomBytes(length = 0) {
   if ("crypto" in globalThis) {
     return globalThis.crypto.getRandomValues(array);
   } else {
-    return consumePool(length);
+    const result = consumePool(length);
+    return result;
   }
 }
 function createHash() {
@@ -431,8 +432,8 @@ var sm2Curve = (0, import_weierstrass.weierstrass)({
 
 // src/sm2/utils.ts
 var import_modular2 = require("@noble/curves/abstract/modular");
-function generateKeyPairHex() {
-  const privateKey = sm2Curve.utils.randomPrivateKey();
+function generateKeyPairHex(str) {
+  const privateKey = str ? utils2.numberToBytesBE((0, import_modular2.mod)(BigInt(str), ONE) + ONE, 32) : sm2Curve.utils.randomPrivateKey();
   const publicKey = sm2Curve.getPublicKey(privateKey, false);
   const privPad = leftPad2(utils2.bytesToHex(privateKey), 64);
   const pubPad = leftPad2(utils2.bytesToHex(publicKey), 64);

package/dist/index.mjs

@@ -332,7 +332,7 @@ function sm32(input, options) {
 
 // src/sm2/ec.ts
 var DEFAULT_PRNG_POOL_SIZE = 4096;
-var prngPool = new Uint8Array(DEFAULT_PRNG_POOL_SIZE);
+var prngPool = new Uint8Array(0);
 async function FillPRNGPoolIfNeeded() {
   if ("crypto" in globalThis)
     return;
@@ -377,7 +377,8 @@ function randomBytes(length = 0) {
   if ("crypto" in globalThis) {
     return globalThis.crypto.getRandomValues(array);
   } else {
-    return consumePool(length);
+    const result = consumePool(length);
+    return result;
   }
 }
 function createHash() {
@@ -403,8 +404,8 @@ var sm2Curve = weierstrass({
 
 // src/sm2/utils.ts
 import { mod } from "@noble/curves/abstract/modular";
-function generateKeyPairHex() {
-  const privateKey = sm2Curve.utils.randomPrivateKey();
+function generateKeyPairHex(str) {
+  const privateKey = str ? utils2.numberToBytesBE(mod(BigInt(str), ONE) + ONE, 32) : sm2Curve.utils.randomPrivateKey();
   const publicKey = sm2Curve.getPublicKey(privateKey, false);
   const privPad = leftPad2(utils2.bytesToHex(privateKey), 64);
   const pubPad = leftPad2(utils2.bytesToHex(publicKey), 64);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sm-crypto-v2",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "sm-crypto-v2",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -30,8 +30,7 @@
   "author": "june_01",
   "license": "MIT",
   "dependencies": {
-    "@noble/curves": "^1.1.0",
-    "@types/jsbn": "^1.2.30"
+    "@noble/curves": "^1.1.0"
   },
   "devDependencies": {
     "@swc/core": "^1.3.62",

package/pnpm-lock.yaml

@@ -4,9 +4,6 @@ dependencies:
   '@noble/curves':
     specifier: ^1.1.0
     version: 1.1.0
-  '@types/jsbn':
-    specifier: ^1.2.30
-    version: 1.2.30
 
 devDependencies:
   '@swc/core':
@@ -743,10 +740,6 @@ packages:
     resolution: {integrity: sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==}
     dev: true
 
-  /@types/jsbn@1.2.30:
-    resolution: {integrity: sha512-VZouplBofjq3YOIHLNRBDxILs/nAArdTZ2QP1ooflyhS+yPExWsFE+i2paBIBb7OI3NJShfcde/nogqk4SPB/Q==}
-    dev: false
-
   /@types/json-schema@7.0.12:
     resolution: {integrity: sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==}
     dev: true

package/src/sm2/ec.ts

@@ -20,7 +20,7 @@ declare module wx {
 }
 
 const DEFAULT_PRNG_POOL_SIZE = 4096
-let prngPool = new Uint8Array(DEFAULT_PRNG_POOL_SIZE)
+let prngPool = new Uint8Array(0)
 
 async function FillPRNGPoolIfNeeded() {
   if ('crypto' in globalThis) return // no need to use pooling
@@ -67,7 +67,8 @@ export function randomBytes(length = 0): Uint8Array {
   if ('crypto' in globalThis) {
     return globalThis.crypto.getRandomValues(array);
   } else {
-    return consumePool(length)
+    const result = consumePool(length)
+    return result
   }
 }
 

package/src/sm2/utils.ts

@@ -3,12 +3,13 @@ import * as utils from '@noble/curves/abstract/utils';
 
 import { sm2Curve, sm2Fp } from './ec';
 import { mod } from '@noble/curves/abstract/modular';
-import { TWO, ZERO } from './bn';
+import { ONE, TWO, ZERO } from './bn';
 
 /**
  * 生成密钥对：publicKey = privateKey * G
  */
-export function generateKeyPairHex() {
+export function generateKeyPairHex(str?: string) {
+  const privateKey = str ? utils.numberToBytesBE((mod(BigInt(str), ONE) + ONE), 32) : sm2Curve.utils.randomPrivateKey()
   // const random = typeof a === 'string' ? new BigInteger(a, b) :
   //   a ? new BigInteger(a, b!, c!) : new BigInteger(n.bitLength(), rng)
   // const d = random.mod(n.subtract(BigInteger.ONE)).add(BigInteger.ONE) // 随机数
@@ -18,7 +19,6 @@ export function generateKeyPairHex() {
   // const Px = leftPad(P.getX().toBigInteger().toString(16), 64)
   // const Py = leftPad(P.getY().toBigInteger().toString(16), 64)
   // const publicKey = '04' + Px + Py
-  const privateKey = sm2Curve.utils.randomPrivateKey();
   const publicKey = sm2Curve.getPublicKey(privateKey, false);
   const privPad = leftPad(utils.bytesToHex(privateKey), 64)
   const pubPad = leftPad(utils.bytesToHex(publicKey), 64)