Commit Graph

413 Commits

Author SHA1 Message Date
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
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
ajs124
828dea331a openssl_1_1: 1.1.1u -> 1.1.1v
https://github.com/openssl/openssl/blob/OpenSSL_1_1_1v/NEWS
2023-08-01 16:28:52 +02:00
ajs124
b889dfdb34 openssl: 3.0.9 -> 3.0.10
https://github.com/openssl/openssl/blob/openssl-3.0/NEWS.md#major-changes-between-openssl-309-and-openssl-3010-1-aug-2023
2023-08-01 16:24:15 +02:00
Adam Joseph
a5e3f306b7
Merge pull request #244255 from amjoseph-nixpkgs/pr/mips/openssl-march
openssl: prevent -march= flags from being added on mips
2023-07-31 21:12:59 +00:00
Martin Weinelt
5566720c28
openssl_3: apply patch for CVE-2023-2975
https://www.openssl.org/news/secadv/20230714.txt
2023-07-15 03:31:42 +02:00
Adam Joseph
7eaaa6ef22 openssl: prevent -march= flags from being added on mips
Openssl assumes that CFLAGS contains all of the flags that will be
passed to the compiler.  This assumption fails for nixpkgs due to
our cc-wrapper.

On mips platforms, openssl scans CFLAGS to see if the user passed a
-march flag; if not, it adds its own:

  if ($target =~ /linux.*-mips/ && !$disabled{asm}
        && !grep { $_ =~ /-m(ips|arch=)/ } (@{$config{CFLAGS}})) {
        # minimally required architecture flags for assembly modules
        my $value;
        $value = '-mips2' if ($target =~ /mips32/);
        $value = '-mips3' if ($target =~ /mips64/);
        unshift @{$config{cflags}}, $value;
        unshift @{$config{cxxflags}}, $value if $config{CXX};
  }

Unfortunately since nixpkgs adds `-march=` in the wrapper, rather
than the CFLAGS, openssl can't see it.  The result is two
conflicting `-march=` flags and a build failure when the user has
customized `hostPlatform.gcc.arch`:

  openssl-mips64el-unknown-linux-gnuabin32> mips64el-unknown-linux-gnuabin32-gcc  -I. -Iinclude -Iapps/include  -fPIC -pthread -mabi=n32 -mips3 -Wa,--noexecstack -Wall -O3 -DOPENSSL_USE_NODELETE -DOPENSSL_PIC -DOPENSSLDIR="\"/nix/store/8kwvrgwdk56ml6sz5swr71fv9mv4592w-openssl-mips64el-unknown-linux-gnuabin32-3.0.9/etc/ssl\"" -DENGINESDIR="\"/nix/store/8kwvrgwdk56ml6sz5swr71fv9mv4592w-openssl-mips64el-unknown-linux-gnuabin32-3.0.9/lib/engines-3\"" -DMODULESDIR="\"/nix/store/8kwvrgwdk56ml6sz5swr71fv9mv4592w-openssl-mips64el-unknown-linux-gnuabin32-3.0.9/lib/ossl-modules\"" -DOPENSSL_BUILDING_OPENSSL -DNDEBUG  -MMD -MF apps/lib/libapps-lib-engine.d.tmp -MT apps/lib/libapps-lib-engine.o -c -o apps/lib/libapps-lib-engine.o apps/lib/engine.c
  cc1: error: '-mips3' conflicts with the other architecture options, which specify a mips64r2 processor
  cc1: error: '-mips3' conflicts with the other architecture options, which specify a mips64r2 processor
  make[1]: *** [Makefile:4254: apps/lib/libapps-lib-app_libctx.o] Error 1
  make[1]: *** Waiting for unfinished jobs....
  make[1]: *** [Makefile:4262: apps/lib/libapps-lib-app_params.o] Error 1
  make[1]: *** [Makefile:4270: apps/lib/libapps-lib-app_provider.o] Error 1

