diff --git a/.gitmodules b/.gitmodules index a6695daa..1f96a65f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,9 +7,9 @@ [submodule "external/cursive-flexi-logger-view"] path = external/cursive-flexi-logger-view url = ../cursive-flexi-logger-view.git -[submodule "external/keyring-rs"] - path = external/keyring-rs - url = ../keyring-rs.git +[submodule "external/keyring-manager"] + path = external/keyring-manager + url = ../keyring-manager.git [submodule "external/keyvaluedb"] path = external/keyvaluedb url = ../keyvaluedb.git diff --git a/Cargo.lock b/Cargo.lock index dffc8d25..b19ac206 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1830,8 +1830,8 @@ dependencies = [ ] [[package]] -name = "keyring" -version = "0.10.1" +name = "keyring-manager" +version = "0.5.0" dependencies = [ "android_logger", "backtrace", @@ -1855,7 +1855,7 @@ dependencies = [ "security-framework-sys", "serde 1.0.133", "serde_cbor", - "serial_test 0.5.1", + "serial_test 0.4.0", "simplelog", "snailquote", "tempfile", @@ -3832,7 +3832,7 @@ dependencies = [ "jni", "jni-sys", "js-sys", - "keyring", + "keyring-manager", "keyvaluedb-sqlite", "keyvaluedb-web", "lazy_static", diff --git a/external/keyring-manager b/external/keyring-manager new file mode 160000 index 00000000..3713e105 --- /dev/null +++ b/external/keyring-manager @@ -0,0 +1 @@ +Subproject commit 3713e10599c6078e058aab785ef46594420dc11b diff --git a/external/keyring-rs b/external/keyring-rs deleted file mode 160000 index 8dd37fa4..00000000 --- a/external/keyring-rs +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8dd37fa4c629f80951cd78f8cc245317b44bdb05 diff --git a/veilid-core/Cargo.toml b/veilid-core/Cargo.toml index 1196e2fb..1cd06d85 100644 --- a/veilid-core/Cargo.toml +++ b/veilid-core/Cargo.toml @@ -50,7 +50,7 @@ async-std = { version = "^1", features = ["unstable"] } async-tungstenite = { version = "^0", features = ["async-std-runtime", "async-tls"] } maplit = "^1" config = { version = "^0", features = ["yaml"] } -keyring = { path = "../external/keyring-rs" } +keyring-manager = { path = "../external/keyring-manager" } lru = "^0" async-tls = "^0.11" webpki = "^0" diff --git a/veilid-core/src/intf/native/protected_store.rs b/veilid-core/src/intf/native/protected_store.rs index 50e286cf..8d70ff3a 100644 --- a/veilid-core/src/intf/native/protected_store.rs +++ b/veilid-core/src/intf/native/protected_store.rs @@ -1,7 +1,7 @@ use crate::xx::*; use crate::*; use data_encoding::BASE64URL_NOPAD; -use keyring::*; +use keyring_manager::*; use std::path::Path; use std::result::Result;