From e807b32ee49c7fbcc0a28d288ff0845f313c821e Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Sun, 27 Oct 2019 11:40:21 +0100 Subject: [PATCH 1/2] opensc: CVE-2019-15945 (cherry picked from commit e4258001a1566ebaec0f79f6a71960363e19b1dc) --- pkgs/tools/security/opensc/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix index e5611f8b2671..3ac564f2c082 100644 --- a/pkgs/tools/security/opensc/default.nix +++ b/pkgs/tools/security/opensc/default.nix @@ -22,6 +22,11 @@ stdenv.mkDerivation rec { url = "https://github.com/OpenSC/OpenSC/commit/0d7967549751b7032f22b437106b41444aff0ba9.patch"; sha256 = "1y42lmz8i9w99hgpakdncnv8f94cqjfabz0v4xg6wfz9akl3ff7d"; }) + (fetchpatch { + name = "CVE-2019-15945.patch"; + url = "https://github.com/OpenSC/OpenSC/commit/412a6142c27a5973c61ba540e33cdc22d5608e68.patch"; + sha256 = "088i2i1fkvdxnywmb54bn4283vhbxx6i2632b34ss5dh7k080hp7"; + }) ]; nativeBuildInputs = [ pkgconfig autoreconfHook ]; From 4bd324935ca4de60c99700f801f57d4ab2d0bb1b Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Sun, 27 Oct 2019 11:41:44 +0100 Subject: [PATCH 2/2] opensc: CVE-2019-15946 (cherry picked from commit 80c90b48c2df2e53ea2a72ce79fe5f4c6f2a25da) --- pkgs/tools/security/opensc/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix index 3ac564f2c082..4f220ee7717e 100644 --- a/pkgs/tools/security/opensc/default.nix +++ b/pkgs/tools/security/opensc/default.nix @@ -27,6 +27,11 @@ stdenv.mkDerivation rec { url = "https://github.com/OpenSC/OpenSC/commit/412a6142c27a5973c61ba540e33cdc22d5608e68.patch"; sha256 = "088i2i1fkvdxnywmb54bn4283vhbxx6i2632b34ss5dh7k080hp7"; }) + (fetchpatch { + name = "CVE-2019-15946.patch"; + url = "https://github.com/OpenSC/OpenSC/commit/a3fc7693f3a035a8a7921cffb98432944bb42740.patch"; + sha256 = "1qr9n8cbarrdn4kr5z0ys7flq50hfmcbm8584mhw7r39p08qwmvq"; + }) ]; nativeBuildInputs = [ pkgconfig autoreconfHook ];