From 985f6f664bed0c064a68ca45845375a503e125fa Mon Sep 17 00:00:00 2001
From: shimun <shimun@shimun.net>
Date: Fri, 25 Sep 2020 01:19:47 +0200
Subject: [PATCH] include password

---
 src/lib.rs | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index edd24c9..f4d7867 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -79,13 +79,16 @@ impl PamFido2Luks {
                 .collect();
             let credentials: Vec<&FidoCredential> = credentials.iter().collect();
             if !credentials.is_empty() {
-                let secret = util::sha256(&[&perform_challenge(
-                    &credentials[..],
-                    &util::sha256(&[password.as_bytes()]),
-                    Duration::from_secs(15),
-                    pin.map(AsRef::as_ref),
-                )?
-                .0[..]]);
+                let secret = util::sha256(&[
+                    password.as_bytes(),
+                    &perform_challenge(
+                        &credentials[..],
+                        &util::sha256(&[password.as_bytes()]),
+                        Duration::from_secs(15),
+                        pin.map(AsRef::as_ref),
+                    )?
+                    .0[..],
+                ]);
                 device.activate(name.as_str(), &secret[..], None)?;
             } else {
                 unimplemented!("custom error")
@@ -112,11 +115,11 @@ impl PamServiceModule for PamFido2Luks {
                 Ok(_) => PamError::SUCCESS,
                 Err(e) => match e {
                     //TODO: output more detailed error
-                    _ => dbg!(PamError::AUTH_ERR),
+                    _ => PamError::AUTH_ERR,
                 },
             }
         } else {
-            dbg!(PamError::AUTH_ERR)
+            PamError::AUTH_ERR
         }
     }
 }