diff options
author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-01-16 23:02:28 +0100 |
---|---|---|
committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-01-17 13:42:09 +0100 |
commit | 738ff6b30cf2232d12cbc1c4f4d029b76a2a099e (patch) | |
tree | cabefe5d8f1631ed2a97bb76bfcf8b2623ad5377 /pkgs/os-specific/linux/wpa_supplicant | |
parent | 90482284fa1265ebfcdf16d763d61dacc72bc834 (diff) | |
download | nixpkgs-738ff6b30cf2232d12cbc1c4f4d029b76a2a099e.tar nixpkgs-738ff6b30cf2232d12cbc1c4f4d029b76a2a099e.tar.gz nixpkgs-738ff6b30cf2232d12cbc1c4f4d029b76a2a099e.tar.bz2 nixpkgs-738ff6b30cf2232d12cbc1c4f4d029b76a2a099e.tar.lz nixpkgs-738ff6b30cf2232d12cbc1c4f4d029b76a2a099e.tar.xz nixpkgs-738ff6b30cf2232d12cbc1c4f4d029b76a2a099e.tar.zst nixpkgs-738ff6b30cf2232d12cbc1c4f4d029b76a2a099e.zip |
wpa_supplicant: 2.9 -> 2.10
Diffstat (limited to 'pkgs/os-specific/linux/wpa_supplicant')
-rw-r--r-- | pkgs/os-specific/linux/wpa_supplicant/default.nix | 35 |
1 files changed, 3 insertions, 32 deletions
diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 656fa477768..e48dce4f313 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, openssl, pkg-config, libnl +{ lib, stdenv, fetchurl, openssl, pkg-config, libnl , nixosTests , withDbus ? true, dbus , withReadline ? true, readline @@ -8,45 +8,16 @@ with lib; stdenv.mkDerivation rec { - version = "2.9"; + version = "2.10"; pname = "wpa_supplicant"; src = fetchurl { url = "https://w1.fi/releases/${pname}-${version}.tar.gz"; - sha256 = "05qzak1mssnxcgdrafifxh9w86a4ha69qabkg4bsigk499xyxggw"; + sha256 = "sha256-IN965RVLODA1X4q0JpEjqHr/3qWf50/pKSqR0Nfhey8="; }; patches = [ - (fetchurl { - name = "CVE-2019-16275.patch"; - url = "https://w1.fi/security/2019-7/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch"; - sha256 = "15xjyy7crb557wxpx898b5lnyblxghlij0xby5lmj9hpwwss34dz"; - }) - (fetchpatch { - # Expose OWE key management capability over DBus, remove >= 2.10 - name = "dbus-Export-OWE-capability-and-OWE-BSS-key_mgmt.patch"; - url = "https://w1.fi/cgit/hostap/patch/?id=7800725afb27397f7d6033d4969e2aeb61af4737"; - sha256 = "0c1la7inf4m5y9gzdjjdnhpkx32pm8vi6m5knih8p77q4mbrdgg8"; - }) - # P2P: Fix copying of secondary device types for P2P group client (https://w1.fi/security/2020-2/) - (fetchurl { - name = "CVE-2021-0326.patch"; - url = "https://w1.fi/security/2020-2/0001-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch"; - sha256 = "19f4hx0p547mdx8y8arb3vclwyy4w9c8a6a40ryj7q33730mrmn4"; - }) - # P2P: Fix a corner case in peer addition based on PD Request (https://w1.fi/security/2021-1/) - (fetchurl { - name = "CVE-2021-27803.patch"; - url = "https://w1.fi/security/2021-1/0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch"; - sha256 = "04cnds7hmbqc44jasabjvrdnh66i5hwvk2h2m5z94pmgbzncyh3z"; - }) - # In wpa_supplicant and hostapd 2.9, forging attacks may occur because AlgorithmIdentifier parameters are mishandled in tls/pkcs1.c and tls/x509v3.c. - (fetchpatch { - name = "CVE-2021-30004.patch"; - url = "https://w1.fi/cgit/hostap/patch/?id=a0541334a6394f8237a4393b7372693cd7e96f15"; - sha256 = "1gbhlz41x1ar1hppnb76pqxj6vimiypy7c4kq6h658637s4am3xg"; - }) ] ++ lib.optionals readOnlyModeSSIDs [ # Allow read-only networks ./0001-Implement-read-only-mode-for-ssids.patch |