summary refs log tree commit diff
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2016-01-30 14:58:01 +0100
committerFranz Pletz <fpletz@fnordicwalking.de>2016-02-01 18:11:08 +0100
commit92c7ff216ed56d84fa9ba8e5a97b22c939fb7375 (patch)
tree22f6063d2689d7712d7c6d88d93b9c0ab4853248
parent1026673f374848e0cbb0bd18ad383540971c09e6 (diff)
downloadnixpkgs-92c7ff216ed56d84fa9ba8e5a97b22c939fb7375.tar
nixpkgs-92c7ff216ed56d84fa9ba8e5a97b22c939fb7375.tar.gz
nixpkgs-92c7ff216ed56d84fa9ba8e5a97b22c939fb7375.tar.bz2
nixpkgs-92c7ff216ed56d84fa9ba8e5a97b22c939fb7375.tar.lz
nixpkgs-92c7ff216ed56d84fa9ba8e5a97b22c939fb7375.tar.xz
nixpkgs-92c7ff216ed56d84fa9ba8e5a97b22c939fb7375.tar.zst
nixpkgs-92c7ff216ed56d84fa9ba8e5a97b22c939fb7375.zip
libimobiledevice: Add patch to disable SSLv3
-rw-r--r--pkgs/development/libraries/libimobiledevice/default.nix4
-rw-r--r--pkgs/development/libraries/libimobiledevice/disable_sslv3.patch25
2 files changed, 28 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libimobiledevice/default.nix b/pkgs/development/libraries/libimobiledevice/default.nix
index c1519ca5b83..40bb9a5a140 100644
--- a/pkgs/development/libraries/libimobiledevice/default.nix
+++ b/pkgs/development/libraries/libimobiledevice/default.nix
@@ -8,7 +8,9 @@ stdenv.mkDerivation rec {
   buildInputs = [ readline ];
   propagatedBuildInputs = [ libusbmuxd glib libgcrypt libtasn1 libplist openssl ];
 
-  patchPhase = ''sed -e 's@1\.3\.21@@' -i configure'';
+  patches = [ ./disable_sslv3.patch ];
+
+  postPatch = ''sed -e 's@1\.3\.21@@' -i configure'';
   passthru.swig = libplist.swig;
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libimobiledevice/disable_sslv3.patch b/pkgs/development/libraries/libimobiledevice/disable_sslv3.patch
new file mode 100644
index 00000000000..646b829496f
--- /dev/null
+++ b/pkgs/development/libraries/libimobiledevice/disable_sslv3.patch
@@ -0,0 +1,25 @@
+From e19de4f0d4cb70e30017edfc6b4ca1b89ffbd381 Mon Sep 17 00:00:00 2001
+From: Franz Pletz <fpletz@fnordicwalking.de>
+Date: Thu, 14 Jan 2016 14:58:23 +0100
+Subject: [PATCH] Disable SSLv3
+
+---
+ src/idevice.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/idevice.c b/src/idevice.c
+index ce27495..8f03094 100644
+--- a/src/idevice.c
++++ b/src/idevice.c
+@@ -678,7 +678,7 @@ LIBIMOBILEDEVICE_API idevice_error_t idevice_connection_enable_ssl(idevice_conne
+ 	}
+ 	BIO_set_fd(ssl_bio, (int)(long)connection->data, BIO_NOCLOSE);
+ 
+-	SSL_CTX *ssl_ctx = SSL_CTX_new(SSLv3_method());
++	SSL_CTX *ssl_ctx = SSL_CTX_new(SSLv23_method());
+ 	if (ssl_ctx == NULL) {
+ 		debug_info("ERROR: Could not create SSL context.");
+ 		BIO_free(ssl_bio);
+-- 
+2.7.0
+