Commit Graph

440 Commits

Author SHA1 Message Date
Artturin
f0e657f3b1 Merge branch 'master' into staging-next 2024-09-25 06:05:01 +03:00
Artturin
e0464e4788 treewide: replace stdenv.is with stdenv.hostPlatform.is
In preparation for the deprecation of `stdenv.isX`.

These shorthands are not conducive to cross-compilation because they
hide the platforms.

Darwin might get cross-compilation for which the continued usage of `stdenv.isDarwin` will get in the way

One example of why this is bad and especially affects compiler packages
https://www.github.com/NixOS/nixpkgs/pull/343059

There are too many files to go through manually but a treewide should
get users thinking when they see a `hostPlatform.isX` in a place where it
doesn't make sense.

```
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv.is" "stdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv'.is" "stdenv'.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "clangStdenv.is" "clangStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "gccStdenv.is" "gccStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenvNoCC.is" "stdenvNoCC.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "inherit (stdenv) is" "inherit (stdenv.hostPlatform) is"
fd --type f "\.nix" | xargs sd --fixed-strings "buildStdenv.is" "buildStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "effectiveStdenv.is" "effectiveStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "originalStdenv.is" "originalStdenv.hostPlatform.is"
```
2024-09-25 00:04:37 +03:00
Markus Theil
12b97a409b openssl_3_3: move cmake rm to correct phase
Signed-off-by: Markus Theil <theil.markus@gmail.com>
2024-09-24 07:55:06 +02:00
Markus Theil
72cc50b662 openssl_3_3: hotfix for cmake builds
Signed-off-by: Markus Theil <theil.markus@gmail.com>
(cherry picked from commit fd1745b860)
2024-09-23 21:03:01 +01:00
Markus Theil
2cd1c935bb openssl_3_2: 3.2.2 -> 3.2.3
Contains two CVE fixes.

* Fixed possible denial of service in X.509 name checks. (CVE-2024-6119)
* Fixed possible buffer overread in SSL_select_next_proto(). (CVE-2024-5535)

Changelog: https://github.com/openssl/openssl/blob/openssl-3.2/CHANGES.md#changes-between-322-and-323-3-sep-2024

Signed-off-by: Markus Theil <theil.markus@gmail.com>
2024-09-16 09:44:41 +02:00
Markus Theil
6fef5775cc openssl_3: 3.0.14 -> 3.0.15
Contains two CVE fixes.

* Fixed possible denial of service in X.509 name checks. (CVE-2024-6119)
* Fixed possible buffer overread in SSL_select_next_proto(). (CVE-2024-5535)

Changelog: https://github.com/openssl/openssl/blob/openssl-3.0/CHANGES.md#changes-between-3014-and-3015-3-sep-2024

Signed-off-by: Markus Theil <theil.markus@gmail.com>
2024-09-16 09:44:41 +02:00
Markus Theil
64ab30598c openssl_3_3: 3.3.1 -> 3.3.2
Contains two CVE fixes.

* Fixed possible denial of service in X.509 name checks. (CVE-2024-6119)
* Fixed possible buffer overread in SSL_select_next_proto(). (CVE-2024-5535)

Changelog: https://github.com/openssl/openssl/blob/openssl-3.3/CHANGES.md#changes-between-331-and-332-3-sep-2024

Signed-off-by: Markus Theil <theil.markus@gmail.com>
2024-09-16 09:44:41 +02:00
Markus Theil
38f10f915a openssl: switch to new download URL scheme (Github releases)
OpenSSL used to provide their software downloads on openssl.org.
Now they use links to Github releases.

OpenSSL 1.1.1w is also available at Github, but with a small
difference in the URL scheme.

