breaking sqlcipher usage update

CHANGELOG.md

@@ -1,7 +1,13 @@
-# 20210727.145430
+## 0.5.0
 
-## [lair\_keystore\_client-0.0.2](crates/lair_keystore_client/CHANGELOG.md#0.0.2)
+- breaking sqlcipher update for ios compatibility
 
-## [lair\_keystore-0.0.2](crates/lair_keystore/CHANGELOG.md#0.0.2)
+## 0.4.1
 
-## [lair\_keystore\_api-0.0.2](crates/lair_keystore_api/CHANGELOG.md#0.0.2)
+- Add a way to migrate unencrypted databases to encrypted by providing an environment variable `LAIR_MIGRATE_UNENCRYPTED="true"`, Lair will detect databases which can't be opened and attempt migration. #121
+
+# 0.4.0
+
+- pin serde and rmp-serde #119
+
+## 0.0.2

Cargo.toml

@@ -16,7 +16,7 @@ futures = "0.3.28"
 # determinism of the strict client/server version checks
 hc_seed_bundle = { version = "=0.2.4", path = "./crates/hc_seed_bundle" }
 # lair_keystore_api must be pinned to enable strict version checks
-lair_keystore_api = { version = "=0.4.5", path = "./crates/lair_keystore_api" }
+lair_keystore_api = { version = "=0.5.0", path = "./crates/lair_keystore_api" }
 lru = "0.12.3"
 nanoid = "0.4.0"
 one_err = "0.0.8"
@@ -27,7 +27,7 @@ rcgen = { version = "0.10.0", features = [ "zeroize" ] }
 rmp-serde = "1.3.0"
 rmpv = { version = "1.3.0", features = [ "with-serde" ] }
 rpassword = "7.2.0"
-rusqlite = { version = "0.31", features = [ "modern_sqlite" ] }
+rusqlite = { version = "0.32.1", features = [ "modern_sqlite" ] }
 serde = { version = "1", features = [ "derive", "rc" ] }
 serde_bytes = "0.11.9"
 serde_json = "1"

README.md

@@ -32,8 +32,7 @@ lair_keystore = "0.1.1"
 - Library usage with underscores:
 
 ```rust
-use lair_keystore::create_sql_pool_factory;
-let _sqlite_store_factory = create_sql_pool_factory(".");
+use lair_keystore::*;
 ```
 
 ## `lair-keystore` commandline executable usage:
@@ -43,7 +42,7 @@ License: MIT OR Apache-2.0
 
 ### `lair-keystore --help`
 ```text
-lair_keystore 0.4.5
+lair_keystore 0.5.0
 secret lair private keystore
 
 USAGE:
@@ -74,7 +73,7 @@ SUBCOMMANDS:
 ```
 ### `lair-keystore init --help`
 ```text
-lair-keystore-init 0.4.5
+lair-keystore-init 0.5.0
 Set up a new lair private keystore.
 
 USAGE:
@@ -92,7 +91,7 @@ FLAGS:
 ```
 ### `lair-keystore url --help`
 ```text
-lair-keystore-url 0.4.5
+lair-keystore-url 0.5.0
 Print the connection_url for a configured lair-keystore
 server to stdout and exit.
 
@@ -106,7 +105,7 @@ FLAGS:
 ```
 ### `lair-keystore import-seed --help`
 ```text
-lair-keystore-import-seed 0.4.5
+lair-keystore-import-seed 0.5.0
 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 +142,7 @@ ARGS:
 ```
 ### `lair-keystore server --help`
 ```text
-lair-keystore-server 0.4.5
+lair-keystore-server 0.5.0
 Run a lair keystore server instance. Note you must
 have initialized a config file first with
 'lair-keystore init'.

crates/hc_seed_bundle/README.md

@@ -18,19 +18,19 @@ SeedBundle parsing and generation library.
 #### Rationale
 
 - Applications like Holochain have different requirements than classic
-blockchain systems in terms of key management. Namely there is no need
-for read-only or hardened wallets (Holochain handles these concepts
-through capabilities and membranes).
+  blockchain systems in terms of key management. Namely there is no need
+  for read-only or hardened wallets (Holochain handles these concepts
+  through capabilities and membranes).
 - Applications like Holochain still have need of hierarchy and determinism
-in key (or in this case seed) derivation.
+  in key (or in this case seed) derivation.
 - Since we're using libsodium for hashing, signature, and encryption
-algorithms, let's use it for derivation as well.
+  algorithms, let's use it for derivation as well.
 - To be psychologically compatible with the
-[Bitcoin "HD Wallet" spec](https://github.com/bitcoin/bips/blob/master/bip-0032.mediawiki),
-we will do away with the "context" part of sodium KDF by always setting
-it to `b"SeedBndl"` and focusing on the `subkey_id` and can declare a
-chain of subsequent derivations of a 32 byte seed in the form
-`m/68/1/65/8` where we apply `subkey_id`s 68, 1, 65, then 8 in turn.
+  [Bitcoin "HD Wallet" spec](https://github.com/bitcoin/bips/blob/master/bip-0032.mediawiki),
+  we will do away with the "context" part of sodium KDF by always setting
+  it to `b"SeedBndl"` and focusing on the `subkey_id` and can declare a
+  chain of subsequent derivations of a 32 byte seed in the form
+  `m/68/1/65/8` where we apply `subkey_id`s 68, 1, 65, then 8 in turn.
 
 #### hcSeedBundle Encoding Spec
 

crates/hc_seed_bundle/src/lib.rs

@@ -23,19 +23,19 @@
 //! ### Rationale
 //!
 //! - Applications like Holochain have different requirements than classic
-//! blockchain systems in terms of key management. Namely there is no need
-//! for read-only or hardened wallets (Holochain handles these concepts
-//! through capabilities and membranes).
+//!   blockchain systems in terms of key management. Namely there is no need
+//!   for read-only or hardened wallets (Holochain handles these concepts
+//!   through capabilities and membranes).
 //! - Applications like Holochain still have need of hierarchy and determinism
-//! in key (or in this case seed) derivation.
+//!   in key (or in this case seed) derivation.
 //! - Since we're using libsodium for hashing, signature, and encryption
-//! algorithms, let's use it for derivation as well.
+//!   algorithms, let's use it for derivation as well.
 //! - To be psychologically compatible with the
-//! [Bitcoin "HD Wallet" spec](https://github.com/bitcoin/bips/blob/master/bip-0032.mediawiki),
-//! we will do away with the "context" part of sodium KDF by always setting
-//! it to `b"SeedBndl"` and focusing on the `subkey_id` and can declare a
-//! chain of subsequent derivations of a 32 byte seed in the form
-//! `m/68/1/65/8` where we apply `subkey_id`s 68, 1, 65, then 8 in turn.
+//!   [Bitcoin "HD Wallet" spec](https://github.com/bitcoin/bips/blob/master/bip-0032.mediawiki),
+//!   we will do away with the "context" part of sodium KDF by always setting
+//!   it to `b"SeedBndl"` and focusing on the `subkey_id` and can declare a
+//!   chain of subsequent derivations of a 32 byte seed in the form
+//!   `m/68/1/65/8` where we apply `subkey_id`s 68, 1, 65, then 8 in turn.
 //!
 //! ### hcSeedBundle Encoding Spec
 //!

crates/lair_keystore/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "lair_keystore"
-version = "0.4.5"
+version = "0.5.0"
 description = "secret lair private keystore"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/holochain/lair"

crates/lair_keystore/README.md

@@ -32,8 +32,7 @@ lair_keystore = "0.1.1"
 - Library usage with underscores:
 
 ```rust
