Commit Graph

201 Commits

Author SHA1 Message Date
Franz Pletz
434c15193a
openssl_1_0_2: 1.0.2j -> 1.0.2k for multiple CVEs
Fixes:

  * CVE-2017-3731
  * CVE-2017-3730
  * CVE-2017-3732
  * CVE-2016-7055
2017-01-26 15:38:33 +01:00
John Ericson
94df8e7e4d openssl: Output-santizing hack properly uses native perl again 2017-01-24 11:37:56 -05:00
Graham Christensen
bb2a67d226
openssl_1_1_0: 1.1.0b -> 1.1.0c 2016-11-11 07:11:29 -05:00
David McFarland
a50784b34e openssl: add custom build of 1.0.2 for steam 2016-11-09 21:18:32 -04:00
Eelco Dolstra
811b876fab Revert "openssl, curl, git: Respect $NIX_SSL_CERT_FILE"
This reverts commit 942dbf89c6. Sorry,
this was supposed to go to staging instead of master...
2016-10-14 16:01:54 +02:00
Eelco Dolstra
942dbf89c6 openssl, curl, git: Respect $NIX_SSL_CERT_FILE
$NIX_SSL_CERT_FILE overrides $SSL_CERT_FILE, which in turn overrides
the default CA path (/etc/ssl/certs/ca-certificates.crt). This allows
Nix to set a CA path without interfering with other packages (such as
Homebrew).

See https://github.com/NixOS/nix/issues/921.
2016-10-14 12:06:10 +02:00
Robin Gloster
b743ddf8f9
sslscan: enable ssl2 checking 2016-10-12 14:36:41 +02:00
Franz Pletz
4d75c71f38
openssl: 1.0.2i -> 1.0.2j, 1.1.0a -> 1.1.0b
https://www.openssl.org/news/secadv/20160926.txt
2016-09-26 15:02:01 +02:00
Eelco Dolstra
ac03df96ba openssl: 1.0.1t -> 1.0.1u, 1.0.2h -> 1.0.2i, 1.1.0 -> 1.1.0a
https://www.openssl.org/news/secadv/20160922.txt
2016-09-22 15:05:09 +02:00
Franz Pletz
c45bf3c43d
openssl-chacha: 2016-01-27 -> 2016-08-22 2016-09-05 22:50:57 +02:00
Tuomas Tynkkynen
a17216af4c treewide: Shuffle outputs
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
obadz
ed01e0ca4f openssl: fix merge conflict between b6dabe3 and 6e7ca92 2016-08-28 03:53:13 +01:00
obadz
3de6e5be50 Merge branch 'master' into staging
Conflicts:
      pkgs/applications/misc/navit/default.nix
      pkgs/applications/networking/mailreaders/alpine/default.nix
      pkgs/applications/networking/mailreaders/realpine/default.nix
      pkgs/development/compilers/ghc/head.nix
      pkgs/development/libraries/openssl/default.nix
      pkgs/games/liquidwar/default.nix
      pkgs/games/spring/springlobby.nix
      pkgs/os-specific/linux/kernel/perf.nix
      pkgs/servers/sip/freeswitch/default.nix
      pkgs/tools/archivers/cromfs/default.nix
      pkgs/tools/graphics/plotutils/default.nix
2016-08-27 23:54:54 +01:00
Robin Gloster
b6dabe3df0
openssl_1_1_0: init at 1.1.0 2016-08-26 07:39:18 +00:00
Alexey Shmalko
6e7ca9272e
openssl: fix CVE-2016-2177 2016-08-23 03:41:03 +03:00
Peter Simons
8e462995ba Bring my stdenv.lib.maintainers user name in line with my github nick. 2016-05-16 22:49:55 +02:00
Tuomas Tynkkynen
aadaa91379 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/applications/networking/browsers/vivaldi/default.nix
	pkgs/misc/emulators/wine/base.nix
2016-05-03 23:12:48 +03:00
Nathan Zadoks
bdafc6df04 openssl: 1.0.1s -> 1.0.1t, 1.0.2g -> 1.0.2h
CVE-2016-2108, high severity: Memory corruption in the ASN.1 encoder
CVE-2016-2107, high severity: Padding oracle in AES-NI CBC MAC check
CVE-2016-2105, low severity: EVP_EncodeUpdate overflow
CVE-2016-2106, low severity: EVP_EncryptUpdate overflow
CVE-2016-2109, low severity: ASN.1 BIO excessive memory allocation
CVE-2016-2176, low severity: EBCDIC overread
2016-05-03 10:54:15 -04:00
Tuomas Tynkkynen
26f90102b8 openssl: fix indentation 2016-04-25 18:19:40 +03:00
Tuomas Tynkkynen
f34655e28c openssl-chacha: Split into multiple outputs
Mainly done because of this in all-packages.nix:
````
  cipherscan = callPackage ../tools/security/cipherscan {
    openssl = if stdenv.system == "x86_64-linux"
      then openssl-chacha
      else openssl;
  };
