summary refs log tree commit diff
path: root/pkgs/development/libraries/libimobiledevice
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2016-07-10 01:49:22 +0200
committerFranz Pletz <fpletz@fnordicwalking.de>2016-07-10 10:46:22 +0200
commit77f2fff41d636ae9f7c599f55abdf006a2180066 (patch)
tree155d1205553858dc5e1c895769420b563ddf03e7 /pkgs/development/libraries/libimobiledevice
parentf1f6dc9b8708fada557daf6b44d4e7fbb551a1aa (diff)
downloadnixpkgs-77f2fff41d636ae9f7c599f55abdf006a2180066.tar
nixpkgs-77f2fff41d636ae9f7c599f55abdf006a2180066.tar.gz
nixpkgs-77f2fff41d636ae9f7c599f55abdf006a2180066.tar.bz2
nixpkgs-77f2fff41d636ae9f7c599f55abdf006a2180066.tar.lz
nixpkgs-77f2fff41d636ae9f7c599f55abdf006a2180066.tar.xz
nixpkgs-77f2fff41d636ae9f7c599f55abdf006a2180066.tar.zst
nixpkgs-77f2fff41d636ae9f7c599f55abdf006a2180066.zip
libusbmuxd, libimobiledevice: Fix CVE-2016-5104
Diffstat (limited to 'pkgs/development/libraries/libimobiledevice')
-rw-r--r--pkgs/development/libraries/libimobiledevice/default.nix10
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/development/libraries/libimobiledevice/default.nix b/pkgs/development/libraries/libimobiledevice/default.nix
index 40bb9a5a140..cfc31c120b4 100644
--- a/pkgs/development/libraries/libimobiledevice/default.nix
+++ b/pkgs/development/libraries/libimobiledevice/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python, pkgconfig, usbmuxd, glib, libgcrypt,
+{ stdenv, fetchurl, fetchpatch, python, pkgconfig, usbmuxd, glib, libgcrypt,
   libtasn1, libplist, readline, libusbmuxd, openssl }:
 
 stdenv.mkDerivation rec {
@@ -8,7 +8,13 @@ stdenv.mkDerivation rec {
   buildInputs = [ readline ];
   propagatedBuildInputs = [ libusbmuxd glib libgcrypt libtasn1 libplist openssl ];
 
-  patches = [ ./disable_sslv3.patch ];
+  patches = [
+    ./disable_sslv3.patch
+    (fetchpatch { # CVE-2016-5104
+      url = "https://github.com/libimobiledevice/libimobiledevice/commit/df1f5c4d70d0c19ad40072f5246ca457e7f9849e.patch";
+      sha256 = "06ygb9aqcvm4v08wrldsddjgyqv5bkpq6lxzq2a1nwqp9mq4a4k1";
+    })
+  ];
 
   postPatch = ''sed -e 's@1\.3\.21@@' -i configure'';
   passthru.swig = libplist.swig;