feat: switch back to mainline keepass-rs

louib · Dec 31, 2023 · 34cb807 · 34cb807
1 parent 47d4160
commit 34cb807
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 14 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -22,11 +22,11 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 
 # Formats
-# keepass = { version = "0.6", features = ["save_kdbx4", "totp"] }
+keepass = { version = "0.6", features = ["save_kdbx4", "totp"] }
 aegis-vault = "*"
 
-[dependencies.keepass]
-git = "https://github.com/sseemayer/keepass-rs"
-branch = "public-totp-fields"
+# [dependencies.keepass]
+# git = "https://github.com/sseemayer/keepass-rs"
+# branch = "public-totp-fields"
 # path = "../keepass-rs"
-features = ["save_kdbx4", "totp"]
+# features = ["save_kdbx4", "totp"]
diff --git a/flake.nix b/flake.nix
@@ -45,11 +45,11 @@
 
               cargoLock = {
                 lockFile = ./Cargo.lock;
-                outputHashes = {
-                  # This hash need to be updated everytime you bump the version of the keepass-rs
-                  # library.
-                  "keepass-0.0.0-placeholder-version" = "sha256-QH9j2pLhx6p/HiGd6b5YoUePFuZGy5nbX7H+UNpVUeU=";
-                };
+                # outputHashes = {
+                # This hash need to be updated everytime you bump the version of the keepass-rs
+                # library.
+                # "keepass-0.0.0-placeholder-version" = "sha256-QH9j2pLhx6p/HiGd6b5YoUePFuZGy5nbX7H+UNpVUeU=";
+                # };
               };
 
               meta = with pkgs.lib; {

diff --git a/src/aegis.rs b/src/aegis.rs
@@ -48,8 +48,8 @@ fn export_entry(entry: &keepass::db::Entry) -> Option<Entry> {
         let mut aegis_entry = Entry::default();
         aegis_entry.method = Method::TOTP;
         aegis_entry.label = entry_title.to_string();
-        aegis_entry.issuer = Some(totp.issuer);
-        aegis_entry.info.secret = keepass::db::TOTP::dump_secret(&totp.secret);
+        aegis_entry.issuer = Some(totp.issuer.clone());
+        aegis_entry.info.secret = totp.get_secret();
         aegis_entry.info.period = Some(totp.period.try_into().unwrap());
         aegis_entry.info.digits = totp.digits;
         aegis_entry.info.counter = None;