diff options
| author | Fabián Heredia Montiel <fabianhjr@protonmail.com> | 2023-11-13 14:31:51 -0600 |
|---|---|---|
| committer | Fabián Heredia Montiel <fabianhjr@protonmail.com> | 2023-11-13 14:31:51 -0600 |
| commit | 884449105ea418fb8d205c0e1cd37a32b49c18db (patch) | |
| tree | 20dce878c7b27691383a4da487379b4a04eb81ba /pkgs/os-specific/linux/kernel/common-config.nix | |
| parent | c1eb661271bf5c3e0baa7b32ebd9d455883d95d0 (diff) | |
| parent | 5c6e85ee472d37c904dd43f8f76b680602b9128f (diff) | |
| download | nixpkgs-884449105ea418fb8d205c0e1cd37a32b49c18db.tar nixpkgs-884449105ea418fb8d205c0e1cd37a32b49c18db.tar.gz nixpkgs-884449105ea418fb8d205c0e1cd37a32b49c18db.tar.bz2 nixpkgs-884449105ea418fb8d205c0e1cd37a32b49c18db.tar.lz nixpkgs-884449105ea418fb8d205c0e1cd37a32b49c18db.tar.xz nixpkgs-884449105ea418fb8d205c0e1cd37a32b49c18db.tar.zst nixpkgs-884449105ea418fb8d205c0e1cd37a32b49c18db.zip | |
Merge remote-tracking branch 'origin/master' into staging-next
Diffstat (limited to 'pkgs/os-specific/linux/kernel/common-config.nix')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 8ca01c5be4f..2954ee8f78b 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -562,6 +562,13 @@ let KEYS_REQUEST_CACHE = whenAtLeast "5.3" yes; # randomized slab caches RANDOM_KMALLOC_CACHES = whenAtLeast "6.6" yes; + + # NIST SP800-90A DRBG modes - enabled by most distributions + # and required by some out-of-tree modules (ShuffleCake) + # This does not include the NSA-backdoored Dual-EC mode from the same NIST publication. + CRYPTO_DRBG_HASH = yes; + CRYPTO_DRBG_CTR = yes; + } // optionalAttrs stdenv.hostPlatform.isx86_64 { # Enable Intel SGX X86_SGX = whenAtLeast "5.11" yes; @@ -715,7 +722,6 @@ let ZSWAP = option yes; ZPOOL = yes; ZBUD = option yes; - ZSMALLOC = module; }; brcmfmac = { |