cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

wpa_supplicant: 2.9 -> 2.10

Browse source
This commit is contained in:
Martin Weinelt 2022-01-16 23:02:28 +01:00
parent 90482284fa
commit 738ff6b30c
No known key found for this signature in database
GPG key ID: 87C1E9888F856759
1 changed files with 3 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
pkgs/os-specific/linux/wpa_supplicant/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchpatch, openssl, pkg-config, libnl { lib, stdenv, fetchurl, openssl, pkg-config, libnl
, nixosTests , nixosTests
, withDbus ? true, dbus , withDbus ? true, dbus
, withReadline ? true, readline , withReadline ? true, readline
@ -8,45 +8,16 @@
with lib; with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.9"; version = "2.10";
pname = "wpa_supplicant"; pname = "wpa_supplicant";
src = fetchurl { src = fetchurl {
url = "https://w1.fi/releases/${pname}-${version}.tar.gz"; url = "https://w1.fi/releases/${pname}-${version}.tar.gz";
sha256 = "05qzak1mssnxcgdrafifxh9w86a4ha69qabkg4bsigk499xyxggw"; sha256 = "sha256-IN965RVLODA1X4q0JpEjqHr/3qWf50/pKSqR0Nfhey8=";
}; };
patches = [ 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 [ ] ++ lib.optionals readOnlyModeSSIDs [
# Allow read-only networks # Allow read-only networks
./0001-Implement-read-only-mode-for-ssids.patch ./0001-Implement-read-only-mode-for-ssids.patch