summary refs log tree commit diff
path: root/pkgs/development/libraries/openssl
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2014-08-08 09:46:57 +0200
committerPeter Simons <simons@cryp.to>2014-08-08 09:46:57 +0200
commit5c276c4f68125e7d53e0467a3e74969dbd05b51b (patch)
treeb70d5c3f22cc7d655764ad8a4ae87935077014b7 /pkgs/development/libraries/openssl
parent9a5adb93d46b7a5be2fe81e11e12be2cc24988de (diff)
downloadnixpkgs-5c276c4f68125e7d53e0467a3e74969dbd05b51b.tar
nixpkgs-5c276c4f68125e7d53e0467a3e74969dbd05b51b.tar.gz
nixpkgs-5c276c4f68125e7d53e0467a3e74969dbd05b51b.tar.bz2
nixpkgs-5c276c4f68125e7d53e0467a3e74969dbd05b51b.tar.lz
nixpkgs-5c276c4f68125e7d53e0467a3e74969dbd05b51b.tar.xz
nixpkgs-5c276c4f68125e7d53e0467a3e74969dbd05b51b.tar.zst
nixpkgs-5c276c4f68125e7d53e0467a3e74969dbd05b51b.zip
openssl: update to version 1.0.1i
See https://www.openssl.org/news/secadv_20140806.txt for a long list of CVE numbers.
Fixes <https://github.com/NixOS/nixpkgs/issues/3485>.
Diffstat (limited to 'pkgs/development/libraries/openssl')
-rw-r--r--pkgs/development/libraries/openssl/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 93f7cbe1a1f..8c88df984f0 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -2,7 +2,7 @@
 , withCryptodev ? false, cryptodevHeaders }:
 
 let
-  name = "openssl-1.0.1h";
+  name = "openssl-1.0.1i";
 
   opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ]
     (throw "openssl needs its platform name cross building" null)
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
       "http://www.openssl.org/source/${name}.tar.gz"
       "http://openssl.linux-mirror.org/source/${name}.tar.gz"
     ];
-    sha256 = "14yhsgag5as7nhxnw7f0vklwjwa3pmn1i15nmp3f4qxa6sc8l74x";
+    sha256 = "1izwv1wzqdw8aqnvb70jcqpqp0rvkcm22w5c1dm9l1kpr939y5rw";
   };
 
   patches = patchesCross false;
@@ -65,7 +65,7 @@ stdenv.mkDerivation {
   makeFlags = "MANDIR=$(out)/share/man";
 
   # Parallel building is broken in OpenSSL.
-  #enableParallelBuilding = true;
+  enableParallelBuilding = false;
 
   postInstall =
     ''