blah/typescript-core
1
0
Fork 0
mirror of https://github.com/Blah-IM/typescript-core.git synced 2025-04-30 08:11:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: Refactor key storage to use raw hex format instead of JWK

Browse source 
Change private key representation from JWK to raw hex strings with
appropriate conversion functions. Also update field names to use
consistent naming convention.
This commit is contained in:
Shibo Lyu 2025-04-13 00:54:51 +08:00
parent 4e8a8789d4
commit 24c9032f25
1 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
crypto/keypair.ts
View file

@ -15,9 +15,9 @@ export type EncodedBlahKeyPair =
id: string;
}
& ({
privateKey: JsonWebKey;
private: string;
} | {
passwordProtectedPrivateKey: string;
password_protected_private: string;
iv: string;
salt: string;
});
@ -70,13 +70,13 @@ export class BlahKeyPair {
const publicIdentity = await BlahPublicKey.fromID(encoded.id);
if ("passwordProtectedPrivateKey" in encoded) {
if ("password_protected_private" in encoded) {
if (!password) {
throw new Error("Private key is password-protected.");
}
const derviedKey = await pbkdf2Key(password, encoded.salt);
const encryptedKeyData = hexToBuf(encoded.passwordProtectedPrivateKey);
const encryptedKeyData = hexToBuf(encoded.password_protected_private);
const decryptedKeyData = await crypto.subtle.decrypt(
{
name: "AES-GCM",
@ -97,9 +97,10 @@ export class BlahKeyPair {
return new BlahKeyPair(publicIdentity, privateKey);
} else {
const pkcs8Bytes = ed25519RawPrivateKeyToPKCS8(hexToBuf(encoded.private));
const privateKey = await crypto.subtle.importKey(
"jwk",
encoded.privateKey,
"pkcs8",
pkcs8Bytes,
{ name: "Ed25519" },
true,
["sign"],
@ -143,18 +144,21 @@ export class BlahKeyPair {
return {
v: "0",
id: this.internalPublicKey.id,
passwordProtectedPrivateKey: bufToHex(wrappedPrivateKey),
password_protected_private: bufToHex(wrappedPrivateKey),
iv,
salt,
};
} else {
const pkcs8Bytes = await crypto.subtle.exportKey(
"pkcs8",
this.internalPrivateKey,
);
const rawPrivateKeyBytes = ed25519PKCS8ToRawPrivateKey(pkcs8Bytes);
const rawPrivateKey = bufToHex(rawPrivateKeyBytes);
return {
v: "0",
id: this.internalPublicKey.id,
privateKey: await crypto.subtle.exportKey(
"jwk",
this.internalPrivateKey,
),
private: rawPrivateKey,
};
}
}