@ocap/mcrypto 1.28.9 → 1.29.0

package/README.md

@@ -1,6 +1,5 @@
 ![mcrypto:js](https://www.arcblock.io/.netlify/functions/badge/?text=mcrypto:js)
 
-[![styled with prettier](https://img.shields.io/badge/styled_with-prettier-ff69b4.svg)](https://github.com/prettier/prettier)
 [![docs](https://img.shields.io/badge/powered%20by-arcblock-green.svg)](https://docs.arcblock.io)
 [![Gitter](https://badges.gitter.im/ArcBlock/community.svg)](https://gitter.im/ArcBlock/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 

package/esm/crypter/aes.mjs

@@ -7,18 +7,20 @@ import crypto from "node:crypto";
 //#region src/crypter/aes.ts
 var AesCrypter = class extends crypter_default {
 	encrypt(message, secret, encoding = "hex") {
-		const key = sha3_default.hash256(secret, 1, "buffer");
-		const cipher = crypto.createCipheriv("aes-256-ecb", key, "");
+		const keyBuffer = sha3_default.hash256(secret, 1, "buffer");
+		const key = Uint8Array.from(keyBuffer);
+		const cipher = crypto.createCipheriv("aes-256-ecb", key, null);
 		cipher.setAutoPadding(true);
-		const output = cipher.update(toBuffer(message));
-		return encode(Buffer.concat([output, cipher.final()]), encoding);
+		const output = cipher.update(Uint8Array.from(toBuffer(message)));
+		return encode(Uint8Array.from(Buffer.concat([Uint8Array.from(output), Uint8Array.from(cipher.final())])), encoding);
 	}
 	decrypt(message, secret, encoding = "hex") {
-		const key = sha3_default.hash256(secret, 1, "buffer");
-		const decipher = crypto.createDecipheriv("aes-256-ecb", key, "");
+		const keyBuffer = sha3_default.hash256(secret, 1, "buffer");
+		const key = Uint8Array.from(keyBuffer);
+		const decipher = crypto.createDecipheriv("aes-256-ecb", key, null);
 		decipher.setAutoPadding(true);
-		const output = decipher.update(toBuffer(message));
-		return encode(Buffer.concat([output, decipher.final()]), encoding);
+		const output = decipher.update(Uint8Array.from(toBuffer(message)));
+		return encode(Uint8Array.from(Buffer.concat([Uint8Array.from(output), Uint8Array.from(decipher.final())])), encoding);
 	}
 };
 var aes_default = new AesCrypter();

package/esm/crypter/rsa-browserify.mjs

@@ -26,7 +26,9 @@ var RSABrowserCrypter = class {
 		return toBase58(new Uint8Array(encrypted));
 	}
 	async decrypt(message, key) {
-		const decrypted = await crypto.decrypt({ name: RSA_ALGORITHM }, key, fromBase58(message));
+		const messageBuffer = fromBase58(message);
+		const data = Uint8Array.from(messageBuffer);
+		const decrypted = await crypto.decrypt({ name: RSA_ALGORITHM }, key, data);
 		return Buffer.from(new Uint8Array(decrypted)).toString("utf8");
 	}
 };

package/esm/crypter/rsa.mjs

@@ -19,10 +19,10 @@ var RSACrypter = class extends crypter_default {
 		});
 	}
 	encrypt(message, key, encoding = "hex") {
-		return encode(crypto.publicEncrypt(key, toBuffer(message)), encoding);
+		return encode(crypto.publicEncrypt(key, Uint8Array.from(toBuffer(message))), encoding);
 	}
 	decrypt(message, key, encoding = "hex") {
-		return encode(crypto.privateDecrypt(key, toBuffer(message)), encoding);
+		return encode(crypto.privateDecrypt(key, Uint8Array.from(toBuffer(message))), encoding);
 	}
 };
 var rsa_default = new RSACrypter();

package/esm/index.d.mts

@@ -38,7 +38,8 @@ interface SignerType {
   sign(data: BytesType, sk: BytesType, encoding?: 'buffer'): Buffer;
   sign(data: BytesType, sk: BytesType, encoding?: 'Uint8Array'): Uint8Array;
   sign(data: BytesType, sk: BytesType, encoding?: EncodingType): BytesType;
-  verify(data: BytesType, pk: BytesType, signature: BytesType, extra?: any): boolean;
+  /** extra is JSON string for passkey signer containing {authenticatorData, clientDataJSON} */
+  verify(data: BytesType, pk: BytesType, signature: BytesType, extra?: string): boolean;
   ethHash?(data: string): string;
   ethSign?(data: string, sk: string): string;
   ethVerify?(data: string, pk: string, signature: BytesType): boolean;

package/esm/signer/ethereum.mjs

@@ -18,8 +18,8 @@ var EthereumSigner = class extends Secp256k1Signer {
 		const messageBytes = hexToBytes(isHexStrict(data) ? data : utf8ToHex(data));
 		const messageBuffer = Buffer.from(messageBytes);
 		const preamble = `\x19Ethereum Signed Message:\n${messageBytes.length}`;
-		const preambleBuffer = Buffer.from(preamble);
-		const ethMessage = Buffer.concat([preambleBuffer, messageBuffer]);
+		const preambleBuffer = Uint8Array.from(Buffer.from(preamble));
+		const ethMessage = Buffer.concat([preambleBuffer, Uint8Array.from(messageBuffer)]);
 		return Hash.keccak256s(ethMessage);
 	}
 	ethSign(data, privateKey) {

package/esm/signer/passkey.mjs

@@ -1,5 +1,5 @@
 import signer_default from "../protocols/signer.mjs";
-import { fromBase64, toBase64, toBuffer } from "@ocap/util";
+import { fromBase64, toBase64, toBuffer, toUint8Array } from "@ocap/util";
 import { decodeClientDataJSON, isoBase64URL, isoUint8Array, toHash, verifySignature } from "@simplewebauthn/server/helpers";
 
 //#region src/signer/passkey.ts
@@ -36,8 +36,8 @@ var PasskeySigner = class extends signer_default {
 		if (decodeClientDataJSON(parsed.clientDataJSON).challenge !== toBase64(challenge)) throw new Error("challenge mismatch for passkey signature");
 		return verifySignature({
 			signature: isoBase64URL.toBuffer(typeof signature === "string" ? signature : toBase64(signature)),
-			data: isoUint8Array.concat([authDataBuffer, clientDataHash]),
-			credentialPublicKey: pk
+			data: isoUint8Array.concat([Uint8Array.from(authDataBuffer), clientDataHash]),
+			credentialPublicKey: toUint8Array(pk)
 		});
 	}
 };

package/esm/signer/secp256k1.mjs

@@ -72,7 +72,7 @@ var Secp256k1Signer = class extends signer_default {
 			msg = toUint8Array(message);
 		} catch (_err) {}
 		let pkBuffer = toBuffer(pk);
-		if (this.pkHasFormatPrefix === false && pkBuffer[0] !== 4 && pkBuffer.byteLength === 64) pkBuffer = Buffer.concat([Buffer.from([4]), pkBuffer]);
+		if (this.pkHasFormatPrefix === false && pkBuffer[0] !== 4 && pkBuffer.byteLength === 64) pkBuffer = Buffer.concat([Uint8Array.from([4]), Uint8Array.from(pkBuffer)]);
 		return secp256k1.keyFromPublic(pkBuffer).verify(stripHexPrefix(msg), stripHexPrefix(toHex(signature)));
 	}
 };

package/lib/crypter/aes.cjs

@@ -10,18 +10,20 @@ node_crypto = require_rolldown_runtime.__toESM(node_crypto);
 //#region src/crypter/aes.ts
 var AesCrypter = class extends require_protocols_crypter.default {
 	encrypt(message, secret, encoding = "hex") {
-		const key = require_hasher_sha3.default.hash256(secret, 1, "buffer");
-		const cipher = node_crypto.default.createCipheriv("aes-256-ecb", key, "");
+		const keyBuffer = require_hasher_sha3.default.hash256(secret, 1, "buffer");
+		const key = Uint8Array.from(keyBuffer);
+		const cipher = node_crypto.default.createCipheriv("aes-256-ecb", key, null);
 		cipher.setAutoPadding(true);
-		const output = cipher.update((0, _ocap_util.toBuffer)(message));
-		return require_encode.encode(Buffer.concat([output, cipher.final()]), encoding);
+		const output = cipher.update(Uint8Array.from((0, _ocap_util.toBuffer)(message)));
+		return require_encode.encode(Uint8Array.from(Buffer.concat([Uint8Array.from(output), Uint8Array.from(cipher.final())])), encoding);
 	}
 	decrypt(message, secret, encoding = "hex") {
-		const key = require_hasher_sha3.default.hash256(secret, 1, "buffer");
-		const decipher = node_crypto.default.createDecipheriv("aes-256-ecb", key, "");
+		const keyBuffer = require_hasher_sha3.default.hash256(secret, 1, "buffer");
+		const key = Uint8Array.from(keyBuffer);
+		const decipher = node_crypto.default.createDecipheriv("aes-256-ecb", key, null);
 		decipher.setAutoPadding(true);
-		const output = decipher.update((0, _ocap_util.toBuffer)(message));
-		return require_encode.encode(Buffer.concat([output, decipher.final()]), encoding);
+		const output = decipher.update(Uint8Array.from((0, _ocap_util.toBuffer)(message)));
+		return require_encode.encode(Uint8Array.from(Buffer.concat([Uint8Array.from(output), Uint8Array.from(decipher.final())])), encoding);
 	}
 };
 var aes_default = new AesCrypter();

package/lib/crypter/rsa-browserify.cjs

@@ -28,7 +28,9 @@ var RSABrowserCrypter = class {
 		return (0, _ocap_util.toBase58)(new Uint8Array(encrypted));
 	}
 	async decrypt(message, key) {
-		const decrypted = await crypto.decrypt({ name: RSA_ALGORITHM }, key, (0, _ocap_util.fromBase58)(message));
+		const messageBuffer = (0, _ocap_util.fromBase58)(message);
+		const data = Uint8Array.from(messageBuffer);
+		const decrypted = await crypto.decrypt({ name: RSA_ALGORITHM }, key, data);
 		return Buffer.from(new Uint8Array(decrypted)).toString("utf8");
 	}
 };

package/lib/crypter/rsa.cjs

@@ -22,10 +22,10 @@ var RSACrypter = class extends require_protocols_crypter.default {
 		});
 	}
 	encrypt(message, key, encoding = "hex") {
-		return require_encode.encode(node_crypto.default.publicEncrypt(key, (0, _ocap_util.toBuffer)(message)), encoding);
+		return require_encode.encode(node_crypto.default.publicEncrypt(key, Uint8Array.from((0, _ocap_util.toBuffer)(message))), encoding);
 	}
 	decrypt(message, key, encoding = "hex") {
-		return require_encode.encode(node_crypto.default.privateDecrypt(key, (0, _ocap_util.toBuffer)(message)), encoding);
+		return require_encode.encode(node_crypto.default.privateDecrypt(key, Uint8Array.from((0, _ocap_util.toBuffer)(message))), encoding);
 	}
 };
 var rsa_default = new RSACrypter();

