bump sodoken

Cargo.toml

@@ -6,6 +6,46 @@ members = [
   "crates/lair_keystore_api",
 ]
 
+[workspace.dependencies]
+assert_cmd = "2.0.11"
+base64 = "0.13.1"
+criterion = "0.4.0"
+dunce = "1.0.4"
+futures = "0.3.28"
+# this doesn't strictly need to be pinned, but it supports the
+# determinism of the strict client/server version checks
+hc_seed_bundle = { version = "=0.2.2", path = "./crates/hc_seed_bundle" }
+# lair_keystore_api must be pinned to enable strict version checks
+lair_keystore_api = { version = "=0.4.3", path = "./crates/lair_keystore_api" }
+lru = "0.10.0"
+nanoid = "0.4.0"
+one_err = "0.0.8"
+once_cell = "1.17.1"
+parking_lot = "0.12.1"
+pretty_assertions = "1.3.0"
+rcgen = { version = "0.10.0", features = [ "zeroize" ] }
+rmp-serde = "0.15"
+rmpv = { version = "=1.0.0", features = [ "with-serde" ] } # Version 1.0.1 requires Rust 1.70.0
+rpassword = "7.2.0"
+rusqlite = { version = "0.29", features = [ "modern_sqlite" ] }
+serde = { version = "1", features = [ "derive", "rc" ] }
+serde_bytes = "0.11.9"
+serde_json = "1"
+serde_yaml = "0.9.21"
+sodoken = "=0.0.10"
+sqlformat = "0.2.1"
+structopt = "0.3.26"
+sysinfo = "0.28.4"
+tempdir = "0.3.7"
+time = "=0.3.23" # Pinned to prevent rvgen pulling in ^0.2.25 which doesn't build on Rust 1.66.1
+tokio = { version = "1.35.1" }
+toml = "0.7.3"
+tracing = "0.1.37"
+tracing-subscriber = { version = "0.3.17", features = [ "env-filter" ] }
+url = { version = "2.3.1", features = [ "serde" ] }
+winapi = { version = "0.3.9", features = ["winerror"] }
+zeroize = "1.6.0"
+
 [patch.crates-io]
 #one_err = { path = "../one_err" }
 #sodoken = { path = "../sodoken/crates/sodoken" }

README.md

