From b230a2dd7a4ad0a2aa98805f6b2ef25242af246d Mon Sep 17 00:00:00 2001 From: Daniel Mader Date: Mon, 12 Aug 2024 16:49:22 +0200 Subject: [PATCH] chore: pass config for `es256` into `SecretManager` builder --- Cargo.lock | 18 +++++++++--------- Cargo.toml | 2 +- agent_application/example.config.yaml | 2 ++ agent_secret_manager/src/lib.rs | 6 +++++- 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f46660ed..9ffaf716 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1369,7 +1369,7 @@ checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" [[package]] name = "consumer" version = "0.1.0" -source = "git+https://git@github.com/impierce/did-manager.git?rev=833019b#833019b4d81a531bfbb296639c80d0088d7eff5a" +source = "git+https://git@github.com/impierce/did-manager.git?rev=d49c4f1#d49c4f19dc2f4185a16386c41ee89b62719aa1db" dependencies = [ "did_iota", "did_jwk", @@ -1935,7 +1935,7 @@ dependencies = [ [[package]] name = "did_iota" version = "0.1.0" -source = "git+https://git@github.com/impierce/did-manager.git?rev=833019b#833019b4d81a531bfbb296639c80d0088d7eff5a" +source = "git+https://git@github.com/impierce/did-manager.git?rev=d49c4f1#d49c4f19dc2f4185a16386c41ee89b62719aa1db" dependencies = [ "bls12_381_plus 0.8.15", "identity_iota", @@ -1949,7 +1949,7 @@ dependencies = [ [[package]] name = "did_jwk" version = "0.1.0" -source = "git+https://git@github.com/impierce/did-manager.git?rev=833019b#833019b4d81a531bfbb296639c80d0088d7eff5a" +source = "git+https://git@github.com/impierce/did-manager.git?rev=d49c4f1#d49c4f19dc2f4185a16386c41ee89b62719aa1db" dependencies = [ "did-jwk", "identity_iota", @@ -1966,7 +1966,7 @@ dependencies = [ [[package]] name = "did_key" version = "0.1.0" -source = "git+https://git@github.com/impierce/did-manager.git?rev=833019b#833019b4d81a531bfbb296639c80d0088d7eff5a" +source = "git+https://git@github.com/impierce/did-manager.git?rev=d49c4f1#d49c4f19dc2f4185a16386c41ee89b62719aa1db" dependencies = [ "did-method-key", "identity_iota", @@ -1984,7 +1984,7 @@ dependencies = [ [[package]] name = "did_manager" version = "0.1.0" -source = "git+https://git@github.com/impierce/did-manager.git?rev=833019b#833019b4d81a531bfbb296639c80d0088d7eff5a" +source = "git+https://git@github.com/impierce/did-manager.git?rev=d49c4f1#d49c4f19dc2f4185a16386c41ee89b62719aa1db" dependencies = [ "consumer", "producer", @@ -2012,7 +2012,7 @@ dependencies = [ [[package]] name = "did_web" version = "0.1.0" -source = "git+https://git@github.com/impierce/did-manager.git?rev=833019b#833019b4d81a531bfbb296639c80d0088d7eff5a" +source = "git+https://git@github.com/impierce/did-manager.git?rev=d49c4f1#d49c4f19dc2f4185a16386c41ee89b62719aa1db" dependencies = [ "did-web", "identity_iota", @@ -3415,7 +3415,7 @@ dependencies = [ [[package]] name = "identity_stronghold_ext" version = "0.1.0" -source = "git+https://git@github.com/impierce/did-manager.git?rev=833019b#833019b4d81a531bfbb296639c80d0088d7eff5a" +source = "git+https://git@github.com/impierce/did-manager.git?rev=d49c4f1#d49c4f19dc2f4185a16386c41ee89b62719aa1db" dependencies = [ "async-trait", "elliptic-curve 0.13.8", @@ -5382,7 +5382,7 @@ dependencies = [ [[package]] name = "producer" version = "0.1.0" -source = "git+https://git@github.com/impierce/did-manager.git?rev=833019b#833019b4d81a531bfbb296639c80d0088d7eff5a" +source = "git+https://git@github.com/impierce/did-manager.git?rev=d49c4f1#d49c4f19dc2f4185a16386c41ee89b62719aa1db" dependencies = [ "did_iota", "did_jwk", @@ -6543,7 +6543,7 @@ dependencies = [ [[package]] name = "shared" version = "0.1.0" -source = "git+https://git@github.com/impierce/did-manager.git?rev=833019b#833019b4d81a531bfbb296639c80d0088d7eff5a" +source = "git+https://git@github.com/impierce/did-manager.git?rev=d49c4f1#d49c4f19dc2f4185a16386c41ee89b62719aa1db" dependencies = [ "identity_iota", "identity_storage", diff --git a/Cargo.toml b/Cargo.toml index 2820492f..1d1b7cdc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,7 @@ edition = "2021" rust-version = "1.76.0" [workspace.dependencies] -did_manager = { git = "https://git@github.com/impierce/did-manager.git", rev = "833019b" } +did_manager = { git = "https://git@github.com/impierce/did-manager.git", rev = "d49c4f1" } siopv2 = { git = "https://git@github.com/impierce/openid4vc.git", rev = "12fed14" } oid4vci = { git = "https://git@github.com/impierce/openid4vc.git", rev = "12fed14" } oid4vc-core = { git = "https://git@github.com/impierce/openid4vc.git", rev = "12fed14" } diff --git a/agent_application/example.config.yaml b/agent_application/example.config.yaml index 5d4648d8..38e566a1 100644 --- a/agent_application/example.config.yaml +++ b/agent_application/example.config.yaml @@ -25,6 +25,8 @@ signing_algorithms_supported: eddsa: enabled: true preferred: true + es256: + enabled: true # TODO: required to be stated explicitly? vp_formats: diff --git a/agent_secret_manager/src/lib.rs b/agent_secret_manager/src/lib.rs index c9b49d9b..d4118279 100644 --- a/agent_secret_manager/src/lib.rs +++ b/agent_secret_manager/src/lib.rs @@ -25,13 +25,17 @@ pub async fn secret_manager() -> SecretManager { builder = builder.with_ed25519_key(&issuer_eddsa_key_id); } + if let Some(issuer_es256_key_id) = issuer_es256_key_id { + builder = builder.with_es256_key(&issuer_es256_key_id); + } + // If `did:iota:rms` is enabled, further values are required. if get_all_enabled_did_methods().contains(&agent_shared::config::SupportedDidMethod::IotaRms) { builder = builder .with_did( &issuer_did - .expect("`You have enabled did:iota:rms, which requires the DID. Please provide the value through the config or environment variable.`"), + .expect("`You have enabled did:iota:rms, which requires a known DID. Please provide the value through the config or environment variable.`"), ) .with_fragment(&issuer_fragment.expect( "`You have enabled did:iota:rms, which requires the fragment identifier of the key to be used. Please provide the value through the config or environment variable.`",