From 33f6dba395dcf7eb9d53297d17b25cf8d030d1ca Mon Sep 17 00:00:00 2001 From: Marc Schoolderman Date: Tue, 3 Sep 2024 18:06:01 +0200 Subject: [PATCH] switch back to original aries-askar Signed-off-by: Marc Schoolderman --- Cargo.toml | 4 +--- deny.toml | 9 ++------- tsp/src/vault.rs | 5 +---- 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 5c677ff..88a5085 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -46,9 +46,7 @@ tokio = { version = "1.0", default-features = false, features = [ "net", "macros", ] } -aries-askar = { git = "https://github.com/marlonbaeten/aries-askar", branch = "ciborium", default-features = false, features = [ - "sqlite", -] } +aries-askar = { version = "0.3.1", default-features = false, features = [ "sqlite" ] } # logging tracing = "0.1" tracing-subscriber = { version = "0.3.1", default-features = false, features = [ diff --git a/deny.toml b/deny.toml index 48d5c04..ece78e7 100644 --- a/deny.toml +++ b/deny.toml @@ -15,13 +15,8 @@ crate = "ring" expression = "ISC AND OpenSSL AND MIT" license-files = [ { path = "LICENSE", hash = 0xbd0eed23 } ] -[sources] -allow-git = [ - "https://github.com/marlonbaeten/rust-hpke", - "https://github.com/marlonbaeten/aries-askar", -] - [advisories] ignore = [ - { id="RUSTSEC-2024-0363", reason = "we cannot upgrade away from this without breaking compatibility with aries-askar" }, + { id="RUSTSEC-2024-0363", reason = "introduced by aries-askar, on which we are dependent; migrate away from sqlx 0.7" }, + { id="RUSTSEC-2021-0127", reason = "introduced by aries-askar, on which we are dependent; serde_cbor can be replaced by ciborium" }, ] diff --git a/tsp/src/vault.rs b/tsp/src/vault.rs index 3fa5d44..b12aa78 100644 --- a/tsp/src/vault.rs +++ b/tsp/src/vault.rs @@ -65,7 +65,7 @@ impl Vault { let signing_key_name = format!("{id}#signing-key"); if let Err(e) = conn - .insert_key(&signing_key_name, &signing_key, None, None, None, None) + .insert_key(&signing_key_name, &signing_key, None, None, None) .await { if e.kind() != ErrorKind::Duplicate { @@ -84,7 +84,6 @@ impl Vault { None, None, None, - None, ) .await { @@ -104,7 +103,6 @@ impl Vault { None, None, None, - None, ) .await { @@ -123,7 +121,6 @@ impl Vault { None, None, None, - None, ) .await {