~qaul/community

utils/alexandria: update keybob to 0.4.0 v1 APPLIED

Alyssa Ross
Alyssa Ross: 1
 utils/alexandria: update keybob to 0.4.0

 2 files changed, 43 insertions(+), 162 deletions(-)
Export patchset (mbox)
How do I use this?

Copy & paste the following snippet into your terminal to import this patchset into git:

curl -s https://lists.sr.ht/~qaul/community/patches/20682/mbox | git am -3
Learn more about email & git
View this thread in the archives

[PATCH] utils/alexandria: update keybob to 0.4.0 Export this patch

Alyssa Ross
This version mostly just bumps all of keybob's dependencies, which in
turn reduces the number of qaul's dependencies because keybob can
share more deps with other crates.
---
 Cargo.lock                  | 203 ++++++++----------------------------
 utils/alexandria/Cargo.toml |   2 +-
 2 files changed, 43 insertions(+), 162 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 30b621f4..d3fa3ee8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -65,12 +65,6 @@ version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "db55d72333851e17d572bec876e390cd3b11eb1ef53ae821dd9f3b653d2b4569"

[[package]]
name = "arrayref"
version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"

[[package]]
name = "as-slice"
version = "0.1.4"
@@ -175,16 +169,6 @@ version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"

[[package]]
name = "base64"
version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643"
dependencies = [
 "byteorder",
 "safemem",
]

[[package]]
name = "base64"
version = "0.10.1"
@@ -194,6 +178,12 @@ dependencies = [
 "byteorder",
]

[[package]]
name = "base64"
version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff"

[[package]]
name = "bincode"
version = "1.3.1"
@@ -240,37 +230,27 @@ version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"

[[package]]
name = "blake2"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73b77e29dbd0115e43938be2d5128ecf81c0353e00acaa65339a1242586951d9"
dependencies = [
 "byte-tools 0.2.0",
 "crypto-mac 0.5.2",
 "digest 0.7.6",
]

[[package]]
name = "blake2"
version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "94cb07b0da6a73955f8fb85d24c466778e70cda767a568229b104f0264089330"
dependencies = [
 "byte-tools 0.3.1",
 "byte-tools",
 "crypto-mac 0.7.0",
 "digest 0.8.1",
 "opaque-debug 0.2.3",
]

[[package]]
name = "block-buffer"
version = "0.3.3"
name = "blake2"
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a076c298b9ecdb530ed9d967e74a6027d6a7478924520acddcddc24c1c8ab3ab"
checksum = "10a5720225ef5daecf08657f23791354e1685a8c91a4c60c7f3d3b2892f978f4"
dependencies = [
 "arrayref",
 "byte-tools 0.2.0",
 "crypto-mac 0.8.0",
 "digest 0.9.0",
 "opaque-debug 0.3.0",
]

[[package]]
@@ -296,12 +276,6 @@ dependencies = [
 "slab",
]

[[package]]
name = "byte-tools"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "560c32574a12a89ecd91f5e742165893f86e3ab98d21f8ea548658eb9eef5f40"

[[package]]
name = "byte-tools"
version = "0.3.1"
@@ -457,12 +431,6 @@ dependencies = [
 "serde",
]

[[package]]
name = "constant_time_eq"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"

[[package]]
name = "cpuid-bool"
version = "0.1.2"
@@ -516,26 +484,6 @@ dependencies = [
 "lazy_static",
]

[[package]]
name = "crypto-mac"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0999b4ff4d3446d4ddb19a63e9e00c1876e75cd7000d20e57a693b4b3f08d958"
dependencies = [
 "constant_time_eq",
 "generic-array 0.9.0",
]

[[package]]
name = "crypto-mac"
version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7afa06d05a046c7a47c3a849907ec303504608c927f4e85f7bfff22b7180d971"
dependencies = [
 "constant_time_eq",
 "generic-array 0.9.0",
]

[[package]]
name = "crypto-mac"
version = "0.7.0"
@@ -546,6 +494,16 @@ dependencies = [
 "subtle 1.0.0",
]

[[package]]
name = "crypto-mac"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab"
dependencies = [
 "generic-array 0.14.4",
 "subtle 2.4.0",
]

[[package]]
name = "ctor"
version = "0.1.19"
@@ -569,15 +527,6 @@ dependencies = [
 "zeroize",
]

[[package]]
name = "digest"
version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "03b072242a8cbaf9c145665af9d250c59af3b958f83ed6824e13533cf76d5b90"
dependencies = [
 "generic-array 0.9.0",
]

[[package]]
name = "digest"
version = "0.8.1"
@@ -636,7 +585,7 @@ dependencies = [
 "ed25519",
 "rand 0.7.3",
 "serde",
 "sha2 0.9.3",
 "sha2",
 "zeroize",
]

@@ -668,12 +617,6 @@ dependencies = [
 "version_check",
]