@@ -43,7 +43,7 @@ License: MIT OR Apache-2.0
 
 ### `lair-keystore --help`
 ```text
-lair_keystore 0.4.2
+lair_keystore 0.4.3
 secret lair private keystore
 
 USAGE:
@@ -74,7 +74,7 @@ SUBCOMMANDS:
 ```
 ### `lair-keystore init --help`
 ```text
-lair-keystore-init 0.4.2
+lair-keystore-init 0.4.3
 Set up a new lair private keystore.
 
 USAGE:
@@ -92,7 +92,7 @@ FLAGS:
 ```
 ### `lair-keystore url --help`
 ```text
-lair-keystore-url 0.4.2
+lair-keystore-url 0.4.3
 Print the connection_url for a configured lair-keystore
 server to stdout and exit.
 
@@ -106,7 +106,7 @@ FLAGS:
 ```
 ### `lair-keystore import-seed --help`
 ```text
-lair-keystore-import-seed 0.4.2
+lair-keystore-import-seed 0.4.3
 Load a seed bundle into this lair-keystore instance.
 Note, this operation requires capturing the pid_file,
 make sure you do not have a lair-server running.
@@ -143,7 +143,7 @@ ARGS:
 ```
 ### `lair-keystore server --help`
 ```text
-lair-keystore-server 0.4.2
+lair-keystore-server 0.4.3
 Run a lair keystore server instance. Note you must
 have initialized a config file first with
 'lair-keystore init'.

crates/hc_seed_bundle/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "hc_seed_bundle"
-version = "0.2.1"
+version = "0.2.2"
 description = "SeedBundle parsing and generation library."
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/holochain/lair"
@@ -11,15 +11,15 @@ categories = [ "cryptography" ]
 edition = "2018"
 
 [dependencies]
-futures = "0.3.28"
-one_err = "0.0.8"
-rmp-serde = "0.15"
-rmpv = { version = "=1.0.0", features = [ "with-serde" ] } # Version 1.0.1 requires Rust 1.70.0
-serde = { version = "1", features = [ "derive", "rc" ] }
-serde_bytes = "0.11.9"
-sodoken = "=0.0.9"
+futures = { workspace = true }
+one_err = { workspace = true }
+rmp-serde = { workspace = true }
+rmpv = { workspace = true } # Version 1.0.1 requires Rust 1.70.0
+serde = { workspace = true }
+serde_bytes = { workspace = true }
+sodoken = { workspace = true }
 
 [dev-dependencies]
-base64 = "0.13.1"
-serde_json = "1"
-tokio = { version = "1.27.0", features = [ "full" ] }
+base64 = { workspace = true }
+serde_json = { workspace = true }
+tokio = { workspace = true, features = [ "full" ] }

crates/lair_keystore/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "lair_keystore"
-version = "0.4.2"
+version = "0.4.3"
 description = "secret lair private keystore"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/holochain/lair"
@@ -19,21 +19,21 @@ rusqlite-sqlcipher = [ "rusqlite/sqlcipher" ]
 
 [dependencies]
 # lair_keystore_api must be pinned to enable strict version checks
-lair_keystore_api = { version = "=0.4.2", path = "../lair_keystore_api" }
-rpassword = "7.2.0"
-rusqlite = { version = "0.29", features = [ "modern_sqlite" ] }
-structopt = "0.3.26"
-sysinfo = "0.28.4"
-tracing-subscriber = { version = "0.3.17", features = [ "env-filter" ] }
+lair_keystore_api = { workspace = true }
+rpassword = { workspace = true }
+rusqlite = { workspace = true }
+structopt = { workspace = true }
+sysinfo = { workspace = true }
+tracing-subscriber = { workspace = true }
 
 [build-dependencies]
-lair_keystore_api = { version = "0.4.2", path = "../lair_keystore_api" }
-pretty_assertions = "1.3.0"
-sqlformat = "0.2.1"
+lair_keystore_api = { workspace = true }
+pretty_assertions = { workspace = true }
+sqlformat = { workspace = true }
 
 [dev-dependencies]
-criterion = "0.4.0"
-tempdir = "0.3.7"
+criterion = { workspace = true }
+tempdir = { workspace = true }
 
 [lib]
 name = "lair_keystore"

crates/lair_keystore/README.md

@@ -43,7 +43,7 @@ License: MIT OR Apache-2.0
 
 ### `lair-keystore --help`
 ```text
-lair_keystore 0.4.2
+lair_keystore 0.4.3
 secret lair private keystore
 
 USAGE:
@@ -74,7 +74,7 @@ SUBCOMMANDS:
 ```
 ### `lair-keystore init --help`
 ```text
-lair-keystore-init 0.4.2
+lair-keystore-init 0.4.3
 Set up a new lair private keystore.
 
 USAGE:
@@ -92,7 +92,7 @@ FLAGS:
 ```
 ### `lair-keystore url --help`
 ```text
-lair-keystore-url 0.4.2
+lair-keystore-url 0.4.3
 Print the connection_url for a configured lair-keystore
 server to stdout and exit.
 
@@ -106,7 +106,7 @@ FLAGS:
 ```
 ### `lair-keystore import-seed --help`
 ```text
-lair-keystore-import-seed 0.4.2
+lair-keystore-import-seed 0.4.3
 Load a seed bundle into this lair-keystore instance.
 Note, this operation requires capturing the pid_file,
 make sure you do not have a lair-server running.
@@ -143,7 +143,7 @@ ARGS:
 ```
 ### `lair-keystore server --help`
 ```text
-lair-keystore-server 0.4.2
+lair-keystore-server 0.4.3
 Run a lair keystore server instance. Note you must
 have initialized a config file first with
 'lair-keystore init'.

