liz/veilid
liz/veilid
1
0
Fork 0
Code Pull Requests Packages Releases Activity

switch to keyring-manager

Browse Source
This commit is contained in:
John Smith 2022-01-09 12:37:25 -05:00
parent 170f5ec707
commit 5122fd8ebd
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitmodules vendored
View File

@ -7,9 +7,9 @@
[submodule "external/cursive-flexi-logger-view"] [submodule "external/cursive-flexi-logger-view"]
path = external/cursive-flexi-logger-view path = external/cursive-flexi-logger-view
url = ../cursive-flexi-logger-view.git url = ../cursive-flexi-logger-view.git
[submodule "external/keyring-rs"] [submodule "external/keyring-manager"]
path = external/keyring-rs path = external/keyring-manager
url = ../keyring-rs.git url = ../keyring-manager.git
[submodule "external/keyvaluedb"] [submodule "external/keyvaluedb"]
path = external/keyvaluedb path = external/keyvaluedb
url = ../keyvaluedb.git url = ../keyvaluedb.git

8
Cargo.lock generated
View File

@ -1830,8 +1830,8 @@ dependencies = [
] ]
[[package]] [[package]]
name = "keyring" name = "keyring-manager"
version = "0.10.1" version = "0.5.0"
dependencies = [ dependencies = [
"android_logger", "android_logger",
"backtrace", "backtrace",
@ -1855,7 +1855,7 @@ dependencies = [
"security-framework-sys", "security-framework-sys",
"serde 1.0.133", "serde 1.0.133",
"serde_cbor", "serde_cbor",
"serial_test 0.5.1", "serial_test 0.4.0",
"simplelog", "simplelog",
"snailquote", "snailquote",
"tempfile", "tempfile",
@ -3832,7 +3832,7 @@ dependencies = [
"jni", "jni",
"jni-sys", "jni-sys",
"js-sys", "js-sys",
"keyring", "keyring-manager",
"keyvaluedb-sqlite", "keyvaluedb-sqlite",
"keyvaluedb-web", "keyvaluedb-web",
"lazy_static", "lazy_static",

1
external/keyring-manager vendored Submodule

@ -0,0 +1 @@
Subproject commit 3713e10599c6078e058aab785ef46594420dc11b

1
external/keyring-rs vendored

@ -1 +0,0 @@
Subproject commit 8dd37fa4c629f80951cd78f8cc245317b44bdb05

2
veilid-core/Cargo.toml
View File

@ -50,7 +50,7 @@ async-std = { version = "^1", features = ["unstable"] }
async-tungstenite = { version = "^0", features = ["async-std-runtime", "async-tls"] } async-tungstenite = { version = "^0", features = ["async-std-runtime", "async-tls"] }
maplit = "^1" maplit = "^1"
config = { version = "^0", features = ["yaml"] } config = { version = "^0", features = ["yaml"] }
keyring = { path = "../external/keyring-rs" } keyring-manager = { path = "../external/keyring-manager" }
lru = "^0" lru = "^0"
async-tls = "^0.11" async-tls = "^0.11"
webpki = "^0" webpki = "^0"

2
veilid-core/src/intf/native/protected_store.rs
View File

@ -1,7 +1,7 @@
use crate::xx::*; use crate::xx::*;
use crate::*; use crate::*;
use data_encoding::BASE64URL_NOPAD; use data_encoding::BASE64URL_NOPAD;
use keyring::*; use keyring_manager::*;
use std::path::Path; use std::path::Path;
use std::result::Result; use std::result::Result;