````
... and inside cipherscan we want to refer to `openssl.bin`
2016-04-14 08:32:20 +03:00
Vladimír Čunát
ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Vladimír Čunát
09af15654f Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Eelco Dolstra
e0d17fdf10 openssl: Use 1.0.2 by default
Provided that not too much breaks, we should probably cherry-pick this
to 16.03, since the end of the 1.0.1 support window is a bit too close
to the expected lifetime of 16.0.3. @domenkozar
2016-03-01 15:25:53 +01:00
Eelco Dolstra
cdbd14a1a8 openssl: 1.0.1r -> 1.0.1s, 1.0.2f -> 1.0.2g
CVE-2016-0800
2016-03-01 15:18:57 +01:00
Eelco Dolstra
ef86e9506d Untested fix for #13401 2016-02-24 14:01:20 +01:00
Vladimír Čunát
d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Vladimír Čunát
a115bff08c Merge branch 'master' into staging 2016-02-07 13:52:42 +01:00
Charles Strahan
4c57b932ab cipherscan: init at rev 18b0d1b (Dec 17, 2015)
CipherScan is a simple way to find out which SSL ciphersuites are
supported by a target.

It can take advantage of the extra features in Peter Mosmans' openssl
fork (which is also included in this commit).
2016-02-03 12:01:24 -05:00
Vladimír Čunát
ae74c356d9 Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
Eelco Dolstra
917ca8920d Move setting $SSL_CERT_FILE to stdenv
Doing it in an openssl setup hook only works if packages have openssl
as a build input - it doesn't work if they're using a program linked
against openssl.
2016-02-03 13:59:10 +01:00
Eelco Dolstra
cc2cec6300 openssl: Unify 1.0.1 and 1.0.2 expressions 2016-02-03 13:54:22 +01:00
Eelco Dolstra
788da6894f openssl: Compile in /etc/ssl/certs/ca-certificates.crt 2016-02-03 13:45:05 +01:00
Guillaume Maudoux
9f358f809d Configure a default trust store for openssl 2016-02-03 12:42:01 +01:00
Vladimír Čunát
de0af30716 Merge branch 'master' into staging 2016-01-29 10:19:48 +01:00
Vladimír Čunát
a92c2cb994 openssl_1_0_2: high-severity security update e -> f
Fixes CVE-2016-0701 and CVE-2015-3197.
2016-01-28 20:35:00 +01:00
Eelco Dolstra
2ecb6b4574 openssl: 1.0.1q -> 1.0.1r
CVE-2015-3197 (low severity)
2016-01-28 18:57:23 +01:00
Luca Bruno
5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
codsl
51a5f49d70 openssl: security update 1.0.2d -> 1.0.2e
Fixes CVE-2015-3193, CVE-2015-3194, CVE-2015-3195 and CVE-2015-3196.
Close #11469.
2015-12-05 11:32:49 +01:00
codsl
fb3b9f5f8b openssl: security update 1.0.1p -> 1.0.1q
Fixes CVE-2015-3194 and CVE-2015-3195.
Taken from #11469.
2015-12-05 11:25:27 +01:00
Vladimír Čunát
333d69a5f0 Merge staging into closure-size
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
Matthias C. M. Troffaes
1c0b060295 openssl: use prefixed windres and ranlib for cross build 2015-11-04 08:48:38 +00:00
Vladimír Čunát
9fbb83b467 openssl: fixup after merge 2015-10-03 16:28:39 +02:00
Vladimír Čunát
f361938b21 Merge staging into closure-size
This makes gcc5 the default builder, etc.
2015-10-03 15:23:13 +02:00
Vladimír Čunát
5227fb1dd5 Merge commit staging+systemd into closure-size
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
William A. Kennington III
eae9889b82 openssl: Major bump 1.0.1 -> 1.0.2 2015-09-15 12:14:12 -07:00
Eelco Dolstra
e1f78bf677 More docs/manpages in separate outputs 2015-07-27 00:27:54 +02:00
Eelco Dolstra
5e156b9db7 openssl: Update to 1.0.2d 2015-07-09 15:17:14 +02:00
Eelco Dolstra
9539db1ec3 openssl: Update to 1.0.1p 2015-07-09 15:15:52 +02:00
William A. Kennington III
7f9a4957ee openssl: Make 1.0.2 conform to the 1.0.1 derivation 2015-06-22 20:00:44 -07:00
William A. Kennington III
c6e512b80c Merge branch 'master.upstream' into staging.upstream 2015-06-22 12:43:12 -07:00