readme

.drone.yml

@@ -8,20 +8,22 @@ steps:
      -  rustup component add rustfmt
      -  cargo fmt --all -- --check
  - name: test
-   image: shimun/fido2luks@sha256:6d0b4017bffbec5fac8f25d383d68671fcc9930efb02e97ce5ea81acf0060ece
+   image: rust:1.43.0
-   environment:
-    DEBIAN_FRONTEND: noninteractive
    commands:
-    - cargo test --locked
+    - apt update && apt install -y libkeyutils-dev libclang-dev clang pkg-config  
+    - echo 'deb http://http.us.debian.org/debian unstable main non-free contrib' >> /etc/apt/sources.list.d/unstable.list && apt update && apt install -y libcryptsetup-dev
+    - cargo test
+
  - name: publish
-   image: shimun/fido2luks@sha256:6d0b4017bffbec5fac8f25d383d68671fcc9930efb02e97ce5ea81acf0060ece
+   image: rust:1.43.0
    environment:
-    DEBIAN_FRONTEND: noninteractive
     CARGO_REGISTRY_TOKEN:
      from_secret: cargo_tkn
    commands:
     - grep -E 'version ?= ?"${DRONE_TAG}"' -i Cargo.toml || (printf "incorrect crate/tag version" && exit 1)
-    - cargo package --all-features --allow-dirty
+    - apt update && apt install -y libkeyutils-dev libclang-dev clang pkg-config  
-    - cargo publish --all-features --allow-dirty
+    - echo 'deb http://http.us.debian.org/debian unstable main non-free contrib' >> /etc/apt/sources.list.d/unstable.list && apt update && apt install -y libcryptsetup-dev
+    - cargo package --all-features
+    - cargo publish --all-features
    when:
     event: tag

.gitignore

