Fixing an issue with the lockchain-core crypto API

6 files changed, 11 insertions, 12 deletions

diff --git a/Cargo.lock b/Cargo.lock
index e3caabd..1f48669 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -527,12 +527,11 @@ version = "0.0.0"
 [[package]]
 name = "lockchain-core"
 version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "base64 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "bcrypt 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "blake2 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "chrono 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -540,12 +539,13 @@ dependencies = [
 
 [[package]]
 name = "lockchain-core"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+version = "0.4.0"
 dependencies = [
  "base64 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "bcrypt 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "blake2 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "chrono 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -555,7 +555,7 @@ dependencies = [
 name = "lockchain-crypto"
 version = "0.1.0"
 dependencies = [
- "lockchain-core 0.3.2",
+ "lockchain-core 0.4.0",
  "miscreant 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/lockchain-core/Cargo.toml b/lockchain-core/Cargo.toml
index 4cccf54..a46e26c 100644
--- a/lockchain-core/Cargo.toml
+++ b/lockchain-core/Cargo.toml
@@ -5,7 +5,7 @@ documentation = "https://docs.rs/lockchain-core"
 homepage = "https://github.com/spacekookie/lockchain/tree/master/lockchain-core"
 readme = "README.md"
 license = "MIT/X11 OR Apache-2.0"
-version = "0.4.0"
+version = "0.4.1"
 authors = ["Katharina Fey <kookie@spacekookie.de>"]
 
 [dependencies]
diff --git a/lockchain-core/src/crypto.rs b/lockchain-core/src/crypto.rs
index 6144e01..b00f79a 100644
--- a/lockchain-core/src/crypto.rs
+++ b/lockchain-core/src/crypto.rs
@@ -6,5 +6,5 @@
 mod keys;
 mod utils;
 
-pub use self::keys::Key;
+pub use self::keys::{Key, KEY_LENGTH};
 pub use self::utils::*;
\ No newline at end of file
diff --git a/lockchain-crypto/Cargo.toml b/lockchain-crypto/Cargo.toml
index a347eea..2e780e0 100644
--- a/lockchain-crypto/Cargo.toml
+++ b/lockchain-crypto/Cargo.toml
@@ -9,7 +9,7 @@ version = "0.1.0"
 authors = ["Katharina Fey <kookie@spacekookie.de>"]
 
 [dependencies]
-lockchain-core = { version = ">=0.3.2", path = "../lockchain-core" }
+lockchain-core = { version = ">=0.4", path = "../lockchain-core" }
 serde_derive = "1.0"
 serde = "1.0"
 
diff --git a/lockchain-crypto/src/engine.rs b/lockchain-crypto/src/engine.rs
index 388f4cc..d9664bb 100644
--- a/lockchain-crypto/src/engine.rs
+++ b/lockchain-crypto/src/engine.rs
@@ -6,8 +6,9 @@ use miscreant::aead::{Aes256Siv, Algorithm};
 
 use super::data::PackedData;
 use super::databody::DataBody;
-use super::{keys::{Key, KEY_LENGTH},
-            utils::random};
+
+use lcc::crypto::{Key, keys::KEY_LENGTH};
+use lcc::crypto::utils::random;
 
 use std::collections::BTreeMap;
 
diff --git a/lockchain-crypto/src/lib.rs b/lockchain-crypto/src/lib.rs
index e4c5366..b10b2c5 100644
--- a/lockchain-crypto/src/lib.rs
+++ b/lockchain-crypto/src/lib.rs
@@ -14,8 +14,6 @@ extern crate lockchain_core as lcc;
 
 mod databody;
 mod engine;
-mod keys;
-mod utils;
 mod data;
 
 pub use databody::*;