package/lib/index.d.cts

@@ -38,7 +38,8 @@ interface SignerType {
   sign(data: BytesType, sk: BytesType, encoding?: 'buffer'): Buffer;
   sign(data: BytesType, sk: BytesType, encoding?: 'Uint8Array'): Uint8Array;
   sign(data: BytesType, sk: BytesType, encoding?: EncodingType): BytesType;
-  verify(data: BytesType, pk: BytesType, signature: BytesType, extra?: any): boolean;
+  /** extra is JSON string for passkey signer containing {authenticatorData, clientDataJSON} */
+  verify(data: BytesType, pk: BytesType, signature: BytesType, extra?: string): boolean;
   ethHash?(data: string): string;
   ethSign?(data: string, sk: string): string;
   ethVerify?(data: string, pk: string, signature: BytesType): boolean;

package/lib/signer/ethereum.cjs

@@ -22,8 +22,8 @@ var EthereumSigner = class extends require_signer_secp256k1.Secp256k1Signer {
 		const messageBytes = (0, _ocap_util.hexToBytes)((0, _ocap_util.isHexStrict)(data) ? data : (0, _ocap_util.utf8ToHex)(data));
 		const messageBuffer = Buffer.from(messageBytes);
 		const preamble = `\x19Ethereum Signed Message:\n${messageBytes.length}`;
-		const preambleBuffer = Buffer.from(preamble);
-		const ethMessage = Buffer.concat([preambleBuffer, messageBuffer]);
+		const preambleBuffer = Uint8Array.from(Buffer.from(preamble));
+		const ethMessage = Buffer.concat([preambleBuffer, Uint8Array.from(messageBuffer)]);
 		return eth_lib_lib_hash.default.keccak256s(ethMessage);
 	}
 	ethSign(data, privateKey) {

package/lib/signer/passkey.cjs

@@ -38,8 +38,8 @@ var PasskeySigner = class extends require_protocols_signer.default {
 		if ((0, _simplewebauthn_server_helpers.decodeClientDataJSON)(parsed.clientDataJSON).challenge !== (0, _ocap_util.toBase64)(challenge)) throw new Error("challenge mismatch for passkey signature");
 		return (0, _simplewebauthn_server_helpers.verifySignature)({
 			signature: _simplewebauthn_server_helpers.isoBase64URL.toBuffer(typeof signature === "string" ? signature : (0, _ocap_util.toBase64)(signature)),
-			data: _simplewebauthn_server_helpers.isoUint8Array.concat([authDataBuffer, clientDataHash]),
-			credentialPublicKey: pk
+			data: _simplewebauthn_server_helpers.isoUint8Array.concat([Uint8Array.from(authDataBuffer), clientDataHash]),
+			credentialPublicKey: (0, _ocap_util.toUint8Array)(pk)
 		});
 	}
 };

package/lib/signer/secp256k1.cjs

@@ -76,7 +76,7 @@ var Secp256k1Signer = class extends require_protocols_signer.default {
 			msg = (0, _ocap_util.toUint8Array)(message);
 		} catch (_err) {}
 		let pkBuffer = (0, _ocap_util.toBuffer)(pk);
-		if (this.pkHasFormatPrefix === false && pkBuffer[0] !== 4 && pkBuffer.byteLength === 64) pkBuffer = Buffer.concat([Buffer.from([4]), pkBuffer]);
+		if (this.pkHasFormatPrefix === false && pkBuffer[0] !== 4 && pkBuffer.byteLength === 64) pkBuffer = Buffer.concat([Uint8Array.from([4]), Uint8Array.from(pkBuffer)]);
 		return secp256k1.keyFromPublic(pkBuffer).verify((0, _ocap_util.stripHexPrefix)(msg), (0, _ocap_util.stripHexPrefix)((0, _ocap_util.toHex)(signature)));
 	}
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ocap/mcrypto",
-  "version": "1.28.9",
+  "version": "1.29.0",
   "type": "module",
   "description": "Crypto lib that provides signer,crypter,hasher interface",
   "keywords": [
@@ -48,14 +48,13 @@
     "esm"
   ],
   "devDependencies": {
-    "@ocap/e2e-test": "1.28.9",
+    "@ocap/e2e-test": "1.29.0",
     "@types/crypto-js": "^4.2.2",
     "@types/elliptic": "^6.4.18",
     "@types/node": "^22.7.5",
     "@types/randombytes": "^2.0.3",
     "tsdown": "^0.18.4",
-    "type-fest": "^3.1.0",
-    "typescript": "^5.6.2"
+    "type-fest": "^3.1.0"
   },
   "repository": {
     "type": "git",
@@ -74,7 +73,7 @@
     "url": "https://github.com/ArcBlock/blockchain/issues"
   },
   "dependencies": {
-    "@ocap/util": "1.28.9",
+    "@ocap/util": "1.29.0",
     "@simplewebauthn/server": "^13.0.0",
     "bn.js": "5.2.2",
     "crypto-js": "^4.2.0",