diff --git a/packages/key-manager/src/agent/SphereonKeyManager.ts b/packages/key-manager/src/agent/SphereonKeyManager.ts index 74508b96..f6519c6d 100644 --- a/packages/key-manager/src/agent/SphereonKeyManager.ts +++ b/packages/key-manager/src/agent/SphereonKeyManager.ts @@ -28,7 +28,7 @@ export class SphereonKeyManager extends VeramoKeyManager { // local store reference, given the superclass store is private, and we need additional functions/calls private kmsStore: AbstractKeyStore private readonly availableKmses: Record - public readonly _defaultKms: string + public _defaultKms: string readonly kmsMethods: ISphereonKeyManager constructor(options: { store: AbstractKeyStore; kms: Record; defaultKms?: string }) { @@ -155,15 +155,11 @@ export class SphereonKeyManager extends VeramoKeyManager { return this._defaultKms } - set defaultKms(value: string) { - if (!Object.keys(this.availableKmses).includes(value)) { + set defaultKms(kms: string) { + if (!Object.keys(this.availableKmses).includes(kms)) { throw Error(`Default KMS needs to be listed in the kms object as well. Found kms-es: ${Object.keys(this.availableKmses).join(',')}`) } - Object.defineProperty(this, '_defaultKms', { - value, - writable: false, - configurable: false - }) + this._defaultKms = kms } setKms(name: string, kms: AbstractKeyManagementSystem): void { diff --git a/packages/kms-musap-rn/package.json b/packages/kms-musap-rn/package.json index 8d41291f..9e452aab 100644 --- a/packages/kms-musap-rn/package.json +++ b/packages/kms-musap-rn/package.json @@ -10,7 +10,7 @@ "build:clean": "tsc --build --clean && tsc --build" }, "dependencies": { - "@sphereon/musap-react-native": "0.2.1-unstable.160", + "@sphereon/musap-react-native": "0.2.1-unstable.161", "@sphereon/ssi-sdk-ext.key-utils": "workspace:*", "@sphereon/ssi-sdk-ext.x509-utils": "workspace:*", "@sphereon/ssi-types": "0.30.2-feature.SDK.41.oidf.support.286", diff --git a/packages/kms-musap-rn/src/MusapKeyManagerSystem.ts b/packages/kms-musap-rn/src/MusapKeyManagerSystem.ts index 39dc4382..79335b08 100644 --- a/packages/kms-musap-rn/src/MusapKeyManagerSystem.ts +++ b/packages/kms-musap-rn/src/MusapKeyManagerSystem.ts @@ -78,7 +78,7 @@ export class MusapKeyManagementSystem extends AbstractKeyManagementSystem { const existingKeys: MusapKey[] = (this.musapClient.listKeys()) as MusapKey[] const extKey = existingKeys.find(musapKey => musapKey.sscdType as string === 'External Signature') // FIXME returning does not match SscdType enum if (extKey) { - extKey.algorithm = 'eccp256r1' // FIXME MUSAP announces key as rsa2k, but it's actually EC + extKey.algorithm = 'ecc_ed25519' // FIXME MUSAP announces key as rsa2k, but it's actually EC return this.asMusapKeyInfo(extKey) } return Promise.reject(Error(`No external key was bound yet for sscd ${this.sscdId}`)) @@ -126,6 +126,8 @@ export class MusapKeyManagementSystem extends AbstractKeyManagementSystem { return 'Secp256k1' case 'eccp256r1': return 'Secp256r1' + case 'ecc_ed25519': + return 'Ed25519' case 'rsa2k': case 'rsa4k': return 'RSA' diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 892f8147..f5d86e1d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -790,8 +790,8 @@ importers: packages/kms-musap-rn: dependencies: '@sphereon/musap-react-native': - specifier: 0.2.1-unstable.160 - version: 0.2.1-unstable.160(react-native@0.76.0(@babel/core@7.26.0)(@babel/preset-env@7.26.0(@babel/core@7.26.0))(encoding@0.1.13)(react@18.3.1))(react@18.3.1) + specifier: 0.2.1-unstable.161 + version: 0.2.1-unstable.161(react-native@0.76.0(@babel/core@7.26.0)(@babel/preset-env@7.26.0(@babel/core@7.26.0))(encoding@0.1.13)(react@18.3.1))(react@18.3.1) '@sphereon/ssi-sdk-ext.key-utils': specifier: workspace:* version: link:../key-utils @@ -2817,15 +2817,17 @@ packages: '@sphereon/kmp-crypto-kms-azure@0.2.0-SNAPSHOT.12': resolution: {integrity: sha512-XDsLNHmFkHcPkwqmYLhxn1vVs2H6rAglrfjtpulOCmvPaqwROMnjS89lMD7F3fUpF5e5sYpk8IL6WlPZGvAP/A==} + bundledDependencies: [] '@sphereon/kmp-mdl-mdoc@0.2.0-SNAPSHOT.22': resolution: {integrity: sha512-uAZZExVy+ug9JLircejWa5eLtAZ7bnBP6xb7DO2+86LRsHNLh2k2jMWJYxp+iWtGHTsh6RYsZl14ScQLvjiQ/A==} + bundledDependencies: [] - '@sphereon/musap-native@0.2.1-unstable.160': - resolution: {integrity: sha512-nXl8CNlaagBKRDKx8xJZvMOJnPIkNIcClVLevqwEyK9PAG8o0g59xEXYXps7n9+fFCYaI84RJYqhy1vV9kRMAw==} + '@sphereon/musap-native@0.2.1-unstable.161': + resolution: {integrity: sha512-i9XW+LdZcc+hVGjM4Dnntwe53BMzhde4Wihe1Ufgxoi7NL/TK5xnlucKFp6dWt4MR4wbttga44ar6sEkv8mV9w==} - '@sphereon/musap-react-native@0.2.1-unstable.160': - resolution: {integrity: sha512-vR9iPRjMgYRJ/Wg5c16CC2HowpV2As+IrpKbLhv2WQT1lwZNeuh8jkobTvRLd9424Nk/l0bd4tL16IZi4otm3A==} + '@sphereon/musap-react-native@0.2.1-unstable.161': + resolution: {integrity: sha512-c5ERKr4XOqojr9chqxJ76NZtgneuYJgYl0AZPdi1Nl9b8jq6KpHKorpWK+2iKWsyYnVUaXXbdu2c3v829gyNJg==} peerDependencies: react: '*' react-native: '*' @@ -12427,11 +12429,11 @@ snapshots: '@js-joda/timezone': 2.3.0(@js-joda/core@5.6.3) format-util: 1.0.5 - '@sphereon/musap-native@0.2.1-unstable.160': {} + '@sphereon/musap-native@0.2.1-unstable.161': {} - '@sphereon/musap-react-native@0.2.1-unstable.160(react-native@0.76.0(@babel/core@7.26.0)(@babel/preset-env@7.26.0(@babel/core@7.26.0))(encoding@0.1.13)(react@18.3.1))(react@18.3.1)': + '@sphereon/musap-react-native@0.2.1-unstable.161(react-native@0.76.0(@babel/core@7.26.0)(@babel/preset-env@7.26.0(@babel/core@7.26.0))(encoding@0.1.13)(react@18.3.1))(react@18.3.1)': dependencies: - '@sphereon/musap-native': 0.2.1-unstable.160 + '@sphereon/musap-native': 0.2.1-unstable.161 react: 18.3.1 react-native: 0.76.0(@babel/core@7.26.0)(@babel/preset-env@7.26.0(@babel/core@7.26.0))(encoding@0.1.13)(react@18.3.1)