crates/lair_keystore/src/docs/help.md

@@ -1,6 +1,6 @@
 ### `lair-keystore --help`
 ```text
-lair_keystore 0.4.2
+lair_keystore 0.4.3
 secret lair private keystore
 
 USAGE:

crates/lair_keystore/src/docs/import-seed-help.md

@@ -1,6 +1,6 @@
 ### `lair-keystore import-seed --help`
 ```text
-lair-keystore-import-seed 0.4.2
+lair-keystore-import-seed 0.4.3
 Load a seed bundle into this lair-keystore instance.
 Note, this operation requires capturing the pid_file,
 make sure you do not have a lair-server running.

crates/lair_keystore/src/docs/init-help.md

@@ -1,6 +1,6 @@
 ### `lair-keystore init --help`
 ```text
-lair-keystore-init 0.4.2
+lair-keystore-init 0.4.3
 Set up a new lair private keystore.
 
 USAGE:

crates/lair_keystore/src/docs/server-help.md

@@ -1,6 +1,6 @@
 ### `lair-keystore server --help`
 ```text
-lair-keystore-server 0.4.2
+lair-keystore-server 0.4.3
 Run a lair keystore server instance. Note you must
 have initialized a config file first with
 'lair-keystore init'.

crates/lair_keystore/src/docs/url-help.md

@@ -1,6 +1,6 @@
 ### `lair-keystore url --help`
 ```text
-lair-keystore-url 0.4.2
+lair-keystore-url 0.4.3
 Print the connection_url for a configured lair-keystore
 server to stdout and exit.
 

crates/lair_keystore_api/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "lair_keystore_api"
-version = "0.4.2"
+version = "0.4.3"
 description = "secret lair private keystore API library"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/holochain/lair"
@@ -11,33 +11,31 @@ categories = [ "cryptography" ]
 edition = "2018"
 
 [dependencies]
-base64 = "0.13.1"
-dunce = "1.0.4"
-# this doesn't strictly need to be pinned, but it supports the
-# determinism of the strict client/server version checks
-hc_seed_bundle = { version = "=0.2.1", path = "../hc_seed_bundle" }
-lru = "0.10.0"
-nanoid = "0.4.0"
-once_cell = "1.17.1"
-parking_lot = "0.12.1"
-rcgen = { version = "0.10.0", features = [ "zeroize" ] }
-time = "=0.3.23" # Pinned to prevent rvgen pulling in ^0.2.25 which doesn't build on Rust 1.66.1
-serde = { version = "1", features = [ "derive", "rc" ] }
-serde_json = "1"
-serde_yaml = "0.9.21"
-tokio = { version = "1.27.0", features = [ "full" ] }
-toml = "0.7.3"
-tracing = "0.1.37"
-url = { version = "2.3.1", features = [ "serde" ] }
-zeroize = "1.6.0"
+base64 = { workspace = true }
+dunce = { workspace = true }
+hc_seed_bundle = { workspace = true }
+lru = { workspace = true }
+nanoid = { workspace = true }
+once_cell = { workspace = true }
+parking_lot = { workspace = true }
+rcgen = { workspace = true }
+time = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+serde_yaml = { workspace = true }
+tokio = { workspace = true, features = [ "full" ] }
+toml = { workspace = true }
+tracing = { workspace = true }
+url = { workspace = true }
+zeroize = { workspace = true }
 
 [target.'cfg(windows)'.dependencies]
-winapi = { version = "0.3.9", features = ["winerror"] }
+winapi = { workspace = true }
 
 [dev-dependencies]
-assert_cmd = "2.0.11"
-tempdir = "0.3.7"
-tracing-subscriber = { version = "0.3.17", features = [ "env-filter" ] }
+assert_cmd = { workspace = true }
+tempdir = { workspace = true }
+tracing-subscriber = { workspace = true }
 
 [build-dependencies]
-toml = "0.5.8"
+toml = { workspace = true }