Merge pull request #184786 from danc86/fido2luks-discard

Sandro 6c55138d bc631525

Changed files
+4 -4
nixos
modules
system
pkgs
tools
security
fido2luks
+1 -1
nixos/modules/system/boot/luksroot.nix
···
echo "Please move your mouse to create needed randomness."
''}
echo "Waiting for your FIDO2 device..."
-
fido2luks open ${dev.device} ${dev.name} ${dev.fido2.credential} --await-dev ${toString dev.fido2.gracePeriod} --salt string:$passphrase
+
fido2luks open${optionalString dev.allowDiscards " --allow-discards"} ${dev.device} ${dev.name} ${dev.fido2.credential} --await-dev ${toString dev.fido2.gracePeriod} --salt string:$passphrase
if [ $? -ne 0 ]; then
echo "No FIDO2 key found, falling back to normal open procedure"
open_normally
+3 -3
pkgs/tools/security/fido2luks/default.nix
···
rustPlatform.buildRustPackage rec {
pname = "fido2luks";
-
version = "0.2.19";
+
version = "0.2.20";
src = fetchFromGitHub {
owner = "shimunn";
repo = pname;
rev = version;
-
sha256 = "sha256-o21KdsAE9KznobdMMKfVmVnENsLW3cMZjssnrsoN+KY=";
+
sha256 = "04gl7wn38f42mapmkf026rya668vvhm03yi8iqnz31xgggbr2irm";
};
buildInputs = [ cryptsetup ];
···
export LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib"
'';
-
cargoSha256 = "sha256-8JFe3mivf2Ewu1nLMugeeK+9ZXAGPHaqCyKfWfwLOc8=";
+
cargoSha256 = "1sp52zsj0s3736zih71plnk01si24jsawnx0580qfgg322d5f601";
meta = with lib; {
description = "Decrypt your LUKS partition using a FIDO2 compatible authenticator";