Merge pull request #12 from Komplementariteten/perp_v0.1

- Test Fixes

Author: Komplementariteten

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rs-pwsafe"
-version = "0.0.6"
+version = "0.0.7"
 edition = "2021"
 description = "A readonly implementation of the pwsafe file format"
 readme = "README.md"

src/bin/pw-safe-lookup.rs

@@ -32,11 +32,9 @@ fn main() {
         }
     };
 
-    /* println!("Please enter the pw-safe password:");
+    println!("Please enter the pw-safe password:");
     let mut pw_str = String::new();
-    let _ = io::stdin().read_line(&mut pw_str); */
-    let pw_str = "PswSafe123".to_string();
-
+    let _ = io::stdin().read_line(&mut pw_str);
 
     match file.unlock(&pw_str.trim()) {
         Ok(_) => (),

src/lib.rs

@@ -2,6 +2,8 @@
 //!
 //! A libary to read pw-safe files and decrypt them
 //! currently only version 3 is supported
+extern crate core;
+
 mod pwsfile;
 pub mod pwserrors;
 pub mod pwsdb;

src/pwsdb/mod.rs

@@ -192,12 +192,14 @@ mod tests {
         let mut safe = PwSafeEncrypted::new();
         assert!(safe.check_format(&data_buf).is_ok());
         assert!(safe.load(&data_buf).is_ok());
-        let pt = match safe.unlock("PswSafe123".to_string()) {
+        let pt = match safe.prepare_db("PswSafe123".to_string()) {
+            Ok(d) => d,
+            Err(e) => panic!("{:?}", e)
+        };
+        let db: PwDb = match pt.try_into() {
             Ok(d) => d,
             Err(e) => panic!("{:?}", e)
         };
-        let mut db = PwDb::new();
-        let _ = db.load(pt);
         assert!(db.header.len() > 0);
     }
 }