[[package]]
name = "fake-simd"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"

[[package]]
name = "fnv"
version = "1.0.7"
@@ -690,12 +633,6 @@ dependencies = [
 "percent-encoding",
]

[[package]]
name = "fuchsia-cprng"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"

[[package]]
name = "fuchsia-zircon"
version = "0.3.3"
@@ -813,15 +750,6 @@ dependencies = [
 "slab",
]

[[package]]
name = "generic-array"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef25c5683767570c2bbd7deba372926a55eaae9982d7726ee2a1050239d45b9d"
dependencies = [
 "typenum",
]

[[package]]
name = "generic-array"
version = "0.12.3"
@@ -923,12 +851,12 @@ checksum = "644f9158b2f133fd50f5fb3242878846d9eb792e445c893805ff0e3824006e35"

[[package]]
name = "hmac"
version = "0.6.3"
version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "733e1b3ac906631ca01ebb577e9bb0f5e37a454032b9036b5eaea4013ed6f99a"
checksum = "126888268dcc288495a26bf004b38c5fdbb31682f992c84ceb046a1f0fe38840"
dependencies = [
 "crypto-mac 0.6.2",
 "digest 0.7.6",
 "crypto-mac 0.8.0",
 "digest 0.9.0",
]

[[package]]
@@ -1051,15 +979,15 @@ dependencies = [

[[package]]
name = "keybob"
version = "0.3.1"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "66280a6a4d9a4d9e4a91170f178b242c34dd9c4ad76d58ae968b56861236071b"
checksum = "ae8038be446bbffb5bebe247ab05a1b1cb4c33363e204102a01e44f5933e7451"
dependencies = [
 "base64 0.9.3",
 "blake2 0.7.1",
 "base64 0.12.3",
 "blake2 0.9.1",
 "hmac",
 "pbkdf2",
 "rand 0.5.6",
 "rand 0.7.3",
 "serde",
 "serde_derive",
]
@@ -1451,18 +1379,17 @@ dependencies = [

[[package]]
name = "pbkdf2"
version = "0.2.3"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c09cddfbfc98de7f76931acf44460972edb4023eb14d0c6d4018800e552d8e0"
checksum = "216eaa586a190f0a738f2f918511eecfa90f13295abec0e457cdebcceda80cbd"
dependencies = [
 "base64 0.9.3",
 "byteorder",
 "constant_time_eq",
 "crypto-mac 0.6.2",
 "generic-array 0.9.0",
 "base64 0.12.3",
 "crypto-mac 0.8.0",
 "hmac",
 "rand 0.5.6",
 "sha2 0.7.1",
 "rand 0.7.3",
 "rand_core 0.5.1",
 "sha2",
 "subtle 2.4.0",
]

[[package]]
@@ -1731,19 +1658,6 @@ dependencies = [
 "proc-macro2",
]

[[package]]
name = "rand"
version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9"
dependencies = [
 "cloudabi",
 "fuchsia-cprng",
 "libc",
 "rand_core 0.3.1",
 "winapi 0.3.9",
]

[[package]]
name = "rand"
version = "0.7.3"
@@ -1789,21 +1703,6 @@ dependencies = [
 "rand_core 0.6.2",
]

[[package]]
name = "rand_core"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
dependencies = [
 "rand_core 0.4.2",
]

[[package]]
name = "rand_core"
version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"

[[package]]
name = "rand_core"
version = "0.5.1"
@@ -2023,12 +1922,6 @@ version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"

[[package]]
name = "safemem"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072"

[[package]]
name = "same-file"
version = "1.0.6"
@@ -2075,25 +1968,13 @@ dependencies = [
 "serde",
]

[[package]]
name = "sha2"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9eb6be24e4c23a84d7184280d2722f7f2731fcdd4a9d886efbfe4413e4847ea0"
dependencies = [
 "block-buffer 0.3.3",
 "byte-tools 0.2.0",
 "digest 0.7.6",
 "fake-simd",
]

[[package]]
name = "sha2"
version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa827a14b29ab7f44778d14a88d3cb76e949c45083f7dbfa507d0cb699dc12de"
dependencies = [
 "block-buffer 0.9.0",
 "block-buffer",
 "cfg-if 1.0.0",
 "cpuid-bool",
 "digest 0.9.0",
diff --git a/utils/alexandria/Cargo.toml b/utils/alexandria/Cargo.toml
index 70697f43..5e37d55b 100644
--- a/utils/alexandria/Cargo.toml
+++ b/utils/alexandria/Cargo.toml
@@ -17,7 +17,7 @@ bincode = "1.0"
chrono = { version = "0.4", features = ["serde"] }
thiserror = "1.0"
hex = "0.4"
keybob = "0.3"
keybob = "0.4"
serde = { version = "1.0", features = ["derive", "rc"] }
sodiumoxide = "0.2.5"
tracing = "0.1"
-- 
2.30.0