Removing deprecated crypto engine functions (see 9ceda952)

4 files changed, 5 insertions, 55 deletions

diff --git a/lockchain-core/src/init.rs b/lockchain-core/src/init.rs
index 8fa2ccc..a8bce11 100644
--- a/lockchain-core/src/init.rs
+++ b/lockchain-core/src/init.rs
@@ -6,7 +6,7 @@ use serde::{Deserialize, Serialize};
 ///
 /// ---
 ///
-/// **Important Note** Because lockchain-core doesn't make assumptions about
+/// **Important Note** Because lockchain-core doesn't make assumptions
 /// about the existence of a cryptographic layer, the `UserStore` that
 /// handles these secrets assumes they are **not** secret!
 ///
diff --git a/lockchain-crypto/src/databody.rs b/lockchain-crypto/src/databody.rs
index 8f780f1..b5faed6 100644
--- a/lockchain-crypto/src/databody.rs
+++ b/lockchain-crypto/src/databody.rs
@@ -10,6 +10,7 @@ use crate::lcc::Payload;
 use serde::{Deserialize, Serialize};
 use std::collections::BTreeMap;
 
+/// A clear-text representation of a record
 #[derive(Serialize, Deserialize)]
 pub struct DataBody {
     tree: BTreeMap<String, Payload>,
diff --git a/lockchain-crypto/src/engine.rs b/lockchain-crypto/src/engine.rs
index 66b22e4..bf92634 100644
--- a/lockchain-crypto/src/engine.rs
+++ b/lockchain-crypto/src/engine.rs
@@ -14,7 +14,7 @@ impl Encryptable for DataBody {}
 
 pub struct AesEngine {
     ctx: Aes256SivAead,
-    _key: Option<Key>,
+    key: Key,
     iv: Vec<u8>,
 }
 
@@ -25,62 +25,11 @@ impl AesEngine {
 
         Self {
             ctx: Aes256SivAead::new(&key.as_slice()),
-            _key: Some(key),
             iv: random::bytes(64),
+            key,
         }
     }
 
-    /// Generate new key and encryption engine
-    #[deprecated]
-    pub fn generate() -> Self {
-        // let key = Key::new(KeyType::Aes256);
-        // let len = key.len();
-        // Self {
-        //     ctx: Aes256Siv::new(&key.as_slice()),
-        //     _key: key,
-        //     new_key: None,
-        //     iv: random::bytes(len),
-        // }
-        unimplemented!()
-    }
-
-    /// Generate an Aes context from password
-    #[deprecated]
-    pub fn from_pw(_pw: &str, _salt: &str) -> Self {
-        // let key = Key::from_pw(KeyType::Aes256, pw, salt);
-        // let len = key.len();
-        // Self {
-        //     ctx: Aes256Siv::new(&key.as_slice()),
-        //     _key: key,
-        //     new_key: None,
-        //     iv: random::bytes(len),
-        // }
-        unimplemented!()
-    }
-
-    /// Load a packed data object which contains an Aes context
-    #[deprecated]
-    pub fn load(_packed: PackedData, _pw: &str, _salt: &str) -> Option<Self> {
-        // let mut temp = Self::from_pw(pw, salt);
-        // let k: Key = Key::decode(&String::from_utf8(temp.decrypt_primitive(&packed)?).ok()?).ok()?;
-
-        // Some(Self {
-        //     ctx: Aes256Siv::new(&k.as_slice()),
-        //     _key: k,
-        //     new_key: None,
-        //     iv: packed.iv,
-        // })
-        unimplemented!()
-    }
-
-    /// Serialise the current context to save it somewhere
-    #[deprecated]
-    pub fn save(&mut self) -> PackedData {
-        // let k = self._key.as_slice().into();
-        // self.encrypt_primitive(&k)
-        unimplemented!()
-    }
-
     fn encrypt_primitive(&mut self, data: &Vec<u8>) -> PackedData {
         let nonce = random::bytes(64);
         let iv = &self.iv.as_slice();
diff --git a/lockchain-crypto/src/keyfold.rs b/lockchain-crypto/src/keyfold.rs
index 363ccab..a7bee74 100644
--- a/lockchain-crypto/src/keyfold.rs
+++ b/lockchain-crypto/src/keyfold.rs
@@ -29,7 +29,7 @@ impl Keyfold {
         self.engine = Some(engine);
     }
 
-    /// Return ownership o the AesEngine
+    /// Return ownership of the AesEngine
     pub fn end(mut self) -> AesEngine {
         let engine = self.engine.unwrap();
         self.engine = None;