bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-02-08 12:40:26 +00:00
Code Issues Releases Wiki Activity

Use sdk directly to get algorithm

Browse Source
This commit is contained in:
Bernd Schoolmann
2025-05-19 11:43:32 +02:00
parent 99454812e5
commit 4c3b64006d
4 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/web/src/app/key-management/key-rotation/user-key-rotation.service.ts
View File

@@ -215,9 +215,8 @@ export class UserKeyRotationService {
verifyingKey: verifyingKeyString,
signedPublicKeyOwnershipClaim,
signingKey: signingKeyEncString,
signingKeyType,
} = noSigningKeySdkClient.crypto().make_signing_keys();
const verifyingKey = new VerifyingKey(verifyingKeyString, signingKeyType);
const verifyingKey = new VerifyingKey(verifyingKeyString);
const signingKey = new UserSigningKey(signingKeyEncString);
return {
userKey: newUserKey,

2
libs/common/src/key-management/keys/response/public-account-keys.response.ts
View File

@@ -8,7 +8,7 @@ export class PublicAccountKeysResponseModel {
readonly SignedPublicKeyOwnershipClaim: SignedPublicKeyOwnershipClaim;
constructor(response: any) {
this.VerifyingKey = new VerifyingKey(response.verifyingKey, response.verifyingKeyAlgorithm);
this.VerifyingKey = new VerifyingKey(response.verifyingKey);
this.PublicKey = response.publicKey;
this.SignedPublicKeyOwnershipClaim = response.signedPublicKeyOwnershipClaim;
}

12
libs/common/src/key-management/keys/response/signing-keys.response.ts
View File

@@ -1,9 +1,4 @@
import {
parseSigningKeyTypeFromString,
SigningKeyType,
UserSigningKey,
VerifyingKey,
} from "@bitwarden/key-management";
import { SigningKeyType, UserSigningKey, VerifyingKey } from "@bitwarden/key-management";
export class UserSigningKeyData {
readonly keyAlgorithm: SigningKeyType;
@@ -13,9 +8,6 @@ export class UserSigningKeyData {
constructor(response: any) {
this.keyAlgorithm = response.keyAlgorithm;
this.wrappedSigningKey = new UserSigningKey(response.wrappedSigningKey);
this.verifyingKey = new VerifyingKey(
response.verifyingKey,
parseSigningKeyTypeFromString(this.keyAlgorithm),
);
this.verifyingKey = new VerifyingKey(response.verifyingKey);
}
}

9
libs/key-management/src/models/verifying-key.ts
View File

@@ -1,12 +1,13 @@
import { Utils } from "@bitwarden/common/platform/misc/utils";
import { PureCrypto } from "@bitwarden/sdk-internal";
import { SigningKeyType } from "../enums/signing-key-type.enum";
export class VerifyingKey {
private innerKey: string;
private keyType: SigningKeyType;
constructor(verifyingKey: string, keyType: SigningKeyType) {
constructor(verifyingKey: string) {
this.innerKey = verifyingKey;
this.keyType = keyType;
}
toString(): string {
@@ -14,6 +15,6 @@ export class VerifyingKey {
}
algorithm(): SigningKeyType {
return this.keyType;
return PureCrypto.key_algorithm_for_verifying_key(Utils.fromB64ToArray(this.innerKey));
}
}