This commit defeats the perl code above by passing `CFLAGS=-march`
to openssl's `./Configure` script.
2023-07-05 09:17:56 -07:00
Raito Bezarius
69a2b23a01 pkgs/top-level/release: cache openssl-1.1.1u instead of openssl-1.1.1t
We were caching this insecure package as part of a decision during 23.05, we will now cache
openssl-1.1.1u too as this is now the de-facto OpenSSL package on 23.05, which is EOL.
2023-06-19 00:27:09 +02:00
Martin Weinelt
73e5ebfce5
openssl: 3.0.8 -> 3.0.9 (#235006)
https://github.com/openssl/openssl/blob/openssl-3.0.9/NEWS.md

Fixes: CVE-2023-2650, CVE-2023-1255, CVE-2023-0466, CVE-2023-0465
       CVE-2023-0464
2023-05-30 22:31:19 +02:00
Martin Weinelt
bca975c293
openssl_1_1: 1.1.1t -> 1.1.1u
https://github.com/openssl/openssl/blob/OpenSSL_1_1_1u/NEWS

Fixes: CVE-2023-2650, CVE-2023-0466, CVE-2023-0465, CVE-2023-0464
2023-05-30 15:51:11 +02:00
Martin Weinelt
e872de9a9e
openssl_1_1: mark end-of-life
https://www.openssl.org/blog/blog/2023/03/28/1.1.1-EOL/

Closes: #210452
2023-05-18 01:15:45 +02:00
Hamish Mackenzie
6697c41feb
openssl: Fix windows cross compile
It was broken by 18f1be7071
2023-05-03 13:03:43 +12:00
Adrian Gierakowski
18f1be7071 openssl: remove run-time dependency of perl due to c_rehash
Replaces perl based c_rehash script with shell script wrapping `openssl rehash`
with the same functionality.

Fixes: #19965
Supersedes: #156776, #83446
Possibly related to: #157093, #82924
2023-04-14 07:19:05 +03:00
Moritz Angermann
52a64f715e openssl: allow disabling ktls
This allows disabling ktls on demand. E.g. for platforms where building with ktls
fails.

Co-authored-by: John Ericson <git@JohnEricson.me>
2023-03-04 06:10:18 +00:00
Sandro
ef3fd36f5b
Merge pull request #190318 from elohmeier/sslscan-tlscompression 2023-02-18 01:24:32 +01:00
John Ericson
d0e7867130 openssl: Add meta.pkgConfigModules and test 2023-02-13 10:24:55 -05:00
Vladimír Čunát
f1fefd41d3
Merge #215143: openssl_1_1: 1.1.1s -> 1.1.1t
...into staging-next
2023-02-07 17:35:30 +01:00
Martin Weinelt
faa4d60e7f
openssl_1_1: 1.1.1s -> 1.1.1t
https://github.com/openssl/openssl/blob/OpenSSL_1_1_1t/NEWS

Fixes: CVE-2023-0286, CVE-2023-0215, CVE-2022-4450, CVE-2022-4304
2023-02-07 17:21:01 +01:00
Martin Weinelt
15cf84feea
openssl: 3.0.7 -> 3.0.8
https://github.com/openssl/openssl/blob/openssl-3.0.8/NEWS.md

Fixes: CVE-2023-0401, CVE-2023-0286, CVE-2023-0217, CVE-2023-0216,
       CVE-2023-0215, CVE-2022-4450, CVE-2022-4304, CVE-2022-4203,
       CVE-2022-3996
2023-02-07 17:02:33 +01:00
ajs124
fa8c56b8c7 openssl_3: patch CVE-2022-3996
https://www.openssl.org/news/secadv/20221213.txt
2022-12-13 17:34:42 +01:00
Linus Heckemann
f984417f86
Merge pull request #204165 from lheckemann/openssl-cross-fix
openssl: clean up configure script decision
2022-12-07 15:59:49 +01:00
Linus Heckemann
b7d5205f1a openssl: clean up configure script decision
This also fixes the build for big-endian MIPS systems.
2022-12-02 23:09:13 +01:00
Martin Weinelt
53d777c56f
Merge pull request #202126 from helsinki-systems/init/openssl_legacy 2022-11-26 23:47:31 +01:00
Artturi
821e146f51
Merge pull request #185176 from amjoseph-nixpkgs/pr/openssl/mips32
openssl: Rosetta Stone entry for mips32
2022-11-21 21:44:14 +02:00
ajs124
1996190b65 openssl_legacy: init
openssl_3, but with a openssl.cnf that enables legacy ciphers
this way we can migrate away from openssl_1_1, while not breaking
applications relying on deprecated stuff
2022-11-21 13:46:00 +01:00
Vladimír Čunát
b15a637819
Merge #199009: openssl_1_1: 1.1.1q -> 1.1.1s
...into staging
2022-11-05 16:59:07 +01:00
Vladimír Čunát
70ca403dc2
openssl(_3): enable KTLS only on Linux
This fixes build on *-darwin.
2022-11-02 09:33:15 +01:00
Vladimír Čunát
6aa0c5e918
openssl_1_1: drop a long unused patch 2022-11-01 18:46:44 +01:00
Vladimír Čunát
32ebb91f4b
openssl_1_1: 1.1.1q -> 1.1.1s
I believe this double version jump includes no security fixes.
2022-11-01 17:29:35 +01:00