switch back to original aries-askar

Signed-off-by: Marc Schoolderman <[email protected]>
openwallet-foundation-labs · Sep 3, 2024 · 33f6dba · 33f6dba
1 parent 59d2c54
commit 33f6dba
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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
             {
-Original file line number
+Diff line change
@@ Expand Up / @@ -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 {
@@ Expand All / @@ -84,7 +84,6 @@ impl Vault { @@
                             None,
                             None,
                             None,
-                            None,
                         )
                         .await
                     {
@@ Expand All / @@ -104,7 +103,6 @@ impl Vault { @@
                         None,
                         None,
                         None,
-                        None,
                     )
                     .await
                 {
@@ Expand All / @@ -123,7 +121,6 @@ impl Vault { @@
                         None,
                         None,
                         None,
-                        None,
                     )
                     .await
                 {
@@ Expand Down @@