public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #100418 from pltanton/master

Browse Source 
fido2luks: 0.2.3 -> 0.2.15
This commit is contained in:
Marek Mahut 2020-11-09 00:22:09 +01:00 committed by GitHub
commit e02f6bfa26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -404,7 +404,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 -i open ${device} ${name} ${fido2.credential} --await-dev ${toString fido2.gracePeriod} --salt string:$passphrase fido2luks open ${device} ${name} ${fido2.credential} --await-dev ${toString 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

14
pkgs/tools/security/fido2luks/default.nix
View File

@ -3,23 +3,29 @@
, fetchFromGitHub , fetchFromGitHub
, cryptsetup , cryptsetup
, pkg-config , pkg-config
, clang
, llvmPackages
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "fido2luks"; pname = "fido2luks";
version = "0.2.3"; version = "0.2.15";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "shimunn"; owner = "shimunn";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0340xp7q6f0clb7wmqpgllllwsixmsy37k1f5kj3hwvb730rz93x"; sha256 = "1v5gxcz4zbc673i5kbsnjq8bikf7jdbn3wjfz1wppjrgwnkgvsh9";
}; };
buildInputs = [ cryptsetup ]; buildInputs = [ cryptsetup ];
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config clang ];
cargoSha256 = "0rp4f6xnwmvf3pv6h0qwsg01jrndf77yn67675ac39kxzmrzfy2f"; configurePhase = ''
export LIBCLANG_PATH="${llvmPackages.libclang}/lib"
'';
cargoSha256 = "19drjql13z8bw257z10kjppxm25jlfgrpc9g1jf68ka5j2b3nx7k";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Decrypt your LUKS partition using a FIDO2 compatible authenticator"; description = "Decrypt your LUKS partition using a FIDO2 compatible authenticator";