movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00
Code Activity

Merge pull request #184786 from danc86/fido2luks-discard

Browse source
This commit is contained in:
Sandro 2022-08-04 15:08:58 +02:00 • committed by GitHub
commit 6c55138d9b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/system/boot/luksroot.nix
View file

@ -433,7 +433,7 @@ let
echo "Please move your mouse to create needed randomness." echo "Please move your mouse to create needed randomness."
''} ''}
echo "Waiting for your FIDO2 device..." 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 if [ $? -ne 0 ]; then
echo "No FIDO2 key found, falling back to normal open procedure" echo "No FIDO2 key found, falling back to normal open procedure"
open_normally open_normally

6
pkgs/tools/security/fido2luks/default.nix
View file

@ -9,13 +9,13 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "fido2luks"; pname = "fido2luks";
version = "0.2.19"; version = "0.2.20";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "shimunn"; owner = "shimunn";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-o21KdsAE9KznobdMMKfVmVnENsLW3cMZjssnrsoN+KY="; sha256 = "04gl7wn38f42mapmkf026rya668vvhm03yi8iqnz31xgggbr2irm";
}; };
buildInputs = [ cryptsetup ]; buildInputs = [ cryptsetup ];
@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
export LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib" export LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib"
''; '';
cargoSha256 = "sha256-8JFe3mivf2Ewu1nLMugeeK+9ZXAGPHaqCyKfWfwLOc8="; cargoSha256 = "1sp52zsj0s3736zih71plnk01si24jsawnx0580qfgg322d5f601";
meta = with lib; { meta = with lib; {
description = "Decrypt your LUKS partition using a FIDO2 compatible authenticator"; description = "Decrypt your LUKS partition using a FIDO2 compatible authenticator";