@@ -2,9 +2,3 @@
 **/*.rs.bk
 .idea/
 *.iml
-fido2luks.bash
-fido2luks.elv
-fido2luks.fish
-fido2luks.zsh
-result
-result-*

CHANGELOG.md

@@ -1,11 +0,0 @@
-## 0.3.0
-
-* LUKS2 Tokens are now supported by every subcommand
-* `<credential>` has been converted into the flag `--creds`  
-credentials provided by `--creds` will be supplemented from the LUKS header unless this is disabled by `--disable-token`
-* `fido2luks add-key` will take an `--auto-cred` flag which allows for credentials to be generated and stored without having to use `fido2luks credential`  
-`fido2luks replace-key` will allow for credentials to be removed using the `--remove-cred` flag respectively 
-* Removed `fido2luks open-token` subcommand  
-  `fido2luks open` now fulfills both functions
-* Added `fido2luks open --dry-run` flag, to perform the whole procedure apart from mounting the LUKS volume
-* Added an `--verbose` flag to display additional information like credentials and keyslots used if desired

Cargo.lock

@@ -1,25 +1,10 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-[[package]]
-name = "addr2line"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b6a2d3371669ab3ca9797670853d61402b03d0b4b9ebf33d677dfa720203072"
-dependencies = [
- "gimli",
-]
-
-[[package]]
-name = "adler"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e"
-
 [[package]]
 name = "aho-corasick"
-version = "0.7.13"
+version = "0.7.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86"
+checksum = "8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada"
 dependencies = [
  "memchr",
 ]
@@ -52,29 +37,37 @@ checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
 
 [[package]]
 name = "autocfg"
-version = "1.0.1"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
+checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
 
 [[package]]
 name = "backtrace"
-version = "0.3.50"
+version = "0.3.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46254cf2fdcdf1badb5934448c1bcbe046a56537b3987d96c51a7afc5d03f293"
+checksum = "b1e692897359247cc6bb902933361652380af0f1b7651ae5c5013407f30e109e"
 dependencies = [
- "addr2line",
+ "backtrace-sys",
  "cfg-if",
  "libc",
- "miniz_oxide",
- "object",
  "rustc-demangle",
 ]
 
 [[package]]
-name = "bindgen"
+name = "backtrace-sys"
-version = "0.54.0"
+version = "0.1.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66c0bb6167449588ff70803f4127f0684f9063097eca5016f37eb52b92c2cf36"
+checksum = "78848718ee1255a2485d1309ad9cdecfc2e7d0362dd11c6829364c6b35ae1bc7"
+dependencies = [
+ "cc",
+ "libc",
+]
+
+[[package]]
+name = "bindgen"
+version = "0.53.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6bb26d6a69a335b8cb0e7c7e9775cd5666611dc50a37177c3f2cedcfc040e8c8"
 dependencies = [
  "bitflags",
  "cexpr",
@@ -86,8 +79,8 @@ dependencies = [
  "lazycell",
  "log",
  "peeking_take_while",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.10",
- "quote 1.0.7",
+ "quote 1.0.3",
  "regex",
  "rustc-hash",
  "shlex",
@@ -100,18 +93,6 @@ version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
 
-[[package]]
-name = "bstr"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a40b47ad93e1a5404e6c18dec46b628214fee441c70f4ab5d6942142cc268a3d"
-dependencies = [
- "lazy_static",
- "memchr",
- "regex-automata",
- "serde",
-]
-
 [[package]]
 name = "byteorder"
 version = "1.3.4"
@@ -130,9 +111,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.0.59"
+version = "1.0.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66120af515773fb005778dc07c261bd201ec8ce50bd6e7144c927753fe013381"
+checksum = "c3d87b23d6a92cd03af510a5ade527033f6aa6fa92161e2d5863a907d4c5e31d"
 
 [[package]]
 name = "cexpr"
@@ -162,9 +143,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "2.33.3"
+version = "2.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
+checksum = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
 dependencies = [
  "ansi_term",
  "atty",
@@ -200,9 +181,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.4.4"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87"
+checksum = "cced8691919c02aac3cb0a1bc2e9b73d89e832bf9a06fc579d4e71b68a2da061"
 dependencies = [
  "crossbeam-utils",
  "maybe-uninit",
@@ -225,7 +206,7 @@ version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
 dependencies = [
- "autocfg 1.0.1",
+ "autocfg 1.0.0",
  "cfg-if",
  "crossbeam-utils",
  "lazy_static",
@@ -236,13 +217,12 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-queue"
-version = "0.2.3"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570"
+checksum = "c695eeca1e7173472a32221542ae469b3e9aac3a4fc81f7696bcad82029493db"
 dependencies = [
  "cfg-if",
  "crossbeam-utils",
- "maybe-uninit",
 ]
 
 [[package]]
@@ -251,24 +231,11 @@ version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
 dependencies = [
- "autocfg 1.0.1",
+ "autocfg 1.0.0",
  "cfg-if",
  "lazy_static",
 ]
 
-[[package]]
-name = "csv"
-version = "1.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1"
-dependencies = [
- "bstr",
- "csv-core",
- "itoa",
- "ryu",
- "serde",
-]
-
 [[package]]
 name = "csv-core"
 version = "0.1.10"
@@ -280,14 +247,14 @@ dependencies = [
 
 [[package]]
 name = "ctap_hmac"
-version = "0.4.5"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9c22d4c95aeeb4e2d41e823912d5460cfa1ebf672363eb97b32fa7c91cab89a"
+checksum = "c5fec79b66e3a7bc6a7ace0f4c98f0748892b36d3c5c317fadfce0344fd185dc"
 dependencies = [
  "byteorder",
  "cbor-codec",
  "crossbeam",
- "csv",
+ "csv-core",
  "derive_builder",
  "failure",
  "failure_derive",
@@ -296,8 +263,6 @@ dependencies = [
  "rand 0.6.5",
  "ring",
  "rust-crypto",
- "serde",
- "serde_derive",
  "untrusted",
 ]
 
@@ -319,10 +284,10 @@ checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b"
 dependencies = [
  "fnv",
  "ident_case",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.10",
- "quote 1.0.7",
+ "quote 1.0.3",
  "strsim 0.9.3",
- "syn 1.0.73",
+ "syn 1.0.18",
 ]
 
 [[package]]
@@ -332,8 +297,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72"
 dependencies = [
  "darling_core",
- "quote 1.0.7",
+ "quote 1.0.3",
- "syn 1.0.73",
+ "syn 1.0.18",
 ]
 
 [[package]]
@@ -344,9 +309,9 @@ checksum = "a2658621297f2cf68762a6f7dc0bb7e1ff2cfd6583daef8ee0fed6f7ec468ec0"
 dependencies = [
  "darling",
  "derive_builder_core",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.10",
- "quote 1.0.7",
+ "quote 1.0.3",
- "syn 1.0.73",
+ "syn 1.0.18",
 ]
 
 [[package]]
@@ -356,16 +321,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2791ea3e372c8495c0bc2033991d76b512cd799d07491fbd6890124db9458bef"
 dependencies = [
  "darling",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.10",
- "quote 1.0.7",
+ "quote 1.0.3",
- "syn 1.0.73",
+ "syn 1.0.18",
 ]
 
 [[package]]
 name = "either"
-version = "1.6.0"
+version = "1.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd56b59865bce947ac5958779cfa508f6c3b9497cc762b7e24a12d11ccde2c4f"
+checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
 
 [[package]]
 name = "env_logger"
@@ -382,9 +347,9 @@ dependencies = [
 
 [[package]]
 name = "failure"
-version = "0.1.8"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86"
+checksum = "b8529c2421efa3066a5cbd8063d2244603824daccb6936b079010bb2aa89464b"
 dependencies = [
  "backtrace",
  "failure_derive",
@@ -392,19 +357,19 @@ dependencies = [
 
 [[package]]
 name = "failure_derive"
-version = "0.1.8"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
+checksum = "030a733c8287d6213886dd487564ff5c8f6aae10278b3588ed177f9d18f8d231"
 dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.10",
- "quote 1.0.7",
+ "quote 1.0.3",
- "syn 1.0.73",
+ "syn 1.0.18",
  "synstructure",
 ]
 
 [[package]]
 name = "fido2luks"
-version = "0.3.0"
+version = "0.2.9"
 dependencies = [
  "ctap_hmac",
  "failure",
@@ -420,9 +385,9 @@ dependencies = [
 
 [[package]]
 name = "fnv"
-version = "1.0.7"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+checksum = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
 
 [[package]]
 name = "fuchsia-cprng"
@@ -436,12 +401,6 @@ version = "0.3.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2"
 
-[[package]]
-name = "gimli"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aaf91faf136cb47367fa430cd46e37a788775e7fa104f8b4bcb3861dc389b724"
-
 [[package]]
 name = "glob"
 version = "0.3.0"
@@ -459,9 +418,9 @@ dependencies = [
 
 [[package]]
 name = "hermit-abi"
-version = "0.1.15"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9"
+checksum = "61565ff7aaace3525556587bd2dc31d4a07071957be715e63ce7b1eccf51a8f4"
 dependencies = [
  "libc",
 ]
@@ -489,9 +448,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
 [[package]]
 name = "itoa"
-version = "0.4.6"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6"
+checksum = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e"
 
 [[package]]
 name = "lazy_static"
@@ -501,21 +460,21 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "lazycell"
-version = "1.3.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
+checksum = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
 
 [[package]]
 name = "libc"
-version = "0.2.76"
+version = "0.2.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "755456fae044e6fa1ebbbd1b3e902ae19e73097ed4ed87bb79934a867c007bc3"
+checksum = "99e85c08494b21a9054e7fe1374a732aeadaff3980b6990b94bfd3a70f690005"
 
 [[package]]
 name = "libcryptsetup-rs"
-version = "0.4.2"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9042dbf4b7e4309494949696496e230c9052af64559d3441627d639898c172c"
+checksum = "38cd24132ee0239515bc895782f65ab3e382a0f78e7cee30417159e5c6f81b6b"
 dependencies = [
  "either",
  "libc",
@@ -528,9 +487,9 @@ dependencies = [
 
 [[package]]
 name = "libcryptsetup-rs-sys"
-version = "0.1.4"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b75a2b946509fb39fdb4b232c973166da14be373d09a43eb36b82f775d8244e"
+checksum = "0c605998e81e2a99c1f4c5d0be45ea1df6f1dc45dc64f5ca2847b0dbebf49ae7"
 dependencies = [
  "bindgen",
  "cc",
@@ -550,9 +509,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.11"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
+checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
 dependencies = [
  "cfg-if",
 ]
@@ -571,27 +530,18 @@ checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
 
 [[package]]
 name = "memoffset"
-version = "0.5.5"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c198b026e1bbf08a937e94c6c60f9ec4a2267f5b0d2eec9c1b21b061ce2be55f"
+checksum = "b4fc2c02a7e374099d4ee95a193111f72d2110197fe200272371758f6c3643d8"
 dependencies = [
- "autocfg 1.0.1",
+ "autocfg 1.0.0",
-]
-
-[[package]]
-name = "miniz_oxide"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d7559a8a40d0f97e1edea3220f698f78b1c5ab67532e49f68fde3910323b722"
-dependencies = [
- "adler",
 ]
 
 [[package]]
 name = "nom"
-version = "5.1.2"
+version = "5.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af"
+checksum = "0b471253da97532da4b61552249c521e01e736071f71c1a4f7ebbfbf0a06aad6"
 dependencies = [
  "memchr",
  "version_check",
@@ -610,19 +560,13 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.12"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611"
+checksum = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096"
 dependencies = [
- "autocfg 1.0.1",
+ "autocfg 1.0.0",
 ]
 
-[[package]]
-name = "object"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ab52be62400ca80aa00285d25253d7f7c437b7375c4de678f5405d3afe82ca5"
-
 [[package]]
 name = "peeking_take_while"
 version = "0.1.2"
@@ -631,31 +575,33 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
 
 [[package]]
 name = "pkg-config"
-version = "0.3.18"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33"
+checksum = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
 
 [[package]]
 name = "proc-macro-error"
-version = "1.0.4"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+checksum = "98e9e4b82e0ef281812565ea4751049f1bdcdfccda7d3f459f2e138a40c08678"
 dependencies = [
  "proc-macro-error-attr",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.10",
- "quote 1.0.7",
+ "quote 1.0.3",
- "syn 1.0.73",
+ "syn 1.0.18",
  "version_check",
 ]
 
 [[package]]
 name = "proc-macro-error-attr"
-version = "1.0.4"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+checksum = "4f5444ead4e9935abd7f27dc51f7e852a0569ac888096d5ec2499470794e2e53"
 dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.10",
- "quote 1.0.7",
+ "quote 1.0.3",
+ "syn 1.0.18",
+ "syn-mid",
  "version_check",
 ]
 
@@ -670,11 +616,11 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.27"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038"
+checksum = "df246d292ff63439fea9bc8c0a270bed0e390d5ebd4db4ba15aba81111b5abe3"
 dependencies = [
- "unicode-xid 0.2.1",
+ "unicode-xid 0.2.0",
 ]
 
 [[package]]
@@ -694,11 +640,11 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.7"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
+checksum = "2bdc6c187c65bca4260c9011c9e3132efe4909da44726bad24cf7572ae338d7f"
 dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.10",
 ]
 
 [[package]]
@@ -841,9 +787,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.3.9"
+version = "1.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6"
+checksum = "a6020f034922e3194c711b82a627453881bc4682166cabb07134a10c26ba7692"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -851,17 +797,11 @@ dependencies = [
  "thread_local",
 ]
 
-[[package]]
-name = "regex-automata"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
-
 [[package]]
 name = "regex-syntax"
-version = "0.6.18"
+version = "0.6.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8"
+checksum = "7fe5bd57d1d7414c6b5ed48563a2c855d995ff777729dcd91c369ec7fea395ae"
 
 [[package]]
 name = "ring"
@@ -918,9 +858,9 @@ checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
 
 [[package]]
 name = "ryu"
-version = "1.0.5"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
+checksum = "ed3d612bc64430efeb3f7ee6ef26d590dce0c43249217bddc62112540c7941e1"
 
 [[package]]
 name = "scopeguard"
@@ -945,26 +885,26 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
 [[package]]
 name = "serde"
-version = "1.0.126"
+version = "1.0.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03"
+checksum = "36df6ac6412072f67cf767ebbde4133a5b2e88e76dc6187fa7104cd16f783399"
 
 [[package]]
 name = "serde_derive"
-version = "1.0.126"
+version = "1.0.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43"
+checksum = "9e549e3abf4fb8621bd1609f11dfc9f5e50320802273b12f3811a67e6716ea6c"
 dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.10",
- "quote 1.0.7",
+ "quote 1.0.3",
- "syn 1.0.73",
+ "syn 1.0.18",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.57"
+version = "1.0.51"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "164eacbdb13512ec2745fb09d51fd5b22b0d65ed294a1dcf7285a360c80a675c"
+checksum = "da07b57ee2623368351e9a0488bb0b261322a15a6e0ae53e243cbdc0f4208da9"
 dependencies = [
  "itoa",
  "ryu",
@@ -991,9 +931,9 @@ checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c"
 
 [[package]]
 name = "structopt"
-version = "0.3.17"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6cc388d94ffabf39b5ed5fadddc40147cb21e605f53db6f8f36a625d27489ac5"
+checksum = "863246aaf5ddd0d6928dfeb1a9ca65f505599e4e1b399935ef7e75107516b4ef"
 dependencies = [
  "clap",
  "lazy_static",
@@ -1002,15 +942,15 @@ dependencies = [
 
 [[package]]
 name = "structopt-derive"
-version = "0.4.10"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e2513111825077552a6751dfad9e11ce0fba07d7276a3943a037d7e93e64c5f"
+checksum = "d239ca4b13aee7a2142e6795cbd69e457665ff8037aed33b3effdc430d2f927a"
 dependencies = [
  "heck",
  "proc-macro-error",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.10",
- "quote 1.0.7",
+ "quote 1.0.3",
- "syn 1.0.73",
+ "syn 1.0.18",
 ]
 
 [[package]]
@@ -1026,25 +966,36 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "1.0.73"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f71489ff30030d2ae598524f61326b902466f72a0fb1a8564c001cc63425bcc7"
+checksum = "410a7488c0a728c7ceb4ad59b9567eb4053d02e8cc7f5c0e0eeeb39518369213"
 dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.10",
- "quote 1.0.7",
+ "quote 1.0.3",
- "unicode-xid 0.2.1",
+ "unicode-xid 0.2.0",
+]
+
+[[package]]
+name = "syn-mid"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7be3539f6c128a931cf19dcee741c1af532c7fd387baa739c03dd2e96479338a"
+dependencies = [
+ "proc-macro2 1.0.10",
+ "quote 1.0.3",
+ "syn 1.0.18",
 ]
 
 [[package]]
 name = "synstructure"
-version = "0.12.4"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701"
+checksum = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545"
 dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.10",
- "quote 1.0.7",
+ "quote 1.0.3",
- "syn 1.0.73",
+ "syn 1.0.18",
- "unicode-xid 0.2.1",
+ "unicode-xid 0.2.0",
 ]
 
 [[package]]
@@ -1076,12 +1027,11 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.1.44"
+version = "0.1.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
+checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438"
 dependencies = [
  "libc",
- "wasi",
  "winapi",
 ]
 
@@ -1093,9 +1043,9 @@ checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0"
 
 [[package]]
 name = "unicode-width"
-version = "0.1.8"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
+checksum = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479"
 
 [[package]]
 name = "unicode-xid"
@@ -1105,9 +1055,9 @@ checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
 
 [[package]]
 name = "unicode-xid"
-version = "0.2.1"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
+checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
 
 [[package]]
 name = "untrusted"
@@ -1126,21 +1076,15 @@ dependencies = [
 
 [[package]]
 name = "vec_map"
-version = "0.8.2"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
+checksum = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
 
 [[package]]
 name = "version_check"
-version = "0.9.2"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed"
+checksum = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce"
-
-[[package]]
-name = "wasi"
-version = "0.10.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
 
 [[package]]
 name = "which"
@@ -1153,9 +1097,9 @@ dependencies = [
 
 [[package]]
 name = "winapi"
-version = "0.3.9"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
 dependencies = [
  "winapi-i686-pc-windows-gnu",
  "winapi-x86_64-pc-windows-gnu",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fido2luks"
-version = "0.3.0"
+version = "0.2.9"
 authors = ["shimunn <shimun@shimun.net>"]
 edition = "2018"
 
@@ -11,28 +11,19 @@ repository = "https://github.com/shimunn/fido2luks"
 readme = "README.md"
 keywords = ["luks", "fido2", "u2f"]
 categories = ["command-line-utilities"]
-license = "MPL-2.0"
+license-file = "LICENSE"
 
 [dependencies]
-ctap_hmac = { version="0.4.5", features = ["request_multiple"] }
+ctap_hmac = { version="0.4.2", features = ["request_multiple"] }
 hex = "0.3.2"
 ring = "0.13.5"
 failure = "0.1.5"
 rpassword = "4.0.1"
 structopt = "0.3.2"
-libcryptsetup-rs = "0.4.2"
-serde_json = "1.0.51"
-serde_derive = "1.0.116"
-serde = "1.0.116"
-
-[build-dependencies]
-ctap_hmac = { version="0.4.5", features = ["request_multiple"] }
-hex = "0.3.2"
-ring = "0.13.5"
-failure = "0.1.5"
-rpassword = "4.0.1"
 libcryptsetup-rs = "0.4.1"
-structopt = "0.3.2"
+serde_json = "1.0.51"
+serde_derive = "1.0.106"
+serde = "1.0.106"
 
 [profile.release]
 lto = true
@@ -40,16 +31,3 @@ opt-level = 'z'
 panic = 'abort'
 incremental = false
 overflow-checks = false
-
-[package.metadata.deb]
-depends = "$auto, cryptsetup"
-build-depends = "libclang-dev, libcryptsetup-dev"
-extended-description = "Decrypt your LUKS partition using a FIDO2 compatible authenticator"
-assets = [
-    ["target/release/fido2luks", "usr/bin/", "755"],
-    ["fido2luks.bash", "usr/share/bash-completion/completions/fido2luks", "644"],
-    ["initramfs-tools/keyscript.sh", "/lib/cryptsetup/scripts/fido2luks", "755" ],
-    ["initramfs-tools/hook/fido2luks.sh", "etc/initramfs-tools/hooks/", "755" ],
-    ["initramfs-tools/fido2luks.conf", "etc/", "644"],
-]
-conf-files = ["/etc/fido2luks.conf"]

PKGBUILD

@@ -1,37 +0,0 @@
-# Maintainer: shimunn <shimun@shimun.net>
-
-pkgname=fido2luks-git
-pkgver=0.2.16.7e6b33a
-pkgrel=1
-makedepends=('rust' 'cargo' 'cryptsetup' 'clang' 'git')
-depends=('cryptsetup')
-arch=('i686' 'x86_64' 'armv6h' 'armv7h')
-pkgdesc="Decrypt your LUKS partition using a FIDO2 compatible authenticator"
-url="https://github.com/shimunn/fido2luks"
-license=('MPL-2.0')
-source=('git+https://github.com/shimunn/fido2luks')
-sha512sums=('SKIP')
-
-pkgver() {
-    cd fido2luks
-
-    # Use tag version if possible otherwise concat project version and git ref
-    git describe --exact-match --tags HEAD 2>/dev/null ||
-        echo "$(cargo pkgid | cut -d'#' -f2).$(git describe --always)"
-}
-
-build() {
-    cd fido2luks
-    cargo build --release --locked --all-features --target-dir=target
-}
-
-package() {
-    cd fido2luks
-
-    install -Dm 755 target/release/fido2luks -t "${pkgdir}/usr/bin"
-    install -Dm 755 pam_mount/fido2luksmounthelper.sh -t "${pkgdir}/usr/bin"
-    install -Dm 644 initcpio/hooks/fido2luks -t "${pkgdir}/usr/lib/initcpio/hooks"
-    install -Dm 644 initcpio/install/fido2luks -t "${pkgdir}/usr/lib/initcpio/install"
-    install -Dm 644 fido2luks.bash "${pkgdir}/usr/share/bash-completion/completions/fido2luks"
-    install -Dm 644 fido2luks.fish -t "${pkgdir}/usr/share/fish/vendor_completions.d"
-}

README.md

@@ -1,8 +1,8 @@
 # fido2luks [![Crates.io Version](https://img.shields.io/crates/v/fido2luks.svg)](https://crates.io/crates/fido2luks)
 
-This will allow you to unlock your LUKS encrypted disk with an FIDO2 compatible key.
+This will allow you to unlock your luks encrypted disk with an fido2 compatible key
 
-Note: This has only been tested under Fedora 31, [Ubuntu 20.04](initramfs-tools/), [NixOS](https://nixos.org/nixos/manual/#sec-luks-file-systems-fido2) using a Solo Key, Trezor Model T, YubiKey(fw >= [5.2.3](https://support.yubico.com/hc/en-us/articles/360016649319-YubiKey-5-2-3-Enhancements-to-FIDO-2-Support))
+Note: This has only been tested under Fedora 31, [Ubuntu 20.04](initramfs-tools/), [NixOS](https://nixos.org/nixos/manual/#sec-luks-file-systems-fido2) using a Solo Key, Trezor Model T
 
 ## Setup
 
@@ -65,7 +65,7 @@ cp /usr/bin/fido2luks /boot/fido2luks/
 cp /etc/fido2luks.conf /boot/fido2luks/
 ```
 
-## Testing
+## Test
 
 Just reboot and see if it works, if that's the case you should remove your old less secure password from your LUKS header:
 
@@ -96,13 +96,6 @@ set -a
 
 Then add the new secret to each device and update dracut afterwards `dracut -f`
 
-### Multiple keys
-
-Additional/backup keys are supported, Multiple fido2luks credentials can be added to your /etc/fido2luks.conf file. Credential tokens are comma separated.
-```
-FIDO2LUKS_CREDENTIAL_ID=<CREDENTIAL1>,<CREDENTIAL2>,<CREDENTIAL3>
-```
-
 ## Removal
 
 Remove `rd.luks.2fa` from `GRUB_CMDLINE_LINUX` in /etc/default/grub
@@ -114,47 +107,3 @@ sudo -E fido2luks -i replace-key /dev/disk/by-uuid/<DISK_UUID>
 
 sudo rm -rf /usr/lib/dracut/modules.d/96luks-2fa /etc/dracut.conf.d/luks-2fa.conf /etc/fido2luks.conf
 ```
-
-## Theory of operation
-
-fido2luks builds on two basic building blocks, LUKS as an abstraction over linux disk encryption and and the FIDO2 extension [`hmac-secret`](https://fidoalliance.org/specs/fido-v2.0-rd-20180702/fido-client-to-authenticator-protocol-v2.0-rd-20180702.html#sctn-hmac-secret-extension).
-The `hmac-secret` extension allows for an secret to be dervied on the FIDO2 device from two inputs, the user supplied salt/password/keyfile and another secret contained within the FID2 device. The output of the `hmac-secret` function will then be used to decrypt the LUKS header which in turn is used to decrypt the disk.
-```
-
-        +-------------------------------------------------------------------------------+
-        |                                                                               |
-        |                       +-----------------------------------------+             |
-        |                       |               FIDO2 device              |             |
-        |                       |                                         |             |
-        |                       |                                         |             |
-+-------+--------+   +------+   |                      +---------------+  |             |             +------------------------+
-| Salt/Password  +-> |sha256+------------------------> |               |  |             v             |      LUKS header       |
-+----------------+   +------+   |                      |               |  |                           |                        |           +---------------+   
-                                |                      |               |  |        +--------+         +------------------------+-------->  |Disk master key| 
-                                |                      |  sha256_hmac  +---------> | sha256 +-------> | Keyslot 1              |           +---------------+ 
-+----------------+              |  +----------+        |               |  |        +--------+         +------------------------+
-| FIDO credential+---------------> |Credential| +----> |               |  |                           | Keyslot 2              |
-+----------------+              |  |secret    |        |               |  |                           +------------------------+
-                                |  +----------+        +---------------+  |
-                                |                                         |
-                                |                                         |
-                                +-----------------------------------------+
-
-```
-Since all these components build upon each other losing or damaging just one of them will render the disk undecryptable, it's threfore of paramount importance to backup the LUKS header and ideally set an backup password
-or utilise more than one FIDO2 device. Each additional credential and password combination will require it's own LUKS keyslot since the credential secret is randomly generated for each new credential and will thus result
-in a completly different secret.
-
-## License
-
-Licensed under
-
- * Mozilla Public License 2.0, ([LICENSE-MPL](LICENSE-MPL) or https://www.mozilla.org/en-US/MPL/2.0/)
-
-### Contribution
-
-Unless you explicitly state otherwise, any contribution intentionally
-submitted for inclusion in the work by you, as defined in the MPL 2.0
-license, shall be licensed as above, without any additional terms or
-conditions.
-

README_NEW.md

@@ -1,79 +0,0 @@
-# fido2luks [![Crates.io Version](https://img.shields.io/crates/v/fido2luks.svg)](https://crates.io/crates/fido2luks)
-
-This will allow you to unlock your LUKS encrypted disk with an FIDO2 compatible key.
-
-Note: This has only been tested under Fedora 31, [Ubuntu 20.04](initramfs-tools/), [NixOS](https://nixos.org/nixos/manual/#sec-luks-file-systems-fido2) using a Solo Key, Trezor Model T
-
-## Installation
-
-### From Source
-
-Installing from source requires the following dependencies:
-
-Ubuntu: `cargo, libclang-dev, libcryptsetup-dev >= 2.2`
-
-Fedora: `cargo, clang-devel, cryptsetup-devel`
-
-To compile the fido2luks binary you can simply run `sudo cargo install --root /usr fido2luks` but since you may want to install the scripts included it this repo as well,
-it's recommended to clone the repo and install from there.
-
-``
-git clone https://github.com/shimunn/fido2luks.git
-cargo install --root /usr --path fido2luks
-``
-
-Continue with further instructions for [Ubuntu](initramfs-tools) or [Fedora](dracut)
-
-### From Package
-
-Ubuntu: see [releases](https://github.com/shimunn/fido2luks/releases)
-
-NixOS: https://nixos.org/nixos/manual/#sec-luks-file-systems-fido2
-
-ArchLinux: 
-* [AUR](https://aur.archlinux.org/packages/fido2luks/)
-* [Git](PKGBUILD)
-
-Fedora: coming soon
-
-## Credentials
-
-Depending on the version of cryptsetup and the age of your installation your LUKS header might be in the LUKS2 format already if that's the case fido2luks will be able to spare you from dealing with just another config file by simply storeing all the required information within your LUKS header. 
-If your header is still using the LUKS1 format you may convert it:
-
-```
-cryptsetup convert --type luks2 <device>
-```
-
-if you want to keep using LUKS1 due to other software such as pam_mount not being compatible with LUKS2 at the moment, you will have to generate credentials by hand an add them to `/etc/fido2luks.conf` otherwise you can skip this step.
-```
-fido2luks credential [optional name]
-```
-the generated hexadecimal credential can then be added to `FIDO2LUKS_CREDENTIAL_ID=` in `/etc/fido2luks.conf` multiple credentials can be separated by comma.
-
-## Adding a Key
-
-If you had to generate a credential in the previous step you'll have to provide it to the following commands as a parameter or via an environment variable:
-
-```
-set -a
-. /etc/fido2luks.conf
-```
-
-To then add the key you need to have your current password/keyfile ready:
-
-without having generated a credential in the previous step: `fido2luks -i add-key --gen-cred <device>`
-
-with a keyfile: `fido2luks -i add-key --keyfile <path-to-keyfile <device>`
-
-if you've confirmed at a later stage that everything works as expected you may want to remove your keyfile/password by running the previous commands with the `--exclusive` flag which will remove all other keys from the device.
-
-## Replacing a Key
-
-with password: `fido2luks -i replace-key <device>`
-
-with keyfile: `fido2luks -i replace-key -d <path-to-keyfile> <device>`
-
-with another fido2 derived key: `fido2luks -i replace-key -f <device>`
-
-

build.rs

@@ -1,28 +0,0 @@
-#![allow(warnings)]
-#[macro_use]
-extern crate failure;
-extern crate ctap_hmac as ctap;
-
-#[path = "src/cli_args/mod.rs"]
-mod cli_args;
-#[path = "src/error.rs"]
-mod error;
-#[path = "src/util.rs"]
-mod util;
-
-use cli_args::Args;
-use std::env;
-use std::str::FromStr;
-use structopt::clap::Shell;
-use structopt::StructOpt;
-
-fn main() {
-    // generate completion scripts, zsh does panic for some reason
-    for shell in Shell::variants().iter().filter(|shell| **shell != "zsh") {
-        Args::clap().gen_completions(
-            env!("CARGO_PKG_NAME"),
-            Shell::from_str(shell).unwrap(),
-            env!("CARGO_MANIFEST_DIR"),
-        );
-    }
-}

flake.lock

@@ -1,79 +0,0 @@
-{
-  "nodes": {
-    "cargo-deb": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1627137192,
-        "narHash": "sha256-zDAwiETJquiViEvBKMuI9WWgSGhVDscL/m1ufKJENBw=",
-        "owner": "mmstick",
-        "repo": "cargo-deb",
-        "rev": "f603d105b4641e00640e46b189c6ee0c8f084de2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "mmstick",
-        "repo": "cargo-deb",
-        "type": "github"
-      }
-    },
-    "naersk": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1623927034,
-        "narHash": "sha256-sGxlmfp5eXL5sAMNqHSb04Zq6gPl+JeltIZ226OYN0w=",
-        "owner": "nmattia",
-        "repo": "naersk",
-        "rev": "e09c320446c5c2516d430803f7b19f5833781337",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nmattia",
-        "repo": "naersk",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1627245147,
-        "narHash": "sha256-CQzH/4Mbhcx1HD+dtD7pZ0dHUZvX4eKN9b8Ifzz4gC4=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "23098f20376cd1c874af476e5d8ef9169105b020",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
-    "root": {
-      "inputs": {
-        "cargo-deb": "cargo-deb",
-        "naersk": "naersk",
-        "nixpkgs": "nixpkgs",
-        "utils": "utils"
-      }
-    },
-    "utils": {
-      "locked": {
-        "lastModified": 1623875721,
-        "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}

flake.nix

@@ -1,106 +0,0 @@
-{
-  description = "Decrypt your LUKS partition using a FIDO2 compatible authenticator";
-
-  inputs = {
-    utils.url = "github:numtide/flake-utils";
-    cargo-deb = {
-      flake = false;
-      url = "github:mmstick/cargo-deb";
-    };
-    naersk = {
-      url = "github:nmattia/naersk";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-  };
-
-  outputs = { self, nixpkgs, utils, naersk, cargo-deb }:
-    let
-      root = ./.;
-      pname = (builtins.fromTOML (builtins.readFile ./Cargo.toml)).package.name;
-      forPkgs = pkgs:
-        let
-          naersk-lib = naersk.lib."${pkgs.system}";
-          buildInputs = with pkgs; [ cryptsetup ];
-          LIBCLANG_PATH = "${pkgs.clang.cc.lib}/lib";
-          nativeBuildInputs = with pkgs; [
-            pkgconfig
-            clang
-          ];
-        in
-        rec {
-          # `nix build`
-          packages.${pname} = naersk-lib.buildPackage {
-            inherit pname root buildInputs nativeBuildInputs LIBCLANG_PATH;
-          };
-
-          packages."${pname}-deb" =
-            let
-              cargoDeb = naersk-lib.buildPackage {
-                pname = "cargo-deb";
-                root = cargo-deb;
-              };
-              pkg = packages.${pname};
-              vm = pkgs.vmTools.diskImageFuns.ubuntu1804x86_64 { extraPackages = [ "cargo" "cryptsetup" "libclang-dev" "libcryptsetup-dev" ]; };
-              makefile = pkgs.writeText "Makefile" "
-                .PHONY: install
-
-                cargo-deb:
-                        cargo install --debug --path cargo-deb
-
-                install: cargo-deb
-                        cargo-deb
-                        mkdir -p debs
-                        cp target/debian/*.deb debs/
-                  
-              ";
-              src = pkgs.runCommandLocal "${pname}-vendored" {} ''
-                mkdir -p $out/.cargo $out/cargo-deb/.cargo
-                printf '${pkg.cargoconfig}' > $out/.cargo/config.toml; 
-                printf '${cargoDeb.cargoconfig}' > $out/cargo-deb/.cargo/config.toml;
-                printf '.PHONY: install\ninstall:\n\tcargo install --debug --path cargo-deb\n\tcargo-deb\n\tmkdir -p debs\n\tcp target/debian/*.deb debs/' > $out/Makefile
-                cp -r ${pkg.src}/. $out/
-                cp -r ${cargoDeb.src}/. $out/cargo-deb/
-              '';
-              args = {
-                diskImage = vm;
-                inherit src;
-                name = pname;
-                buildInputs = [ ];
-                meta.description = "No descr";
-              };
-            in
-            pkgs.releaseTools.debBuild args;
-
-          defaultPackage = packages.${pname};
-
-          # `nix run`
-          apps.${pname} = utils.lib.mkApp {
-            drv = packages.${pname};
-          };
-          defaultApp = apps.${pname};
-
-          # `nix flake check`
-          checks = {
-            fmt = with pkgs; runCommandLocal "${pname}-fmt" { buildInputs = [ cargo rustfmt nixpkgs-fmt ]; } ''
-              cd ${root}
-              cargo fmt -- --check
-              nixpkgs-fmt --check *.nix
-              touch $out
-            '';
-          };
-
-          hydraJobs = checks // packages;
-
-          # `nix develop`
-          devShell = pkgs.mkShell {
-            nativeBuildInputs = with pkgs; [ rustc cargo rustfmt nixpkgs-fmt ] ++ nativeBuildInputs;
-            inherit buildInputs LIBCLANG_PATH;
-          };
-        };
-      forSystem = system: forPkgs nixpkgs.legacyPackages."${system}";
-    in
-    (utils.lib.eachSystem [ "aarch64-linux" "i686-linux" "x86_64-linux" ] forSystem) // {
-      overlay = final: prev: (forPkgs final).packages;
-    };
-
-}

initcpio/Makefile

@@ -1,18 +0,0 @@
-.PHONY: install remove
-
-install:
-	install -Dm644 hooks/fido2luks -t /usr/lib/initcpio/hooks
-	install -Dm644 install/fido2luks -t /usr/lib/initcpio/install
-ifdef preset
-	mkinitcpio -p $(preset)
-else
-	mkinitcpio -P
-endif
-
-remove:
-	rm /usr/lib/initcpio/{hooks,install}/fido2luks
-ifdef preset
-	mkinitcpio -p $(preset)
-else
-	mkinitcpio -P
-endif

initcpio/README.md

@@ -1,52 +0,0 @@
-## fido2luks hook for mkinitcpio (ArchLinux and derivatives)
-
-> ⚠️ Before proceeding, it is very advised to [backup your existing LUKS2 header](https://wiki.archlinux.org/title/dm-crypt/Device_encryption#Backup_using_cryptsetup) to external storage
-
-### Setup
-
-1. Connect your FIDO2 authenticator
-2. Generate credential id
-
-```shell
-fido2luks credential
-```
-
-3. Generate salt (random string)
-
-```shell
-pwgen 48 1
-```
-
-4. Add key to your LUKS2 device
-
-```shell
-fido2luks add-key -Pt --salt <salt> <block_device> <credential_id>
-```
-
-`-P` - request PIN to unlock the authenticator  
-`-t` - add token (including credential id) to the LUKS2 header  
-`-e` - wipe all other keys  
-
-For the full list of options see `fido2luks add-key --help`
-
-5. Edit [/etc/fido2luks.conf](/initcpio/fido2luks.conf)
-
-Keyslot (`FIDO2LUKS_DEVICE_SLOT`) can be obtained from the output of
-
-```shell
-cryptsetup luksDump <block_device>
-```
-
-6. Add fido2luks hook to /etc/mkinitcpio.conf
-
-Before or instead of `encrypt` hook, for example:
-
-```shell
-HOOKS=(base udev autodetect modconf keyboard block fido2luks filesystems fsck)
-```
-
-7. Recreate initial ramdisk
-
-```shell
-mkinitcpio -p <preset>
-```

initcpio/fido2luks.conf

@@ -1,18 +0,0 @@
-# Set credential *ONLY IF* it's not embedded in the LUKS2 header
-FIDO2LUKS_CREDENTIAL_ID=
-
-# Encrypted device and its name under /dev/mapper
-# Can be overridden by `cryptdevice` kernel parameter
-FIDO2LUKS_DEVICE=
-FIDO2LUKS_MAPPER_NAME=
-
-FIDO2LUKS_SALT=string:<salt>
-
-# Use specific keyslot (ignore all other slots)
-FIDO2LUKS_DEVICE_SLOT=
-
-# Await for an authenticator to be connected (in seconds)
-FIDO2LUKS_DEVICE_AWAIT=
-
-# Set to 1 if PIN is required to unlock the authenticator
-FIDO2LUKS_ASK_PIN=

initcpio/hooks/fido2luks

@@ -1,55 +0,0 @@
-#!/usr/bin/ash
-
-run_hook() {
-    modprobe -a -q dm-crypt >/dev/null 2>&1
-    . /etc/fido2luks.conf
-
-    if [ -z "$cryptdevice" ]; then
-        device="$FIDO2LUKS_DEVICE"
-        dmname="$FIDO2LUKS_MAPPER_NAME"
-    else
-        IFS=: read cryptdev dmname _cryptoptions <<EOF
-$cryptdevice
-EOF
-        if ! device=$(resolve_device "${cryptdev}" ${rootdelay}); then
-            return 1
-        fi
-    fi
-
-    options="--salt $FIDO2LUKS_SALT"
-
-    if [ "$FIDO2LUKS_ASK_PIN" == 1 ]; then
-        options="$options --pin"
-    fi
-
-    if [ -n "$FIDO2LUKS_DEVICE_SLOT" ]; then
-        options="$options --slot $FIDO2LUKS_DEVICE_SLOT"
-    fi
-
-    if [ -n "$FIDO2LUKS_DEVICE_AWAIT" ]; then
-        options="$options --await-dev $FIDO2LUKS_DEVICE_AWAIT"
-    fi
-
-    # HACK: /dev/tty is hardcoded in rpassword, but not accessible from the ramdisk
-    # Temporary link it to /dev/tty1
-    mv /dev/tty /dev/tty.back
-    ln -s /dev/tty1 /dev/tty
-
-    printf "\nAuthentication is required to access the $dmname volume at $device\n"
-
-    if [ -z "$FIDO2LUKS_CREDENTIAL_ID" ]; then
-        fido2luks open-token $device $dmname $options
-    else
-        fido2luks open $device $dmname $FIDO2LUKS_CREDENTIAL_ID $options
-    fi
-    exit_code=$?
-
-    # Restore /dev/tty
-    mv /dev/tty.back /dev/tty
-
-    if [ $exit_code -ne 0 ]; then
-        printf '\n'
-        read -s -p 'Press Enter to continue'
-        printf '\n'
-    fi
-}

initcpio/install/fido2luks

@@ -1,31 +0,0 @@
-#!/bin/bash
-
-build() {
-    local mod
-
-    add_module dm-crypt
-    add_module dm-integrity
-    if [[ $CRYPTO_MODULES ]]; then
-        for mod in $CRYPTO_MODULES; do
-            add_module "$mod"
-        done
-    else
-        add_all_modules /crypto/
-    fi
-
-    add_binary fido2luks
-    add_binary dmsetup
-    add_file /usr/lib/udev/rules.d/10-dm.rules
-    add_file /usr/lib/udev/rules.d/13-dm-disk.rules
-    add_file /usr/lib/udev/rules.d/95-dm-notify.rules
-    add_file /usr/lib/initcpio/udev/11-dm-initramfs.rules /usr/lib/udev/rules.d/11-dm-initramfs.rules
-    add_file /etc/fido2luks.conf /etc/fido2luks.conf
-
-    add_runscript
-}
-
-help() {
-    cat <<HELPEOF
-This hook allows to decrypt LUKS2 partition using FIDO2 compatible authenticator
-HELPEOF
-}

initramfs-tools/Dockerfile

@@ -1,15 +0,0 @@
-FROM rust:bullseye
-
-RUN cargo install -f cargo-deb --debug --version 1.30.0
-
-ARG DEBIAN_FRONTEND=noninteractive
-
-RUN apt update && apt install -y cryptsetup pkg-config libclang-dev libcryptsetup-dev && mkdir -p /build/fido2luks
-
-WORKDIR /build/fido2luks
-
-ENV CARGO_TARGET_DIR=/build/fido2luks/target
-
-RUN cargo install fido2luks -f
-
-CMD bash -xc 'cp -rf /code/* /build/fido2luks && cargo-deb && cp target/debian/*.deb /out'

initramfs-tools/Makefile

@@ -1,4 +1,17 @@
-.PHONY: install
+.PHONY: install clean
+
+DRACUT_MODULES_D=/usr/lib/dracut/modules.d
+DRACUT_CONF_D=/etc/dracut.conf.d
+
+MODULE_CONF_D=dracut.conf.d
+MODULE_CONF=luks-2fa.conf
+MODULE_DIR=96luks-2fa
+
+help:
+	@echo make help to show this help
+	@echo make install to install
+	@echo make clean to remove
+
 install:
 	chmod +x hook/fido2luks.sh keyscript.sh
 	cp -f hook/fido2luks.sh /etc/initramfs-tools/hooks/
@@ -6,6 +19,5 @@ install:
 	cp -f keyscript.sh /lib/cryptsetup/scripts/fido2luks
 	update-initramfs -u
 remove:
-	sh -c "grep 'keyscript=fido2luks' -i /etc/crypttab && ( echo 'ERROR: your system is still setup to use fido2luks during boot' && exit 1) || exit 0"
+	rm /etc/initramfs-tools/hooks/fido2luks.sh
-	rm /etc/initramfs-tools/hooks/fido2luks.sh /lib/cryptsetup/scripts/fido2luks
 	update-initramfs -u

initramfs-tools/README.md

@@ -1,34 +1,13 @@
 ## Initramfs-tools based systems(Ubuntu and derivatives)
 
-For easiest installation [download and install the precompiled deb from releases.](https://github.com/shimunn/fido2luks/releases). However it is possible to build from source via the instructions on the main readme.
+After installation generate your credentials and add keys to your disk as described in the top-level README
+then add `initramfs,keyscript=fido2luks` to your `/etc/crypttab`
 
+Example:
 ```
-sudo -s
+sda6_crypt UUID=9793d81a-4cfb-4712-85f3-c7a8d715112c none luks,discard,initramfs,keyscript=fido2luks
-
-# Insert FIDO key.
-fido2luks credential
-# Tap FIDO key
-# Copy returned string <CREDENTIAL>
-
-nano /etc/fido2luks.conf
-# Insert <CREDENTIAL> 
-# FIDO2LUKS_CREDENTIAL_ID=<CREDENTIAL> 
-
-set -a
-. /etc/fido2luks.conf
-fido2luks -i add-key /dev/<LUKS PARTITION>
-# Current password: <Any current LUKS password>
-# Password: <Password used as FIDO challange>
-# Tap FIDO key
-
-nano /etc/crypttab
-# Append to end ",discard,initramfs,keyscript=fido2luks"
-# E.g. sda6_crypt UUID=XXXXXXXXXX none luks,discard,initramfs,keyscript=fido2luks
-
-update-initramfs -u
-
-
 ```
 
+But don't forget to run `make install` which will install all necessary scripts and regenerate your intrid.
+
 [Recording showing part of the setup](https://shimun.net/fido2luks/setup.svg)
-

initramfs-tools/build-deb.sh

@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-
-set -ex
-
-docker build . -t fido2luks-deb
-
-mkdir -p debs
-
-docker run -ti -v "$(pwd)/..:/code:ro" -v "$(pwd)/debs:/out" fido2luks-deb

initramfs-tools/fido2luks.conf

@@ -1,3 +1,3 @@
 FIDO2LUKS_SALT=Ask
-#FIDO2LUKS_PASSWORD_HELPER="/usr/bin/plymouth ask-for-password --prompt 'FIDO2 password salt'"
+#FIDO2LUKS_PASSWORD_HELPER="/usr/bin/plymouth ask-for-password --promt 'FIDO2 password salt'"
 FIDO2LUKS_CREDENTIAL_ID=

initramfs-tools/keyscript.sh

@@ -3,8 +3,7 @@ set -a
 . /etc/fido2luks.conf
 
 if [ -z "$FIDO2LUKS_PASSWORD_HELPER" ]; then
-	MSG="FIDO2 password salt for $CRYPTTAB_NAME"
+	export FIDO2LUKS_PASSWORD_HELPER="plymouth ask-for-password --promt 'FIDO2 password salt for $CRYPTTAB_NAME'"
-	export FIDO2LUKS_PASSWORD_HELPER="plymouth ask-for-password --prompt '$MSG'"
 fi
 
-fido2luks print-secret --bin "$CRYPTTAB_SOURCE" $([ "$FIDO2LUKS_USE_TOKEN" -eq 0 ] && printf "--disable-token")
+fido2luks print-secret --bin

pam_mount/fido2luksmounthelper.sh

@@ -1,220 +0,0 @@
-#!/bin/bash
-#
-# This is a rather minimal example Argbash potential
-# Example taken from http://argbash.readthedocs.io/en/stable/example.html
-#
-# ARG_POSITIONAL_SINGLE([operation],[Operation to perform (mount|umount)],[])
-# ARG_OPTIONAL_SINGLE([credentials-type],[c],[Type of the credentials to use (external|embedded)])
-# ARG_OPTIONAL_SINGLE([device],[d],[Name of the device to create])
-# ARG_OPTIONAL_SINGLE([mount-point],[m],[Path of the mount point to use])
-# ARG_OPTIONAL_BOOLEAN([ask-pin],[a],[Ask for a pin],[off])
-# ARG_OPTIONAL_SINGLE([salt],[s],[Salt to use],[""])
-# ARG_HELP([Unlocks/Locks a LUKS volume and mount/unmount it in the given mount point.])
-# ARGBASH_GO()
-# needed because of Argbash --> m4_ignore([
-### START OF CODE GENERATED BY Argbash v2.9.0 one line above ###
-# Argbash is a bash code generator used to get arguments parsing right.
-# Argbash is FREE SOFTWARE, see https://argbash.io for more info
-# Generated online by https://argbash.io/generate
-
-
-die()
-{
-	local _ret="${2:-1}"
-	test "${_PRINT_HELP:-no}" = yes && print_help >&2
-	echo "$1" >&2
-	exit "${_ret}"
-}
-
-
-begins_with_short_option()
-{
-	local first_option all_short_options='cdmash'
-	first_option="${1:0:1}"
-	test "$all_short_options" = "${all_short_options/$first_option/}" && return 1 || return 0
-}
-
-# THE DEFAULTS INITIALIZATION - POSITIONALS
-_positionals=()
-# THE DEFAULTS INITIALIZATION - OPTIONALS
-_arg_credentials_type=
-_arg_device=
-_arg_mount_point=
-_arg_ask_pin="off"
-_arg_salt=""
-
-
-print_help()
-{
-	printf '%s\n' "Unlocks/Locks a LUKS volume and mount/unmount it in the given mount point."
-	printf 'Usage: %s [-c|--credentials-type <arg>] [-d|--device <arg>] [-m|--mount-point <arg>] [-a|--(no-)ask-pin] [-s|--salt <arg>] [-h|--help] <operation>\n' "$0"
-	printf '\t%s\n' "<operation>: Operation to perform (mount|umount)"
-	printf '\t%s\n' "-c, --credentials-type: Type of the credentials to use (external|embedded) (no default)"
-	printf '\t%s\n' "-d, --device: Name of the device to create (no default)"
-	printf '\t%s\n' "-m, --mount-point: Path of the mount point to use (no default)"
-	printf '\t%s\n' "-a, --ask-pin, --no-ask-pin: Ask for a pin (off by default)"
-	printf '\t%s\n' "-s, --salt: Salt to use (default: '""')"
-	printf '\t%s\n' "-h, --help: Prints help"
-}
-
-
-parse_commandline()
-{
-	_positionals_count=0
-	while test $# -gt 0
-	do
-		_key="$1"
-		case "$_key" in
-			-c|--credentials-type)
-				test $# -lt 2 && die "Missing value for the optional argument '$_key'." 1
-				_arg_credentials_type="$2"
-				shift
-				;;
-			--credentials-type=*)
-				_arg_credentials_type="${_key##--credentials-type=}"
-				;;
-			-c*)
-				_arg_credentials_type="${_key##-c}"
-				;;
-			-d|--device)
-				test $# -lt 2 && die "Missing value for the optional argument '$_key'." 1
-				_arg_device="$2"
-				shift
-				;;
-			--device=*)
-				_arg_device="${_key##--device=}"
-				;;
-			-d*)
-				_arg_device="${_key##-d}"
-				;;
-			-m|--mount-point)
-				test $# -lt 2 && die "Missing value for the optional argument '$_key'." 1
-				_arg_mount_point="$2"
-				shift
-				;;
-			--mount-point=*)
-				_arg_mount_point="${_key##--mount-point=}"
-				;;
-			-m*)
-				_arg_mount_point="${_key##-m}"
-				;;
-			-a|--no-ask-pin|--ask-pin)
-				_arg_ask_pin="on"
-				test "${1:0:5}" = "--no-" && _arg_ask_pin="off"
-				;;
-			-a*)
-				_arg_ask_pin="on"
-				_next="${_key##-a}"
-				if test -n "$_next" -a "$_next" != "$_key"
-				then
-					{ begins_with_short_option "$_next" && shift && set -- "-a" "-${_next}" "$@"; } || die "The short option '$_key' can't be decomposed to ${_key:0:2} and -${_key:2}, because ${_key:0:2} doesn't accept value and '-${_key:2:1}' doesn't correspond to a short option."
-				fi
-				;;
-			-s|--salt)
-				test $# -lt 2 && die "Missing value for the optional argument '$_key'." 1
-				_arg_salt="$2"
-				shift
-				;;
-			--salt=*)
-				_arg_salt="${_key##--salt=}"
-				;;
-			-s*)
-				_arg_salt="${_key##-s}"
-				;;
-			-h|--help)
-				print_help
-				exit 0
-				;;
-			-h*)
-				print_help
-				exit 0
-				;;
-			*)
-				_last_positional="$1"
-				_positionals+=("$_last_positional")
-				_positionals_count=$((_positionals_count + 1))
-				;;
-		esac
-		shift
-	done
-}
-
-
-handle_passed_args_count()
-{
-	local _required_args_string="'operation'"
-	test "${_positionals_count}" -ge 1 || _PRINT_HELP=yes die "FATAL ERROR: Not enough positional arguments - we require exactly 1 (namely: $_required_args_string), but got only ${_positionals_count}." 1
-	test "${_positionals_count}" -le 1 || _PRINT_HELP=yes die "FATAL ERROR: There were spurious positional arguments --- we expect exactly 1 (namely: $_required_args_string), but got ${_positionals_count} (the last one was: '${_last_positional}')." 1
-}
-
-
-assign_positional_args()
-{
-	local _positional_name _shift_for=$1
-	_positional_names="_arg_operation "
-
-	shift "$_shift_for"
-	for _positional_name in ${_positional_names}
-	do
-		test $# -gt 0 || break
-		eval "$_positional_name=\${1}" || die "Error during argument parsing, possibly an Argbash bug." 1
-		shift
-	done
-}
-
-parse_commandline "$@"
-handle_passed_args_count
-assign_positional_args 1 "${_positionals[@]}"
-
-# OTHER STUFF GENERATED BY Argbash
-
-### END OF CODE GENERATED BY Argbash (sortof) ### ])
-# [ <-- needed because of Argbash
-
-if [ -z ${_arg_mount_point} ]; then
-  die "Missing '--mount-point' argument"
-fi
-
-if [ -z ${_arg_device} ]; then
-  die "Missing '--device' argument"
-fi
-
-ASK_PIN=${_arg_ask_pin}
-OPERATION=${_arg_operation}
-DEVICE=${_arg_device}
-DEVICE_NAME=$(sed "s|/|_|g" <<< ${DEVICE})
-MOUNT_POINT=${_arg_mount_point}
-CREDENTIALS_TYPE=${_arg_credentials_type}
-SALT=${_arg_salt}
-CONF_FILE_PATH="/etc/fido2luksmounthelper.conf"
-
-if [ "${OPERATION}" == "mount" ]; then
-	if [ "${CREDENTIALS_TYPE}" == "external" ]; then
-    if  [ -f ${CONF_FILE_PATH} ]; then
-			if [ "${ASK_PIN}" == "on" ]; then
-				read PASSWORD
-			fi
-			CREDENTIALS=$(<${CONF_FILE_PATH})
-		else
-			die "The configuration file '${CONF_FILE_PATH}' is missing. Please create it or use embedded credentials."
-		fi
-		printf ${PASSWORD} | fido2luks open --salt string:${SALT} --pin --pin-source /dev/stdin ${DEVICE} ${DEVICE_NAME} ${CREDENTIALS}
-	elif [ "${CREDENTIALS_TYPE}" == "embedded" ]; then
-		if [ "${ASK_PIN}" == "on" ]; then
-			read PASSWORD
-		fi
-		printf ${PASSWORD} | fido2luks open-token --salt string:${SALT} --pin --pin-source /dev/stdin ${DEVICE} ${DEVICE_NAME}
-	else
-		die "Given credential-type '${CREDENTIALS_TYPE}' is invalid. It must be 'external' or 'embedded'"
-	fi 
-	mount /dev/mapper/${DEVICE_NAME} ${MOUNT_POINT}
-elif [ "${OPERATION}" == "umount" ]; then
-  umount ${MOUNT_POINT}
-  cryptsetup luksClose ${DEVICE_NAME}
-else
-  die "Given operation '${OPERATION}' is invalid. It must be 'mount' or 'unmount'"
-fi
-
-exit 0
-
-# ] <-- needed because of Argbash

src/cli.rs

@@ -1,24 +1,132 @@
 use crate::error::*;
-use crate::luks::{Fido2LuksToken, LuksDevice};
-use crate::util::sha256;
 use crate::*;
-pub use cli_args::Args;
+
-use cli_args::*;
-use ctap::{FidoCredential, FidoErrorKind};
-use std::borrow::Cow;
-use std::collections::HashSet;
-use std::io::Write;
-use std::iter::FromIterator;
-use std::path::Path;
-use std::str::FromStr;
-use std::thread;
-use std::time::Duration;
-use std::time::SystemTime;
-use structopt::clap::Shell;
 use structopt::StructOpt;
 
-fn read_pin() -> Fido2LuksResult<String> {
+use ctap::{FidoCredential, FidoErrorKind};
-    util::read_password_tty("Authenticator PIN", false)
+use failure::_core::fmt::{Display, Error, Formatter};
+use failure::_core::str::FromStr;
+use failure::_core::time::Duration;
+use std::io::Write;
+use std::process::exit;
+use std::thread;
+
+use crate::luks::{Fido2LuksToken, LuksDevice};
+use crate::util::sha256;
+use std::borrow::Cow;
+use std::collections::HashSet;
+use std::time::SystemTime;
+
+#[derive(Debug, Eq, PartialEq, Clone)]
+pub struct HexEncoded(pub Vec<u8>);
+
+impl Display for HexEncoded {
+    fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), Error> {
+        f.write_str(&hex::encode(&self.0))
+    }
+}
+
+impl AsRef<[u8]> for HexEncoded {
+    fn as_ref(&self) -> &[u8] {
+        &self.0[..]
+    }
+}
+
+impl FromStr for HexEncoded {
+    type Err = hex::FromHexError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        Ok(HexEncoded(hex::decode(s)?))
+    }
+}
+
+#[derive(Debug, Eq, PartialEq, Clone)]
+pub struct CommaSeparated<T: FromStr + Display>(pub Vec<T>);
+
+impl<T: Display + FromStr> Display for CommaSeparated<T> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), Error> {
+        for i in &self.0 {
+            f.write_str(&i.to_string())?;
+            f.write_str(",")?;
+        }
+        Ok(())
+    }
+}
+
+impl<T: Display + FromStr> FromStr for CommaSeparated<T> {
+    type Err = <T as FromStr>::Err;
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        Ok(CommaSeparated(
+            s.split(',')
+                .map(|part| <T as FromStr>::from_str(part))
+                .collect::<Result<Vec<_>, _>>()?,
+        ))
+    }
+}
+
+#[derive(Debug, StructOpt)]
+pub struct Credentials {
+    /// FIDO credential ids, separated by ',' generate using fido2luks credential
+    #[structopt(name = "credential-id", env = "FIDO2LUKS_CREDENTIAL_ID")]
+    pub ids: CommaSeparated<HexEncoded>,
+}
+
+#[derive(Debug, StructOpt)]
+pub struct AuthenticatorParameters {
+    /// Request a PIN to unlock the authenticator
+    #[structopt(short = "P", long = "pin")]
+    pub pin: bool,
+
+    /// Await for an authenticator to be connected, timeout after n seconds
+    #[structopt(
+        long = "await-dev",
+        name = "await-dev",
+        env = "FIDO2LUKS_DEVICE_AWAIT",
+        default_value = "15"
+    )]
+    pub await_time: u64,
+}
+
+#[derive(Debug, StructOpt)]
+pub struct LuksParameters {
+    #[structopt(env = "FIDO2LUKS_DEVICE")]
+    device: PathBuf,
+
+    /// Try to unlock the device using a specifc keyslot, ignore all other slots
+    #[structopt(long = "slot", env = "FIDO2LUKS_DEVICE_SLOT")]
+    slot: Option<u32>,
+}
+
+#[derive(Debug, StructOpt, Clone)]
+pub struct LuksModParameters {
+    /// Number of milliseconds required to derive the volume decryption key
+    /// Defaults to 10ms when using an authenticator or the default by cryptsetup when using a password
+    #[structopt(long = "kdf-time", name = "kdf-time")]
+    kdf_time: Option<u64>,
+}
+
+#[derive(Debug, StructOpt)]
+pub struct SecretParameters {
+    /// Salt for secret generation, defaults to 'ask'
+    ///
+    /// Options:{n}
+    ///  - ask              : Prompt user using password helper{n}
+    ///  - file:<PATH>      : Will read <FILE>{n}
+    ///  - string:<STRING>  : Will use <STRING>, which will be handled like a password provided to the 'ask' option{n}
+    #[structopt(
+        name = "salt",
+        long = "salt",
+        env = "FIDO2LUKS_SALT",
+        default_value = "ask"
+    )]
+    pub salt: InputSalt,
+    /// Script used to obtain passwords, overridden by --interactive flag
+    #[structopt(
+        name = "password-helper",
+        env = "FIDO2LUKS_PASSWORD_HELPER",
+        default_value = "/usr/bin/env systemd-ask-password 'Please enter second factor for LUKS disk encryption!'"
+    )]
+    pub password_helper: PasswordHelper,
 }
 
 fn derive_secret(
@@ -27,9 +135,6 @@ fn derive_secret(
     timeout: u64,
     pin: Option<&str>,
 ) -> Fido2LuksResult<([u8; 32], FidoCredential)> {
-    if credentials.is_empty() {
-        return Err(Fido2LuksError::InsufficientCredentials);
-    }
     let timeout = Duration::from_secs(timeout);
     let start = SystemTime::now();
 
@@ -57,118 +162,181 @@ fn derive_secret(
     let (unsalted, cred) =
         perform_challenge(&credentials, salt, timeout - start.elapsed().unwrap(), pin)?;
 
-    let binary = sha256(&[salt, &unsalted[..]]);
+    Ok((sha256(&[salt, &unsalted[..]]), cred.clone()))
-    Ok((binary, cred.clone()))
 }
 
-pub fn extend_creds_device(
+fn read_pin() -> Fido2LuksResult<String> {
-    creds: &[HexEncoded],
+    util::read_password("Authenticator PIN", false)
-    luks_dev: &mut LuksDevice,
-) -> Fido2LuksResult<Vec<HexEncoded>> {
-    let mut additional = HashSet::new();
-    additional.extend(creds.iter().cloned());
-    for token in luks_dev.tokens()? {
-        for cred in token?.1.credential {
-            let parsed = HexEncoded::from_str(cred.as_str()).map_err(|_e| {
-                Fido2LuksError::HexEncodingError {
-                    string: cred.clone(),
-                }
-            })?;
-            additional.insert(parsed);
-        }
-    }
-    Ok(Vec::from_iter(additional.into_iter()))
 }
 
-pub fn get_input(
+#[derive(Debug, StructOpt)]
-    secret: &SecretParameters,
+pub struct Args {
-    authenticator: &AuthenticatorParameters,
+    /// Request passwords via Stdin instead of using the password helper
-    interactive: bool,
+    #[structopt(short = "i", long = "interactive")]
-    q: &str,
+    pub interactive: bool,
-    verify: bool,
+    #[structopt(subcommand)]
-) -> Fido2LuksResult<(Option<String>, [u8; 32])> {
+    pub command: Command,
-    let password_helper = secret
+}
-        .password_helper
+
-        .as_ref()
+#[derive(Debug, StructOpt, Clone)]
-        .map(|helper| move || helper.obtain());
+pub struct OtherSecret {
-    let salt = &secret.salt;
+    /// Use a keyfile instead of a password
-    Ok(if interactive {
+    #[structopt(short = "d", long = "keyfile", conflicts_with = "fido_device")]
-        (
+    keyfile: Option<PathBuf>,
-            if authenticator.pin && may_require_pin()? {
+    /// Use another fido device instead of a password
-                Some(read_pin()?)
+    /// Note: this requires for the credential fot the other device to be passed as argument as well
-            } else {
+    #[structopt(short = "f", long = "fido-device", conflicts_with = "keyfile")]
-                None
+    fido_device: bool,
+}
+
+#[derive(Debug, StructOpt)]
+pub enum Command {
+    #[structopt(name = "print-secret")]
+    PrintSecret {
+        /// Prints the secret as binary instead of hex encoded
+        #[structopt(short = "b", long = "bin")]
+        binary: bool,
+        #[structopt(flatten)]
+        credentials: Credentials,
+        #[structopt(flatten)]
+        authenticator: AuthenticatorParameters,
+        #[structopt(flatten)]
+        secret: SecretParameters,
     },
-            salt.obtain_sha256(Some(|| util::read_password_tty(q, verify)))?,
+    /// Adds a generated key to the specified LUKS device
-        )
+    #[structopt(name = "add-key")]
-    } else {
+    AddKey {
-        match (
+        #[structopt(flatten)]
-            authenticator.pin && may_require_pin()?,
+        luks: LuksParameters,
-            authenticator.pin_prefixed,
+        #[structopt(flatten)]
-        ) {
+        credentials: Credentials,
-            (true, false) => (Some(read_pin()?), salt.obtain_sha256(password_helper)?),
+        #[structopt(flatten)]
-            (true, true) => read_password_pin_prefixed(|| {
+        authenticator: AuthenticatorParameters,
-                salt.obtain(password_helper).and_then(|secret| {
+        #[structopt(flatten)]
-                    String::from_utf8(secret).map_err(|e| Fido2LuksError::from(e))
+        secret: SecretParameters,
-                })
+        /// Will wipe all other keys
-            })?,
+        #[structopt(short = "e", long = "exclusive")]
-            (false, _) => (None, salt.obtain_sha256(password_helper)?),
+        exclusive: bool,
-        }
+        /// Will add an token to your LUKS 2 header, including the credential id
-    })
+        #[structopt(short = "t", long = "token")]
+        token: bool,
+        #[structopt(flatten)]
+        existing_secret: OtherSecret,
+        #[structopt(flatten)]
+        luks_mod: LuksModParameters,
+    },
+    /// Replace a previously added key with a password
+    #[structopt(name = "replace-key")]
+    ReplaceKey {
+        #[structopt(flatten)]
+        luks: LuksParameters,
+        #[structopt(flatten)]
+        credentials: Credentials,
+        #[structopt(flatten)]
+        authenticator: AuthenticatorParameters,
+        #[structopt(flatten)]
+        secret: SecretParameters,
+        /// Add the password and keep the key
+        #[structopt(short = "a", long = "add-password")]
+        add_password: bool,
+        /// Will add an token to your LUKS 2 header, including the credential id
+        #[structopt(short = "t", long = "token")]
+        token: bool,
+        #[structopt(flatten)]
+        replacement: OtherSecret,
+        #[structopt(flatten)]
+        luks_mod: LuksModParameters,
+    },
+    /// Open the LUKS device
+    #[structopt(name = "open")]
+    Open {
+        #[structopt(flatten)]
+        luks: LuksParameters,
+        #[structopt(env = "FIDO2LUKS_MAPPER_NAME")]
+        name: String,
+        #[structopt(flatten)]
+        credentials: Credentials,
+        #[structopt(flatten)]
+        authenticator: AuthenticatorParameters,
+        #[structopt(flatten)]
+        secret: SecretParameters,
+        #[structopt(short = "r", long = "max-retries", default_value = "0")]
+        retries: i32,
+    },
+    /// Open the LUKS device using credentials embedded in the LUKS 2 header
+    #[structopt(name = "open-token")]
+    OpenToken {
+        #[structopt(flatten)]
+        luks: LuksParameters,
+        #[structopt(env = "FIDO2LUKS_MAPPER_NAME")]
+        name: String,
+        #[structopt(flatten)]
+        authenticator: AuthenticatorParameters,
+        #[structopt(flatten)]
+        secret: SecretParameters,
+        #[structopt(short = "r", long = "max-retries", default_value = "0")]
+        retries: i32,
+    },
+    /// Generate a new FIDO credential
+    #[structopt(name = "credential")]
+    Credential {
+        #[structopt(flatten)]
+        authenticator: AuthenticatorParameters,
+        /// Name to be displayed on the authenticator if it has a display
+        #[structopt(env = "FIDO2LUKS_CREDENTIAL_NAME")]
+        name: Option<String>,
+    },
+    /// Check if an authenticator is connected
+    #[structopt(name = "connected")]
+    Connected,
+    Token(TokenCommand),
 }
 
-pub fn read_password_pin_prefixed(
+///LUKS2 token related operations
-    prefixed: impl Fn() -> Fido2LuksResult<String>,
+#[derive(Debug, StructOpt)]
-) -> Fido2LuksResult<(Option<String>, [u8; 32])> {
+pub enum TokenCommand {
-    let read = prefixed()?;
+    /// List all tokens associated with the specified device
-    let separator = ':';
+    List {
-    let mut parts = read.split(separator);
+        #[structopt(env = "FIDO2LUKS_DEVICE")]
-    let pin = parts.next().filter(|p| p.len() > 0).map(|p| p.to_string());
+        device: PathBuf,
-    let password = match pin {
+        /// Dump all credentials as CSV
-        Some(ref pin) if read.len() > pin.len() => {
+        #[structopt(long = "csv")]
-            read.chars().skip(pin.len() + 1).collect::<String>()
+        csv: bool,
-        }
+    },
-        Some(_) => String::new(),
+    /// Add credential to a keyslot
-        _ => read
+    Add {
-            .chars()
+        #[structopt(env = "FIDO2LUKS_DEVICE")]
-            .skip(read.chars().next().map(|c| c == separator).unwrap_or(false) as usize)
+        device: PathBuf,
-            .collect::<String>(),
+        #[structopt(flatten)]
-    };
+        credentials: Credentials,
-    Ok((pin, util::sha256(&[password.as_bytes()])))
+        /// Slot to which the credentials will be added
-}
+        #[structopt(long = "slot", env = "FIDO2LUKS_DEVICE_SLOT")]
-
+        slot: u32,
-/// generate an more readable name from common paths
+    },
-pub fn derive_credential_name(path: &Path) -> String {
+    /// Remove credentials from token(s)
-    match path.file_name() {
+    Remove {
-        Some(name)
+        #[structopt(env = "FIDO2LUKS_DEVICE")]
-            if path
+        device: PathBuf,
-                .iter()
+        #[structopt(flatten)]
-                .any(|p| p == "by-label" || p == "by-partlabel" || p == "by-uuid") =>
+        credentials: Credentials,
-        {
+        /// Token from which the credentials will be removed
-            name.to_string_lossy().as_ref().to_string()
+        #[structopt(long = "token")]
-        }
+        token_id: Option<u32>,
-        _ => path.display().to_string(),
+    },
-    }
+    /// Remove all unassigned tokens
+    GC {
+        #[structopt(env = "FIDO2LUKS_DEVICE")]
+        device: PathBuf,
+    },
 }
 
 pub fn parse_cmdline() -> Args {
     Args::from_args()
 }
 
-pub fn prompt_interaction(interactive: bool) {
-    if interactive {
-        println!("Authorize using your FIDO device");
-    }
-}
-
 pub fn run_cli() -> Fido2LuksResult<()> {
     let mut stdout = io::stdout();
     let args = parse_cmdline();
-    let log = |message: &dyn Fn() -> String| {
-        if args.verbose {
-            eprintln!("{}", &*message());
-        }
-    };
     let interactive = args.interactive;
     match &args.command {
         Command::Credential {
@@ -176,13 +344,13 @@ pub fn run_cli() -> Fido2LuksResult<()> {
             name,
         } => {
             let pin_string;
-            let pin = if authenticator.pin && may_require_pin()? {
+            let pin = if authenticator.pin {
                 pin_string = read_pin()?;
                 Some(pin_string.as_ref())
             } else {
                 None
             };
-            let cred = make_credential_id(Some(name.as_ref()), pin)?;
+            let cred = make_credential_id(name.as_ref().map(|n| n.as_ref()), pin)?;
             println!("{}", hex::encode(&cred.id));
             Ok(())
         }
@@ -191,44 +359,25 @@ pub fn run_cli() -> Fido2LuksResult<()> {
             authenticator,
             credentials,
             secret,
-            device,
         } => {
-            let (pin, salt) =
+            let pin_string;
-                get_input(&secret, &authenticator, args.interactive, "Password", false)?;
+            let pin = if authenticator.pin {
-            let credentials = if let Some(path) = device {
+                pin_string = read_pin()?;
-                let mut dev = LuksDevice::load(path)?;
+                Some(pin_string.as_ref())
-                let luks2 = dev.is_luks2()?;
-                log(&|| format!("luks2 supported: {}", luks2));
-                extend_creds_device(
-                    credentials
-                        .ids
-                        .clone()
-                        .map(|cs| cs.0)
-                        .unwrap_or_default()
-                        .as_slice(),
-                    &mut dev,
-                )?
             } else {
-                credentials.ids.clone().map(|cs| cs.0).unwrap_or_default()
+                None
             };
-            log(&|| {
+            let salt = if interactive || secret.password_helper == PasswordHelper::Stdin {
-                format!(
+                util::read_password_hashed("Password", false)
-                    "credentials: {}",
+            } else {
-                    credentials
+                secret.salt.obtain(&secret.password_helper)
-                        .iter()
+            }?;
-                        .map(ToString::to_string)
+            let (secret, _cred) = derive_secret(
-                        .collect::<Vec<_>>()
+                credentials.ids.0.as_slice(),
-                        .join(", ")
-                )
-            });
-            prompt_interaction(interactive);
-            let (secret, cred) = derive_secret(
-                &credentials,
                 &salt,
                 authenticator.await_time,
-                pin.as_deref(),
+                pin,
             )?;
-            log(&|| format!("credential used: {}", hex::encode(&cred.id)));
             if *binary {
                 stdout.write_all(&secret[..])?;
             } else {
@@ -243,6 +392,7 @@ pub fn run_cli() -> Fido2LuksResult<()> {
             secret,
             luks_mod,
             existing_secret: other_secret,
+            token,
             ..
         }
         | Command::ReplaceKey {
@@ -252,41 +402,21 @@ pub fn run_cli() -> Fido2LuksResult<()> {
             secret,
             luks_mod,
             replacement: other_secret,
+            token,
             ..
         } => {
-            let mut luks_dev = LuksDevice::load(&luks.device)?;
+            let pin = if authenticator.pin {
-
+                Some(read_pin()?)
-            let luks2 = luks_dev.is_luks2()?;
-
-            log(&|| format!("luks2 supported: {}", luks2));
-
-            let credentials = if !luks.disable_token && luks2 {
-                extend_creds_device(
-                    credentials
-                        .ids
-                        .clone()
-                        .map(|cs| cs.0)
-                        .unwrap_or_default()
-                        .as_slice(),
-                    &mut luks_dev,
-                )?
             } else {
-                credentials.ids.clone().map(|cs| cs.0).unwrap_or_default()
+                None
             };
-            log(&|| {
+            let salt = |q: &str, verify: bool| -> Fido2LuksResult<[u8; 32]> {
-                format!(
+                if interactive || secret.password_helper == PasswordHelper::Stdin {
-                    "credentials: {}",
+                    util::read_password_hashed(q, verify)
-                    credentials
+                } else {
-                        .iter()
+                    secret.salt.obtain(&secret.password_helper)
-                        .map(ToString::to_string)
+                }
-                        .collect::<Vec<_>>()
-                        .join(", ")
-                )
-            });
-            let inputs = |q: &str, verify: bool| -> Fido2LuksResult<(Option<String>, [u8; 32])> {
-                get_input(&secret, &authenticator, args.interactive, q, verify)
             };
-
             let other_secret = |salt_q: &str,
                                 verify: bool|
              -> Fido2LuksResult<(Vec<u8>, Option<FidoCredential>)> {
@@ -297,70 +427,38 @@ pub fn run_cli() -> Fido2LuksResult<()> {
                     } => Ok((util::read_keyfile(file)?, None)),
                     OtherSecret {
                         fido_device: true, ..
-                    } => {
+                    } => Ok(derive_secret(
-                        let (pin, salt) = inputs(salt_q, verify)?;
+                        &credentials.ids.0,
-                        prompt_interaction(interactive);
+                        &salt(salt_q, verify)?,
-                        Ok(derive_secret(
-                            &credentials,
-                            &salt,
                         authenticator.await_time,
                         pin.as_deref(),
                     )
-                        .map(|(secret, cred)| (secret[..].to_vec(), Some(cred)))?)
+                    .map(|(secret, cred)| (secret[..].to_vec(), Some(cred)))?),
-                    }
                     _ => Ok((
-                        util::read_password_tty(salt_q, verify)?.as_bytes().to_vec(),
+                        util::read_password(salt_q, verify)?.as_bytes().to_vec(),
                         None,
                     )),
                 }
             };
-            let secret = |q: &str,
+            let secret = |verify: bool| -> Fido2LuksResult<([u8; 32], FidoCredential)> {
-                          verify: bool,
+                derive_secret(
-                          credentials: &[HexEncoded]|
+                    &credentials.ids.0,
-             -> Fido2LuksResult<([u8; 32], FidoCredential)> {
+                    &salt("Password", verify)?,
-                let (pin, salt) = inputs(q, verify)?;
+                    authenticator.await_time,
-                prompt_interaction(interactive);
+                    pin.as_deref(),
-                derive_secret(credentials, &salt, authenticator.await_time, pin.as_deref())
+                )
             };
+            let mut luks_dev = LuksDevice::load(&luks.device)?;
             // Non overlap
             match &args.command {
-                Command::AddKey {
+                Command::AddKey { exclusive, .. } => {
-                    exclusive,
-                    generate_credential,
-                    ..
-                } => {
                     let (existing_secret, _) = other_secret("Current password", false)?;
-                    let (new_secret, cred) = if *generate_credential && luks2 {
+                    let (new_secret, cred) = secret(true)?;
-                        let cred = make_credential_id(
-                            Some(derive_credential_name(luks.device.as_path()).as_str()),
-                            (if authenticator.pin && may_require_pin()? {
-                                //TODO: not ideal since it ignores pin-prefixed
-                                Some(read_pin()?)
-                            } else {
-                                None
-                            })
-                            .as_deref(),
-                        )?;
-                        log(&|| {
-                            format!(
-                                "generated credential: {}\ncredential username: {:?}",
-                                hex::encode(&cred.id),
-                                derive_credential_name(luks.device.as_path())
-                            )
-                        });
-                        let creds = vec![HexEncoded(cred.id)];
-                        secret("Password to be added", true, &creds)
-                    } else {
-                        secret("Password to be added", true, &credentials)
-                    }?;
-                    log(&|| format!("credential used: {}", hex::encode(&cred.id)));
                     let added_slot = luks_dev.add_key(
                         &new_secret,
                         &existing_secret[..],
                         luks_mod.kdf_time.or(Some(10)),
-                        Some(&cred.id[..])
+                        Some(&cred.id[..]).filter(|_| *token),
-                            .filter(|_| !luks.disable_token || *generate_credential)
-                            .filter(|_| luks2),
                     )?;
                     if *exclusive {
                         let destroyed = luks_dev.remove_keyslots(&[added_slot])?;
@@ -379,42 +477,24 @@ pub fn run_cli() -> Fido2LuksResult<()> {
                     }
                     Ok(())
                 }
-                Command::ReplaceKey {
+                Command::ReplaceKey { add_password, .. } => {
-                    add_password,
+                    let (existing_secret, _) = secret(false)?;
-                    remove_cred,
-                    ..
-                } => {
-                    let (existing_secret, _prev_cred) =
-                        secret("Current password", false, &credentials)?;
                     let (replacement_secret, cred) = other_secret("Replacement password", true)?;
                     let slot = if *add_password {
                         luks_dev.add_key(
                             &replacement_secret[..],
                             &existing_secret,
                             luks_mod.kdf_time,
-                            cred.as_ref()
+                            cred.as_ref().filter(|_| *token).map(|cred| &cred.id[..]),
-                                .filter(|_| !luks.disable_token)
-                                .filter(|_| luks2)
-                                .map(|cred| &cred.id[..]),
                         )
                     } else {
-                        let slot = luks_dev.replace_key(
+                        luks_dev.replace_key(
                             &replacement_secret[..],
                             &existing_secret,
                             luks_mod.kdf_time,
-                            cred.as_ref()
+                            cred.as_ref().filter(|_| *token).map(|cred| &cred.id[..]),
-                                .filter(|_| !luks.disable_token)
+                        )
-                                .filter(|_| luks2)
-                                .map(|cred| &cred.id[..]),
-                        )?;
-                        if *remove_cred && cred.is_none() {
-                            luks_dev.remove_token_slot(slot)?;
-                        }
-                        Ok(slot)
                     }?;
-                    if let Some(cred) = cred {
-                        log(&|| format!("credential used: {}", hex::encode(&cred.id)));
-                    }
                     println!(
                         "Added to password to device {}, slot: {}",
                         luks.device.display(),
@@ -430,71 +510,62 @@ pub fn run_cli() -> Fido2LuksResult<()> {
             authenticator,
             secret,
             name,
-            credentials,
             retries,
-            dry_run,
+            ..
+        }
+        | Command::OpenToken {
+            luks,
+            authenticator,
+            secret,
+            name,
+            retries,
         } => {
-            let inputs = |q: &str, verify: bool| -> Fido2LuksResult<(Option<String>, [u8; 32])> {
+            let pin_string;
-                get_input(&secret, &authenticator, args.interactive, q, verify)
+            let pin = if authenticator.pin {
+                pin_string = read_pin()?;
+                Some(pin_string.as_ref())
+            } else {
+                None
+            };
+            let salt = |q: &str, verify: bool| -> Fido2LuksResult<[u8; 32]> {
+                if interactive || secret.password_helper == PasswordHelper::Stdin {
+                    util::read_password_hashed(q, verify)
+                } else {
+                    secret.salt.obtain(&secret.password_helper)
+                }
             };
 
             // Cow shouldn't be necessary
             let secret = |credentials: Cow<'_, Vec<HexEncoded>>| {
-                let (pin, salt) = inputs("Password", false)?;
-                prompt_interaction(interactive);
                 derive_secret(
                     credentials.as_ref(),
-                    &salt,
+                    &salt("Password", false)?,
                     authenticator.await_time,
-                    pin.as_deref(),
+                    pin,
                 )
             };
 
             let mut retries = *retries;
             let mut luks_dev = LuksDevice::load(&luks.device)?;
-            let luks2 = luks_dev.is_luks2()?;
-            log(&|| format!("luks2 supported: {}", luks2));
             loop {
-                let slot = if let Some(ref credentials) = credentials.ids {
+                let secret = match &args.command {
-                    log(&|| {
+                    Command::Open { credentials, .. } => secret(Cow::Borrowed(&credentials.ids.0))
-                        format!(
+                        .and_then(|(secret, _cred)| luks_dev.activate(&name, &secret, luks.slot)),
-                            "credentials: {}",
+                    Command::OpenToken { .. } => luks_dev.activate_token(
-                            credentials
-                                .0
-                                .iter()
-                                .map(ToString::to_string)
-                                .collect::<Vec<_>>()
-                                .join(", ")
-                        )
-                    });
-                    secret(Cow::Borrowed(&credentials.0)).and_then(|(secret, cred)| {
-                        log(&|| format!("credential used: {}", hex::encode(&cred.id)));
-                        luks_dev.activate(&name, &secret, luks.slot, *dry_run)
-                    })
-                } else if luks2 && !luks.disable_token {
-                    luks_dev.activate_token(
                         &name,
                         Box::new(|credentials: Vec<String>| {
-                            log(&|| format!("credentials: {}", credentials.join(", ")));
                             let creds = credentials
                                 .into_iter()
                                 .flat_map(|cred| HexEncoded::from_str(cred.as_ref()).ok())
                                 .collect::<Vec<_>>();
-                            secret(Cow::Owned(creds)).map(|(secret, cred)| {
+                            secret(Cow::Owned(creds))
-                                log(&|| format!("credential used: {}", hex::encode(&cred.id)));
+                                .map(|(secret, cred)| (secret, hex::encode(&cred.id)))
-                                (secret, hex::encode(&cred.id))
-                            })
                         }),
                         luks.slot,
-                        *dry_run,
+                    ),
-                    )
+                    _ => unreachable!(),
-                } else if luks_dev.is_luks2()? && luks.disable_token {
-                    // disable-token is mostly cosmetic in this instance
-                    return Err(Fido2LuksError::InsufficientCredentials);
-                } else {
-                    return Err(Fido2LuksError::WrongSecret);
                 };
-                match slot {
+                match secret {
                     Err(e) => {
                         match e {
                             Fido2LuksError::WrongSecret if retries > 0 => {}
@@ -502,14 +573,11 @@ pub fn run_cli() -> Fido2LuksResult<()> {
                                 if cause.kind() == FidoErrorKind::Timeout && retries > 0 => {}
 
                             e => return Err(e),
-                        };
+                        }
                         retries -= 1;
                         eprintln!("{}", e);
                     }
-                    Ok(slot) => {
+                    res => break res.map(|_| ()),
-                        log(&|| format!("keyslot: {}", slot));
-                        break Ok(());
-                    }
                 }
             }
         }
@@ -579,7 +647,7 @@ pub fn run_cli() -> Fido2LuksResult<()> {
                     }
                 }
                 let count = if tokens.is_empty() {
-                    dev.add_token(&Fido2LuksToken::with_credentials(&credentials.0, *slot))?;
+                    dev.add_token(&Fido2LuksToken::with_credentials(&credentials.ids.0, *slot))?;
                     1
                 } else {
                     tokens.len()
@@ -587,7 +655,7 @@ pub fn run_cli() -> Fido2LuksResult<()> {
                 for (id, mut token) in tokens {
                     token
                         .credential
-                        .extend(credentials.0.iter().map(|h| h.to_string()));
+                        .extend(credentials.ids.0.iter().map(|h| h.to_string()));
                     dev.update_token(id, &token)?;
                 }
                 println!("Updated {} tokens", count);
@@ -615,7 +683,7 @@ pub fn run_cli() -> Fido2LuksResult<()> {
                     token.credential = token
                         .credential
                         .into_iter()
-                        .filter(|cred| !credentials.0.iter().any(|h| &h.to_string() == cred))
+                        .filter(|cred| !credentials.ids.0.iter().any(|h| &h.to_string() == cred))
                         .collect();
                     dev.update_token(id, &token)?;
                 }
@@ -644,65 +712,5 @@ pub fn run_cli() -> Fido2LuksResult<()> {
                 Ok(())
             }
         },
-        Command::GenerateCompletions { shell, out_dir } => {
-            // zsh won't work atm https://github.com/clap-rs/clap/issues/1822
-            if let Some(s) = shell {
-                if s.as_str() == "zsh" {
-                    unimplemented!("zsh completions are broken atm: see https://github.com/clap-rs/clap/issues/1822")
-                }
-            }
-            for variant in Shell::variants().iter().filter(|v| *v != &"zsh") {
-                if let Some(s) = shell {
-                    if *variant != s.as_str() {
-                        break;
-                    }
-                }
-                Args::clap().gen_completions(
-                    env!("CARGO_PKG_NAME"),
-                    Shell::from_str(variant)
-                        .expect("structopt shouldn't allow us to reach this point"),
-                    &out_dir,
-                );
-            }
-            Ok(())
-        }
-    }
-}
-
-#[cfg(test)]
-mod test {
-
-    use super::*;
-
-    #[test]
-    fn test_read_password_pin_prefixed() {
-        // 1234:test -> PIN: 1234, password: test
-        assert_eq!(
-            read_password_pin_prefixed(|| Ok("1234:test".into())).unwrap(),
-            (Some("1234".to_string()), util::sha256(&["test".as_bytes()]))
-        );
-        // :test -> PIN: None, password: test
-        assert_eq!(
-            read_password_pin_prefixed(|| Ok(":test".into())).unwrap(),
-            (None, util::sha256(&["test".as_bytes()]))
-        );
-        // 1234::test -> PIN: 1234, password: :test
-        assert_eq!(
-            read_password_pin_prefixed(|| Ok("1234::test".into())).unwrap(),
-            (
-                Some("1234".to_string()),
-                util::sha256(&[":test".as_bytes()])
-            )
-        );
-        // 1234 -> PIN: 1234, password: empty
-        assert_eq!(
-            read_password_pin_prefixed(|| Ok("1234".into())).unwrap(),
-            (Some("1234".to_string()), util::sha256(&["".as_bytes()]))
-        );
-        // 1234:test -> PIN: None, password: test
-        assert_eq!(
-            read_password_pin_prefixed(|| Ok(":test".into())).unwrap(),
-            (None, util::sha256(&["test".as_bytes()]))
-        );
     }
 }

src/cli_args/mod.rs

@@ -1,320 +0,0 @@
-use std::fmt::{Display, Error, Formatter};
-use std::hash::{Hash, Hasher};
-use std::path::PathBuf;
-use std::str::FromStr;
-use structopt::clap::{AppSettings, Shell};
-use structopt::StructOpt;
-
-mod config;
-
-pub use config::*;
-
-#[derive(Debug, Eq, PartialEq, Clone)]
-pub struct HexEncoded(pub Vec<u8>);
-
-impl Display for HexEncoded {
-    fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), Error> {
-        f.write_str(&hex::encode(&self.0))
-    }
-}
-
-impl AsRef<[u8]> for HexEncoded {
-    fn as_ref(&self) -> &[u8] {
-        &self.0[..]
-    }
-}
-
-impl FromStr for HexEncoded {
-    type Err = hex::FromHexError;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        Ok(HexEncoded(hex::decode(s)?))
-    }
-}
-
-impl Hash for HexEncoded {
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        self.0.hash(state)
-    }
-}
-
-#[derive(Debug, Eq, PartialEq, Clone)]
-pub struct CommaSeparated<T: FromStr + Display>(pub Vec<T>);
-
-impl<T: Display + FromStr> Display for CommaSeparated<T> {
-    fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), Error> {
-        for i in &self.0 {
-            f.write_str(&i.to_string())?;
-            f.write_str(",")?;
-        }
-        Ok(())
-    }
-}
-
-impl<T: Display + FromStr> FromStr for CommaSeparated<T> {
-    type Err = <T as FromStr>::Err;
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        Ok(CommaSeparated(
-            s.split(',')
-                .map(|part| <T as FromStr>::from_str(part))
-                .collect::<Result<Vec<_>, _>>()?,
-        ))
-    }
-}
-
-#[derive(Debug, StructOpt)]
-pub struct Credentials {
-    /// FIDO credential ids, separated by ',' generate using fido2luks credential
-    #[structopt(
-        name = "credential-ids",
-        env = "FIDO2LUKS_CREDENTIAL_ID",
-        short = "c",
-        long = "creds"
-    )]
-    pub ids: Option<CommaSeparated<HexEncoded>>,
-}
-
-#[derive(Debug, StructOpt)]
-pub struct AuthenticatorParameters {
-    /// Request a PIN to unlock the authenticator if required
-    #[structopt(short = "P", long = "pin")]
-    pub pin: bool,
-
-    /// Request PIN and password combined `pin:password` when using an password helper
-    #[structopt(long = "pin-prefixed")]
-    pub pin_prefixed: bool,
-
-    /// Await for an authenticator to be connected, timeout after n seconds
-    #[structopt(
-        long = "await-dev",
-        name = "await-dev",
-        env = "FIDO2LUKS_DEVICE_AWAIT",
-        default_value = "15"
-    )]
-    pub await_time: u64,
-}
-
-#[derive(Debug, StructOpt)]
-pub struct LuksParameters {
-    #[structopt(env = "FIDO2LUKS_DEVICE")]
-    pub device: PathBuf,
-
-    /// Try to unlock the device using a specifc keyslot, ignore all other slots
-    #[structopt(long = "slot", env = "FIDO2LUKS_DEVICE_SLOT")]
-    pub slot: Option<u32>,
-
-    /// Disable implicit use of LUKS2 tokens
-    #[structopt(
-        long = "disable-token",
-    //  env = "FIDO2LUKS_DISABLE_TOKEN" // unfortunately clap will convert flags into args if they have an env attribute
-    )]
-    pub disable_token: bool,
-}
-
-#[derive(Debug, StructOpt, Clone)]
-pub struct LuksModParameters {
-    /// Number of milliseconds required to derive the volume decryption key
-    /// Defaults to 10ms when using an authenticator or the default by cryptsetup when using a password
-    #[structopt(long = "kdf-time", name = "kdf-time", env = "FIDO2LUKS_KDF_TIME")]
-    pub kdf_time: Option<u64>,
-}
-
-#[derive(Debug, StructOpt)]
-pub struct SecretParameters {
-    /// Salt for secret generation, defaults to 'ask'
-    ///
-    /// Options:{n}
-    ///  - ask              : Prompt user using password helper{n}
-    ///  - file:<PATH>      : Will read <FILE>{n}
-    ///  - string:<STRING>  : Will use <STRING>, which will be handled like a password provided to the 'ask' option{n}
-    #[structopt(
-        name = "salt",
-        long = "salt",
-        env = "FIDO2LUKS_SALT",
-        default_value = "ask"
-    )]
-    pub salt: SecretInput,
-    /// Script used to obtain passwords, overridden by --interactive flag
-    #[structopt(
-        name = "password-helper",
-        env = "FIDO2LUKS_PASSWORD_HELPER",
-        long = "password-helper"
-    )]
-    pub password_helper: Option<PasswordHelper>,
-}
-#[derive(Debug, StructOpt)]
-pub struct Args {
-    /// Request passwords via Stdin instead of using the password helper
-    #[structopt(short = "i", long = "interactive")]
-    pub interactive: bool,
-    #[structopt(short = "v", long = "verbose")]
-    pub verbose: bool,
-    #[structopt(subcommand)]
-    pub command: Command,
-}
-
-#[derive(Debug, StructOpt, Clone)]
-pub struct OtherSecret {
-    /// Use a keyfile instead of a password
-    #[structopt(short = "d", long = "keyfile", conflicts_with = "fido_device")]
-    pub keyfile: Option<PathBuf>,
-    /// Use another fido device instead of a password
-    /// Note: this requires for the credential for the other device to be passed as argument as well
-    #[structopt(short = "f", long = "fido-device", conflicts_with = "keyfile")]
-    pub fido_device: bool,
-}
-
-#[derive(Debug, StructOpt)]
-pub enum Command {
-    #[structopt(name = "print-secret")]
-    PrintSecret {
-        // version 0.3.0 will store use the lower case ascii encoded hex string making binary output unnecessary
-        /// Prints the secret as binary instead of hex encoded
-        #[structopt(hidden = true, short = "b", long = "bin")]
-        binary: bool,
-        #[structopt(flatten)]
-        credentials: Credentials,
-        #[structopt(flatten)]
-        authenticator: AuthenticatorParameters,
-        #[structopt(flatten)]
-        secret: SecretParameters,
-        /// Load credentials from LUKS header
-        #[structopt(env = "FIDO2LUKS_DEVICE")]
-        device: Option<PathBuf>,
-    },
-    /// Adds a generated key to the specified LUKS device
-    #[structopt(name = "add-key")]
-    AddKey {
-        #[structopt(flatten)]
-        luks: LuksParameters,
-        #[structopt(flatten)]
-        credentials: Credentials,
-        #[structopt(flatten)]
-        authenticator: AuthenticatorParameters,
-        #[structopt(flatten)]
-        secret: SecretParameters,
-        /// Will wipe all other keys
-        #[structopt(short = "e", long = "exclusive")]
-        exclusive: bool,
-        /// Will generate an credential while adding a new key to this LUKS device if supported
-        #[structopt(short = "g", long = "gen-cred")]
-        generate_credential: bool,
-        #[structopt(flatten)]
-        existing_secret: OtherSecret,
-        #[structopt(flatten)]
-        luks_mod: LuksModParameters,
-    },
-    /// Replace a previously added key with a password
-    #[structopt(name = "replace-key")]
-    ReplaceKey {
-        #[structopt(flatten)]
-        luks: LuksParameters,
-        #[structopt(flatten)]
-        credentials: Credentials,
-        #[structopt(flatten)]
-        authenticator: AuthenticatorParameters,
-        #[structopt(flatten)]
-        secret: SecretParameters,
-        /// Add the password and keep the key
-        #[structopt(short = "a", long = "add-password")]
-        add_password: bool,
-        /// Remove the affected credential from LUKS header
-        #[structopt(short = "r", long = "remove-cred")]
-        remove_cred: bool,
-        #[structopt(flatten)]
-        replacement: OtherSecret,
-        #[structopt(flatten)]
-        luks_mod: LuksModParameters,
-    },
-    /// Open the LUKS device
-    #[structopt(name = "open", alias = "open-token")]
-    Open {
-        #[structopt(flatten)]
-        luks: LuksParameters,
-        #[structopt(env = "FIDO2LUKS_MAPPER_NAME")]
-        name: String,
-        #[structopt(flatten)]
-        credentials: Credentials,
-        #[structopt(flatten)]
-        authenticator: AuthenticatorParameters,
-        #[structopt(flatten)]
-        secret: SecretParameters,
-        #[structopt(short = "r", long = "max-retries", default_value = "0")]
-        retries: i32,
-        /// Perform the whole procedure without mounting the LUKS volume on success
-        #[structopt(long = "dry-run")]
-        dry_run: bool,
-    },
-    /// Generate a new FIDO credential
-    #[structopt(name = "credential")]
-    Credential {
-        #[structopt(flatten)]
-        authenticator: AuthenticatorParameters,
-        /// Name to be displayed on the authenticator display
-        #[structopt(env = "FIDO2LUKS_CREDENTIAL_NAME", default_value = "fido2luks")]
-        name: String,
-    },
-    /// Check if an authenticator is connected
-    #[structopt(name = "connected")]
-    Connected,
-    Token(TokenCommand),
-    /// Generate bash completion scripts
-    /// Example: fido2luks completions --shell bash /usr/share/bash-completion/completions
-    #[structopt(name = "completions", setting = AppSettings::Hidden)]
-    GenerateCompletions {
-        /// Shell to generate completions for
-        #[structopt(short = "s", long = "shell",possible_values = &Shell::variants()[..])]
-        shell: Option<String>,
-        out_dir: PathBuf,
-    },
-}
-
-///LUKS2 token related operations
-#[derive(Debug, StructOpt)]
-pub enum TokenCommand {
-    /// List all tokens associated with the specified device
-    List {
-        #[structopt(env = "FIDO2LUKS_DEVICE")]
-        device: PathBuf,
-        /// Dump all credentials as CSV
-        #[structopt(long = "csv")]
-        csv: bool,
-    },
-    /// Add credential to a keyslot
-    Add {
-        #[structopt(env = "FIDO2LUKS_DEVICE")]
-        device: PathBuf,
-        /// FIDO credential ids, separated by ',' generate using fido2luks credential
-        #[structopt(
-            name = "credential-ids",
-            env = "FIDO2LUKS_CREDENTIAL_ID",
-            short = "c",
-            long = "creds"
-        )]
-        credentials: CommaSeparated<HexEncoded>,
-        /// Slot to which the credentials will be added
-        #[structopt(long = "slot", env = "FIDO2LUKS_DEVICE_SLOT")]
-        slot: u32,
-    },
-    /// Remove credentials from token(s)
-    Remove {
-        #[structopt(env = "FIDO2LUKS_DEVICE")]
-        device: PathBuf,
-        /// FIDO credential ids, separated by ',' generate using fido2luks credential
-        #[structopt(
-            name = "credential-ids",
-            env = "FIDO2LUKS_CREDENTIAL_ID",
-            short = "c",
-            long = "creds"
-        )]
-        credentials: CommaSeparated<HexEncoded>,
-        /// Token from which the credentials will be removed
-        #[structopt(long = "token")]
-        token_id: Option<u32>,
-    },
-    /// Remove all unassigned tokens
-    GC {
-        #[structopt(env = "FIDO2LUKS_DEVICE")]
-        device: PathBuf,
-    },
-}

src/config.rs

@@ -7,37 +7,36 @@ use std::fs::File;
 use std::io::Read;
 use std::path::PathBuf;
 use std::process::Command;
-use std::process::Stdio;
 use std::str::FromStr;
 
 #[derive(Debug, Clone, PartialEq)]
-pub enum SecretInput {
+pub enum InputSalt {
     AskPassword,
     String(String),
     File { path: PathBuf },
 }
 
-impl Default for SecretInput {
+impl Default for InputSalt {
     fn default() -> Self {
-        SecretInput::AskPassword
+        InputSalt::AskPassword
     }
 }
 
-impl From<&str> for SecretInput {
+impl From<&str> for InputSalt {
     fn from(s: &str) -> Self {
         let mut parts = s.split(':');
         match parts.next() {
-            Some("ask") | Some("Ask") => SecretInput::AskPassword,
+            Some("ask") | Some("Ask") => InputSalt::AskPassword,
-            Some("file") => SecretInput::File {
+            Some("file") => InputSalt::File {
                 path: parts.collect::<Vec<_>>().join(":").into(),
             },
-            Some("string") => SecretInput::String(parts.collect::<Vec<_>>().join(":")),
+            Some("string") => InputSalt::String(parts.collect::<Vec<_>>().join(":")),
             _ => Self::default(),
         }
     }
 }
 
-impl FromStr for SecretInput {
+impl FromStr for InputSalt {
     type Err = Fido2LuksError;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
@@ -45,54 +44,21 @@ impl FromStr for SecretInput {
     }
 }
 
-impl fmt::Display for SecretInput {
+impl fmt::Display for InputSalt {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
         f.write_str(&match self {
-            SecretInput::AskPassword => "ask".to_string(),
+            InputSalt::AskPassword => "ask".to_string(),
-            SecretInput::String(s) => ["string", s].join(":"),
+            InputSalt::String(s) => ["string", s].join(":"),
-            SecretInput::File { path } => ["file", path.display().to_string().as_str()].join(":"),
+            InputSalt::File { path } => ["file", path.display().to_string().as_str()].join(":"),
         })
     }
 }
 
-impl SecretInput {
+impl InputSalt {
-    pub fn obtain_string(
+    pub fn obtain(&self, password_helper: &PasswordHelper) -> Fido2LuksResult<[u8; 32]> {
-        &self,
-        password_helper: Option<impl FnOnce() -> Fido2LuksResult<String>>,
-    ) -> Fido2LuksResult<String> {
-        Ok(String::from_utf8(self.obtain(password_helper)?)?)
-    }
-
-    pub fn obtain(
-        &self,
-        password_helper: Option<impl FnOnce() -> Fido2LuksResult<String>>,
-    ) -> Fido2LuksResult<Vec<u8>> {
-        let mut secret = Vec::new();
-        match self {
-            SecretInput::File { path } => {
-                //TODO: replace with try_blocks
-                let mut do_io = || File::open(path)?.read_to_end(&mut secret);
-                do_io().map_err(|cause| Fido2LuksError::KeyfileError { cause })?;
-            }
-            SecretInput::AskPassword => secret.extend_from_slice(
-                password_helper.ok_or_else(|| Fido2LuksError::AskPassError {
-                    cause: AskPassError::FailedHelper,
-                })?()?
-                .as_bytes(),
-            ),
-
-            SecretInput::String(s) => secret.extend_from_slice(s.as_bytes()),
-        }
-        Ok(secret)
-    }
-
-    pub fn obtain_sha256(
-        &self,
-        password_helper: Option<impl FnOnce() -> Fido2LuksResult<String>>,
-    ) -> Fido2LuksResult<[u8; 32]> {
         let mut digest = digest::Context::new(&digest::SHA256);
         match self {
-            SecretInput::File { path } => {
+            InputSalt::File { path } => {
                 let mut do_io = || {
                     let mut reader = File::open(path)?;
                     let mut buf = [0u8; 512];
@@ -107,7 +73,10 @@ impl SecretInput {
                 };
                 do_io().map_err(|cause| Fido2LuksError::KeyfileError { cause })?;
             }
-            _ => digest.update(self.obtain(password_helper)?.as_slice()),
+            InputSalt::AskPassword => {
+                digest.update(password_helper.obtain()?.as_bytes());
+            }
+            InputSalt::String(s) => digest.update(s.as_bytes()),
         }
         let mut salt = [0u8; 32];
         salt.as_mut().copy_from_slice(digest.finish().as_ref());
@@ -164,13 +133,12 @@ impl PasswordHelper {
         use PasswordHelper::*;
         match self {
             Systemd => unimplemented!(),
-            Stdin => Ok(util::read_password("Password", true, false)?),
+            Stdin => Ok(util::read_password("Password", true)?),
             Script(password_helper) => {
-                let password = Command::new("sh")
+                let mut helper_parts = password_helper.split(' ');
-                    .arg("-c")
+
-                    .arg(&password_helper)
+                let password = Command::new((&mut helper_parts).next().unwrap())
-                    .stdin(Stdio::inherit())
+                    .args(helper_parts)
-                    .stderr(Stdio::inherit())
                     .output()
                     .map_err(|e| Fido2LuksError::AskPassError {
                         cause: error::AskPassError::IO(e),
@@ -190,30 +158,24 @@ mod test {
     #[test]
     fn input_salt_from_str() {
         assert_eq!(
-            "file:/tmp/abc".parse::<SecretInput>().unwrap(),
+            "file:/tmp/abc".parse::<InputSalt>().unwrap(),
-            SecretInput::File {
+            InputSalt::File {
                 path: "/tmp/abc".into()
             }
         );
         assert_eq!(
-            "string:abc".parse::<SecretInput>().unwrap(),
+            "string:abc".parse::<InputSalt>().unwrap(),
-            SecretInput::String("abc".into())
+            InputSalt::String("abc".into())
-        );
-        assert_eq!(
-            "ask".parse::<SecretInput>().unwrap(),
-            SecretInput::AskPassword
-        );
-        assert_eq!(
-            "lol".parse::<SecretInput>().unwrap(),
-            SecretInput::default()
         );
+        assert_eq!("ask".parse::<InputSalt>().unwrap(), InputSalt::AskPassword);
+        assert_eq!("lol".parse::<InputSalt>().unwrap(), InputSalt::default());
     }
 
     #[test]
     fn input_salt_obtain() {
         assert_eq!(
-            SecretInput::String("abc".into())
+            InputSalt::String("abc".into())
-                .obtain_sha256(Some(|| Ok("123456".to_string())))
+                .obtain(&PasswordHelper::Stdin)
                 .unwrap(),
             [
                 186, 120, 22, 191, 143, 1, 207, 234, 65, 65, 64, 222, 93, 174, 34, 35, 176, 3, 97,

src/device.rs

@@ -19,7 +19,7 @@ pub fn make_credential_id(
     }
     let request = request.build().unwrap();
     let make_credential = |device: &mut FidoDevice| {
-        if let Some(pin) = pin.filter(|_| device.needs_pin()) {
+        if let Some(pin) = pin {
             device.unlock(pin)?;
         }
         device.make_hmac_credential(&request)
@@ -44,7 +44,7 @@ pub fn perform_challenge<'a>(
         .build()
         .unwrap();
     let get_assertion = |device: &mut FidoDevice| {
-        if let Some(pin) = pin.filter(|_| device.needs_pin()) {
+        if let Some(pin) = pin {
             device.unlock(pin)?;
         }
         device.get_hmac_assertion(&request, &util::sha256(&[&salt[..]]), None)
@@ -58,17 +58,6 @@ pub fn perform_challenge<'a>(
     Ok((secret, credential))
 }
 
-pub fn may_require_pin() -> Fido2LuksResult<bool> {
-    for di in ctap::get_devices()? {
-        if let Ok(dev) = FidoDevice::new(&di) {
-            if dev.needs_pin() {
-                return Ok(true);
-            }
-        }
-    }
-    Ok(false)
-}
-
 pub fn get_devices() -> Fido2LuksResult<Vec<FidoDevice>> {
     let mut devices = Vec::with_capacity(2);
     for di in ctap::get_devices()? {

src/error.rs

@@ -1,9 +1,5 @@
 use ctap::FidoError;
-use libcryptsetup_rs::LibcryptErr;
 use std::io;
-use std::io::ErrorKind;
-use std::string::FromUtf8Error;
-use Fido2LuksError::*;
 
 pub type Fido2LuksResult<T> = Result<T, Fido2LuksError>;
 
@@ -29,10 +25,6 @@ pub enum Fido2LuksError {
     WrongSecret,
     #[fail(display = "not an utf8 string")]
     StringEncodingError { cause: FromUtf8Error },
-    #[fail(display = "not an hex string: {}", string)]
-    HexEncodingError { string: String },
-    #[fail(display = "couldn't obtain at least one credential")]
-    InsufficientCredentials,
 }
 
 impl Fido2LuksError {
@@ -54,8 +46,6 @@ pub enum AskPassError {
     IO(io::Error),
     #[fail(display = "provided passwords don't match")]
     Mismatch,
-    #[fail(display = "failed to call password helper")]
-    FailedHelper,
 }
 
 #[derive(Debug, Fail)]
@@ -91,6 +81,11 @@ impl From<LuksError> for Fido2LuksError {
     }
 }
 
+use libcryptsetup_rs::LibcryptErr;
+use std::io::ErrorKind;
+use std::string::FromUtf8Error;
+use Fido2LuksError::*;
+
 impl From<FidoError> for Fido2LuksError {
     fn from(e: FidoError) -> Self {
         AuthenticatorError { cause: e }

src/luks.rs

@@ -111,20 +111,6 @@ impl LuksDevice {
         Ok(())
     }
 
-    pub fn remove_token_slot(&mut self, slot: u32) -> Fido2LuksResult<()> {
-        let mut remove = HashSet::new();
-        for token in self.tokens()? {
-            let (id, token) = token?;
-            if token.keyslots.contains(&slot.to_string()) {
-                remove.insert(id);
-            }
-        }
-        for rm in remove {
-            self.remove_token(rm)?;
-        }
-        Ok(())
-    }
-
     pub fn update_token(&mut self, token: u32, data: &Fido2LuksToken) -> Fido2LuksResult<()> {
         self.require_luks2()?;
         self.device
@@ -206,9 +192,7 @@ impl LuksDevice {
             old_secret,
             CryptActivateFlags::empty(),
         )?;
-
+        self.device.keyslot_handle().change_by_passphrase(
-        // slot should stay the same but better be safe than sorry
-        let slot = self.device.keyslot_handle().change_by_passphrase(
             Some(slot),
             Some(slot),
             old_secret,
@@ -237,16 +221,10 @@ impl LuksDevice {
         name: &str,
         secret: &[u8],
         slot_hint: Option<u32>,
-        dry_run: bool,
     ) -> Fido2LuksResult<u32> {
         self.device
             .activate_handle()
-            .activate_by_passphrase(
+            .activate_by_passphrase(Some(name), slot_hint, secret, CryptActivateFlags::empty())
-                Some(name).filter(|_| !dry_run),
-                slot_hint,
-                secret,
-                CryptActivateFlags::empty(),
-            )
             .map_err(LuksError::activate)
     }
 
@@ -255,7 +233,6 @@ impl LuksDevice {
         name: &str,
         secret: impl Fn(Vec<String>) -> Fido2LuksResult<([u8; 32], String)>,
         slot_hint: Option<u32>,
-        dry_run: bool,
     ) -> Fido2LuksResult<u32> {
         if !self.is_luks2()? {
             return Err(LuksError::Luks2Required.into());
@@ -299,7 +276,7 @@ impl LuksDevice {
                 .chain(std::iter::once(None).take(slots.is_empty() as usize)), // Try all slots as last resort
         );
         for slot in slots {
-            match self.activate(name, &secret, slot, dry_run) {
+            match self.activate(name, &secret, slot) {
                 Err(Fido2LuksError::WrongSecret) => (),
                 res => return res,
             }

src/main.rs

@@ -4,13 +4,15 @@ extern crate ctap_hmac as ctap;
 #[macro_use]
 extern crate serde_derive;
 use crate::cli::*;
+use crate::config::*;
 use crate::device::*;
 use crate::error::*;
 use std::io;
+use std::path::PathBuf;
 use std::process::exit;
 
 mod cli;
-pub mod cli_args;
+mod config;
 mod device;
 mod error;
 mod luks;
@@ -19,7 +21,10 @@ mod util;
 fn main() -> Fido2LuksResult<()> {
     match run_cli() {
         Err(e) => {
+            #[cfg(debug_assertions)]
             eprintln!("{:?}", e);
+            #[cfg(not(debug_assertions))]
+            eprintln!("{}", e);
             exit(e.exit_code())
         }
         _ => exit(0),

src/util.rs

@@ -13,17 +13,9 @@ pub fn sha256(messages: &[&[u8]]) -> [u8; 32] {
     secret.as_mut().copy_from_slice(digest.finish().as_ref());
     secret
 }
-pub fn read_password_tty(q: &str, verify: bool) -> Fido2LuksResult<String> {
+
-    read_password(q, verify, true)
+pub fn read_password(q: &str, verify: bool) -> Fido2LuksResult<String> {
-}
+    match rpassword::read_password_from_tty(Some(&[q, ": "].join("")))? {
-pub fn read_password(q: &str, verify: bool, tty: bool) -> Fido2LuksResult<String> {
-    let res = if tty {
-        rpassword::read_password_from_tty(Some(&[q, ": "].join("")))
-    } else {
-        print!("{}: ", q);
-        rpassword::read_password()
-    }?;
-    match res {
         ref pass
             if verify
                 && &rpassword::read_password_from_tty(Some(&[q, "(again): "].join(" ")))?
@@ -37,6 +29,10 @@ pub fn read_password(q: &str, verify: bool, tty: bool) -> Fido2LuksResult<String
     }
 }
 
+pub fn read_password_hashed(q: &str, verify: bool) -> Fido2LuksResult<[u8; 32]> {
+    read_password(q, verify).map(|pass| sha256(&[pass.as_bytes()]))
+}
+
 pub fn read_keyfile<P: Into<PathBuf>>(path: P) -> Fido2LuksResult<Vec<u8>> {
     let mut file = File::open(path.into())?;
     let mut key = Vec::new();