ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-15 13:37:21 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #62838 from mayflower/fix/cryptsetup-kernel-crypto

Browse Source 
cryptsetup: enable kernel crypto api support again
This commit is contained in:
Franz Pletz 2019-06-12 05:05:38 +00:00 committed by GitHub
commit 9b2ee2c057
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -438,6 +438,7 @@ in
default = default =
[ "aes" "aes_generic" "blowfish" "twofish" [ "aes" "aes_generic" "blowfish" "twofish"
"serpent" "cbc" "xts" "lrw" "sha1" "sha256" "sha512" "serpent" "cbc" "xts" "lrw" "sha1" "sha256" "sha512"
"af_alg" "algif_skcipher"
(if pkgs.stdenv.hostPlatform.system == "x86_64-linux" then "aes_x86_64" else "aes_i586") (if pkgs.stdenv.hostPlatform.system == "x86_64-linux" then "aes_x86_64" else "aes_i586")
]; ];

2
nixos/tests/installer.nix
View File

@ -273,7 +273,7 @@ let
}; };
}; };
makeLuksRootTest = name: luksFormatOpts: makeInstallerTest "luksroot-format2" makeLuksRootTest = name: luksFormatOpts: makeInstallerTest name
{ createPartitions = '' { createPartitions = ''
$machine->succeed( $machine->succeed(
"flock /dev/vda parted --script /dev/vda -- mklabel msdos" "flock /dev/vda parted --script /dev/vda -- mklabel msdos"

1
pkgs/os-specific/linux/cryptsetup/default.nix
View File

@ -32,7 +32,6 @@ stdenv.mkDerivation rec {
NIX_LDFLAGS = "-lgcc_s"; NIX_LDFLAGS = "-lgcc_s";
configureFlags = [ configureFlags = [
"--disable-kernel_crypto"
"--enable-cryptsetup-reencrypt" "--enable-cryptsetup-reencrypt"
"--with-crypto_backend=openssl" "--with-crypto_backend=openssl"
] ++ stdenv.lib.optional enablePython "--enable-python"; ] ++ stdenv.lib.optional enablePython "--enable-python";