Signed-off-by: Markus Theil <theil.markus@gmail.com>
2024-09-16 09:44:40 +02:00
github-actions[bot]
83e85079ff
Merge staging-next into staging 2024-09-12 18:04:48 +00:00
Arnout Engelen
c02a0dff78
openssl: expose 'enable-md2' option (#337885) 2024-09-12 17:20:18 +02:00
Philip Taron
40319dafd9
openssl: use makeBinaryWrapper instead of makeShellWrapper (#340951) 2024-09-11 04:37:31 -07:00
Ivan Trubach
155fb5be70 openssl: use makeBinaryWrapper instead of makeShellWrapper
This changes openssl to use makeBinaryWrapper since makeWrapper uses
non-overridable runtimeShell that causes infinite recursion. That is,
fetchurl in pkgs/top-level/all-packages.nix is bootstrapped by
overriding dependencies to use stdenv.fetchurlBoot.
2024-09-10 10:59:31 +03:00
Alyssa Ross
858c3f6081 openssl: fix building for riscv32-linux
Prior to 3.2, there's no linux32-riscv32 target, so we use
linux-latomic as a best approximation in that case.
2024-09-02 19:57:34 +02:00
Alyssa Ross
d303f0f65b openssl: fix build for microblaze 2024-09-01 22:28:34 +02:00
Arnout Engelen
6be6702d45
openssl: expose 'enable-md2' option
needed e.g. to build `onlyoffice-documentserver` from source
2024-08-30 13:50:27 +02:00
Philip Taron
2429bed692
openssl: remove with statements 2024-08-18 06:31:16 -07:00
Vladimír Čunát
211398c03e
Merge branch 'staging-next' into staging 2024-07-14 08:35:35 +02:00
éclairevoyant
0926bdbf98
treewide: fix uses of finalAttrs.pname in source urls 2024-07-12 20:23:39 -04:00
github-actions[bot]
b66506a79e
Merge staging-next into staging 2024-07-12 12:01:44 +00:00
superherointj
533da0c2ae openssl: add stridtech team as maintainer 2024-07-12 12:16:22 +02:00
Markus Theil
90b11e4031 openssl: fix CVE-2024-5535
Upstream commit: https://github.com/openssl/openssl/commit/e86ac436f0

This patch fixes the ALPN negotiation in OpenSSL.
It applies to all used versions >= 3.0, but was taken
from the 3.3 branch. Therefore I added it to the 3.3
directory.

Signed-off-by: Markus Theil <theil.markus@gmail.com>
2024-07-06 20:30:12 +02:00
Martin Weinelt
9b79a05ae1
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
- pkgs/development/python-modules/flexcache/default.nix
- pkgs/development/python-modules/flexparser/default.nix
- pkgs/development/python-modules/odp-amsterdam/default.nix
- pkgs/development/python-modules/pint/default.nix
- pkgs/development/python-modules/uncertainties/default.nix
- pkgs/top-level/python-packages.nix
2024-07-01 01:07:21 +02:00
John Ericson
d41da41ee4 openssl: Fix build on OpenBSD 2024-06-29 13:34:31 -04:00
Vladimír Čunát
4f52999045
Merge #317238: openssl_*: patch updates (incl. CVEs)
...into staging
2024-06-12 11:33:48 +02:00
Alexis Hildebrandt
755b915a15 treewide: Remove indefinite article from meta.description
nix run nixpkgs#silver-searcher -- -G '\.nix$' -0l 'description.*"[Aa]n?' pkgs \
  | xargs -0 nix run nixpkgs#gnused -- -i '' -Ee 's/(description.*")[Aa]n? (.)/\1\U\2/'
2024-06-09 23:07:45 +02:00
Markus Theil
88f9412faa
openssl_3_3: 3.3.0 -> 3.3.1
Changelog: https://github.com/openssl/openssl/blob/openssl-3.3/CHANGES.md#changes-between-330-and-331-4-jun-2024

CVEs fixed:
- Fixed potential use after free after SSL_free_buffers() is called.
  (CVE-2024-4741)
- Fixed an issue where checking excessively long DSA keys or parameters may be very slow.
  (CVE-2024-4603)

Signed-off-by: Markus Theil <theil.markus@gmail.com>
2024-06-04 18:09:37 +02:00
Markus Theil
8e9d7fb6af
openssl_3_2: 3.2.1 -> 3.2.2
Changelog: https://github.com/openssl/openssl/blob/openssl-3.2/CHANGES.md#changes-between-321-and-322-4-jun-2024

CVEs fixed:
- Fixed potential use after free after SSL_free_buffers() is called.
  (CVE-2024-4741)
- Fixed an issue where checking excessively long DSA keys or parameters may be very slow.
  (CVE-2024-4603)
- Fixed an issue where some non-default TLS server configurations can cause unbounded memory
  growth when processing TLSv1.3 sessions. An attacker may exploit certain server configurations
  to trigger unbounded memory growth that would lead to a Denial of Service.
  (CVE-2024-2511)

Signed-off-by: Markus Theil <theil.markus@gmail.com>
2024-06-04 18:09:21 +02:00
Markus Theil
29ee41feff
openssl_3: 3.0.13 -> 3.0.14
Changelog: https://github.com/openssl/openssl/blob/openssl-3.0/CHANGES.md#changes-between-3013-and-3014-4-jun-2024

CVEs fixed:
- Fixed potential use after free after SSL_free_buffers() is called.
  (CVE-2024-4741)
- Fixed an issue where checking excessively long DSA keys or parameters may be very slow.
  (CVE-2024-4603)
- Fixed an issue where some non-default TLS server configurations can cause unbounded
  memory growth when processing TLSv1.3 sessions. An attacker may exploit certain
  server configurations to trigger unbounded memory growth that would lead to a
  Denial of Service.
  (CVE-2024-2511)

Signed-off-by: Markus Theil <theil.markus@gmail.com>
2024-06-04 18:09:03 +02:00
Weijia Wang
41126a9493 Merge branch 'master' into staging-next 2024-05-01 10:51:08 +02:00
Antonio Nuno Monteiro
684cf9f16f openssl_3_3: init at 3.3.0 2024-04-30 13:59:57 -07:00
Markus Theil
56fc01663d openssl: update comments and add 1.1 deprecation notice
Change from 23.05 to 23.11 and mention first deprecation
try in 24.05.

Signed-off-by: Markus Theil <theil.markus@gmail.com>
2024-04-22 01:09:09 +10:00
OPNA2608
02424c9bc8 openssl: Add configureScript entry for powerpc64-linux 2024-03-12 10:29:13 +01:00
Markus Theil
2d9a5944ef openssl_3_2: 3.2.0 -> 3.2.1
Full release notes:
  https://github.com/openssl/openssl/blob/openssl-3.2.1/CHANGES.md#changes-between-320-and-321-30-jan-2024

Fixes:
  - CVE-2024-0727 (PKCS12 Handling Crash)
  - CVE-2023-6237 (long time taken for RSA key check)
  - CVE-2023-6129 (corrupt registers on PowerPC for Poly1305)
  - CVE-2023-5678 (excessive time in DH param check)

Signed-off-by: Markus Theil <theil.markus@gmail.com>
2024-01-30 16:41:15 +01:00
Markus Theil
ccaad56e4b openssl_3: 3.0.12 -> 3.0.13
Full release notes:
  https://github.com/openssl/openssl/blob/openssl-3.0.13/CHANGES.md#changes-between-3012-and-3013-30-jan-2024

Fixes:
  - CVE-2024-0727 (PKCS12 Handling Crash)
  - CVE-2023-6237 (long time taken for RSA key check)
  - CVE-2023-6129 (corrupt registers on PowerPC for Poly1305)
  - CVE-2023-5678 (excessive time in DH param check)

Signed-off-by: Markus Theil <theil.markus@gmail.com>
2024-01-30 16:37:01 +01:00
Ryan Burns
c324705cc3 treewide: simplify exec format conditionals 2024-01-07 17:43:33 -08:00
Markus Theil
9de58c34dc openssl_3_1: remove and explicitely state versioning
Signed-off-by: Markus Theil <theil.markus@gmail.com>
2023-11-29 22:25:28 +01:00
Markus Theil
1d19b2cb78 openssl_3_2: init at 3.2.0
Signed-off-by: Markus Theil <theil.markus@gmail.com>
2023-11-29 22:07:59 +01:00
Martin Weinelt
0fa664e76c
openssl: set up meta.changelog 2023-10-24 16:20:31 +02:00
Martin Weinelt
eb016c821a
openssL_3_1: 3.1.3 -> 3.1.4
https://github.com/openssl/openssl/blob/openssl-3.1.4/NEWS.md

Fixes: CVE-2023-5363
2023-10-24 16:13:23 +02:00
Martin Weinelt
97c9e3ab78
openssl_3: 3.0.11 -> 3.0.12
https://github.com/openssl/openssl/blob/openssl-3.0.12/NEWS.md

Fixes: CVE-2023-5363
2023-10-24 16:13:23 +02:00
Markus Theil
f5449675fa openssl_3_1: 3.1.2 -> 3.1.3
Signed-off-by: Markus Theil <theil.markus@gmail.com>
2023-09-25 12:28:42 +02:00
Markus Theil
9cf9b9d897 openssl_3_1: 3.1.1 -> 3.1.2
Signed-off-by: Markus Theil <theil.markus@gmail.com>
2023-09-25 12:28:42 +02:00
Markus Theil
1bd767f56b openssl: use hash, add thillux as maintainer
Signed-off-by: Markus Theil <theil.markus@gmail.com>
2023-09-25 12:28:42 +02:00
Markus Theil
5a881224c5 openssl_3_1: init at 3.1.1
OpenSSL 3.1 is the most recent release to develop against,
while OpenSSL 3.0 is a LTS release, most developers should
probably choose now (see:
https://github.com/openssl/openssl/issues/20722).

Add OpenSSL 3.1.1 in order to allow development against this
version with Nix.

Currently OpenSSL 3.0 and 3.1 are independent release lines.

Signed-off-by: Markus Theil <theil.markus@gmail.com>
2023-09-24 19:08:22 +02:00
ajs124
226f3574fb openssl: 3.0.10 -> 3.0.11
https://github.com/openssl/openssl/blob/openssl-3.0/NEWS.md#major-changes-between-openssl-3010-and-openssl-3011-19-sep-2023
Fixes CVE-2023-4807
2023-09-19 16:03:05 +02:00
Austin Horstman
3fd75f93ab
treewide: add meta.mainProgram (#255932) 2023-09-18 20:57:04 +03:00
ajs124
93840b4878 openssl_1_1: 1.1.1v -> 1.1.1w
https://github.com/openssl/openssl/blob/OpenSSL_1_1_1w/NEWS
2023-09-11 17:28:09 +02:00
Sophie Tauchert
e3b940ced6
openssl_1_1: apply patch for CVE-2023-4807
see also https://www.openssl.org/news/secadv/20230908.txt
2023-09-08 23:35:39 +02:00
Vladimír Čunát
d5732d9669
Merge branch 'staging-next' into staging 2023-08-05 07:45:29 +02:00
Vladimír Čunát
4a56ce9727
Merge #246581: openssl_1_1: 1.1.1u -> 1.1.1v 2023-08-02 21:06:56 +02:00