diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-08-09 18:28:15 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-08-09 18:28:15 +0200 |
| commit | d9fa74ba7891cfae4a029ee79dd29e4ab3425385 (patch) | |
| tree | 82f79c8dc3d5cf7108055155e6332f64485b0acf /pkgs/os-specific/linux/wpa_supplicant/default.nix | |
| parent | 8b834605628fabd43b1b26a1724fb22c83150e2d (diff) | |
| parent | 8c7fa1e836b8929d29c7ec34f968a3eef11e69de (diff) | |
| download | nixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar nixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.gz nixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.bz2 nixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.lz nixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.xz nixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.zst nixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.zip | |
Merge master into staging
Diffstat (limited to 'pkgs/os-specific/linux/wpa_supplicant/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/wpa_supplicant/default.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index add7c648856..3b19b7bff54 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -80,7 +80,8 @@ stdenv.mkDerivation rec { patches = [ ./build-fix.patch - #KRACKAttack.com + + # KRACKAttack.com (fetchurl { url = "http://w1.fi/security/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch"; sha256 = "02zl2x4pxay666yq18g4f3byccrzipfjbky1ydw62v15h76174aj"; @@ -113,6 +114,12 @@ stdenv.mkDerivation rec { url = "http://w1.fi/security/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch"; sha256 = "1ca312cixbld70rp12q7h66lnjjxzz0qag0ii2sg6cllgf2hv168"; }) + + # Unauthenticated EAPOL-Key decryption (CVE-2018-14526) + (fetchurl { + url = "https://w1.fi/security/2018-1/rebased-v2.6-0001-WPA-Ignore-unauthenticated-encrypted-EAPOL-Key-data.patch"; + sha256 = "0z0zxc9wrikmvciyqpdhx0l5v7qsd8c6b5ph9h5rniqllpr3q34n"; + }) ]; postInstall = '' |