Git-Mirrors/veilid
1
0
Fork 0
mirror of https://gitlab.com/veilid/veilid.git synced 2024-10-01 01:26:08 -04:00
Code Issues Packages Projects Releases Wiki 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"]
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

8
Cargo.lock generated
View File

@ -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",

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"] }
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"

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

@ -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;