-use lair_keystore::create_sql_pool_factory;
-let _sqlite_store_factory = create_sql_pool_factory(".");
+use lair_keystore::*;
 ```
 
 ## `lair-keystore` commandline executable usage:
@@ -43,7 +42,7 @@ License: MIT OR Apache-2.0
 
 ### `lair-keystore --help`
 ```text
-lair_keystore 0.4.5
+lair_keystore 0.5.0
 secret lair private keystore
 
 USAGE:
@@ -74,7 +73,7 @@ SUBCOMMANDS:
 ```
 ### `lair-keystore init --help`
 ```text
-lair-keystore-init 0.4.5
+lair-keystore-init 0.5.0
 Set up a new lair private keystore.
 
 USAGE:
@@ -92,7 +91,7 @@ FLAGS:
 ```
 ### `lair-keystore url --help`
 ```text
-lair-keystore-url 0.4.5
+lair-keystore-url 0.5.0
 Print the connection_url for a configured lair-keystore
 server to stdout and exit.
 
@@ -106,7 +105,7 @@ FLAGS:
 ```
 ### `lair-keystore import-seed --help`
 ```text
-lair-keystore-import-seed 0.4.5
+lair-keystore-import-seed 0.5.0
 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 +142,7 @@ ARGS:
 ```
 ### `lair-keystore server --help`
 ```text
-lair-keystore-server 0.4.5
+lair-keystore-server 0.5.0
 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.5
+lair_keystore 0.5.0
 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.5
+lair-keystore-import-seed 0.5.0
 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.5
+lair-keystore-init 0.5.0
 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.5
+lair-keystore-server 0.5.0
 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.5
+lair-keystore-url 0.5.0
 Print the connection_url for a configured lair-keystore
 server to stdout and exit.
 

crates/lair_keystore/src/lib.rs

@@ -37,8 +37,7 @@
 //! - Library usage with underscores:
 //!
 //! ```
-//! use lair_keystore::create_sql_pool_factory;
-//! let _sqlite_store_factory = create_sql_pool_factory(".");
+//! use lair_keystore::*;
 //! ```
 //!
 //! # `lair-keystore` commandline executable usage:

crates/lair_keystore/src/server.rs

@@ -64,6 +64,7 @@ impl StandaloneServer {
         // construct our sqlite store factory
         let store_factory = crate::store_sqlite::create_sql_pool_factory(
             &self.config.store_file,
+            &self.config.database_salt,
         );
 
         // spawn the server