Commit graph

392 commits

Author SHA1 Message Date
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
Martin Weinelt eeca5969b3
openssl: 3.0.5 -> 3.0.7
Fixes: CVE-2022-3786, CVE-2022-3602
Co-Authored-By: Andreas Schrägle <git@ajs124.de>
2022-11-01 16:44:23 +01:00
ajs124 0755f8c8f8 Revert "openssl: 3.0.5 -> 3.0.6"
This reverts commit 0c743ca36f.

https://mta.openssl.org/pipermail/openssl-announce/2022-October/000237.html
2022-10-13 18:10:42 +02:00
ajs124 b30d687dd0 Revert "openssl: 1.1.1q -> 1.1.1r"
This reverts commit 0bf7095945.

https://mta.openssl.org/pipermail/openssl-announce/2022-October/000237.html
2022-10-13 18:10:13 +02:00
Martin Weinelt 4828dc9d9b Merge remote-tracking branch 'helsinki-systems/upd/openssl' into staging 2022-10-12 02:20:45 +02:00
ajs124 0bf7095945 openssl: 1.1.1q -> 1.1.1r
bugfix release, does not fix any security issues
2022-10-11 22:29:58 +02:00
ajs124 0c743ca36f openssl: 3.0.5 -> 3.0.6
fixes CVE-2022-3358

https://www.openssl.org/news/secadv/20221011.txt
2022-10-11 17:00:34 +02:00
Sandro Jäckel 33944d5ddd
openssl: fix static cross compilation 2022-09-20 16:25:47 +02:00
Enno Richter 3278ce100b sslscan: enable TLS compression check 2022-09-08 14:06:32 +02:00
ajs124 075b852820 openssl: versionAtLeast 1.1.0 -> 1.1.1
we don't have/support 1.1.0 anymore, so 1.1.1 is the new minimum
2022-08-17 20:16:18 +02:00
ajs124 c6de1d4b24 openssl: fix static build
https://mta.openssl.org/pipermail/openssl-users/2022-February/014906.html
2022-08-17 20:16:18 +02:00
Adam Joseph a381f9bccf openssl: Rosetta Stone entry for mips32 2022-08-04 21:22:27 -07:00
Robert 649646d7b7
openssl: split runtime dependencies of static builds into a separate output (#182444) 2022-07-23 17:06:06 -04:00
Martin Weinelt 82da6eb46d
openssl_1_1: 1.1.1p -> 1.1.1q
https://www.openssl.org/news/secadv/20220705.txt

Fixes: CVE-2022-2097
2022-07-05 23:14:13 +02:00
Martin Weinelt 1dbf7b45e2
openssl_3: 3.0.4 -> 3.0.5
https://www.openssl.org/news/secadv/20220705.txt

We already acted on the first public disclosure, so this release removes
the previous patch and upgrades to the release including the fix.

Related: CVE-2022-2274
Fixes: CVE-2022-2097
2022-07-05 23:14:10 +02:00
Vladimír Čunát 0c4852c7bc
Merge #179333: openssl_3_0: fix apparent x86_64 AVX512 RCE 2022-06-28 01:01:42 +02:00
Martin Weinelt 62b05d9742 Merge remote-tracking branch 'origin/master' into staging-next 2022-06-27 23:50:37 +02:00
Alyssa Ross fd6a8fb894
openssl_3: rename from openssl_3_0
With their new versioning scheme, OpenSSL have committed[1] to API and
ABI compatibility for the whole 3.x.x release series, so we shouldn't
be overly specific in our attribute name.

[1]: https://www.openssl.org/blog/blog/2018/11/28/version/
2022-06-27 13:35:16 +00:00
Alyssa Ross c59d1ebd6e
openssl_3_0: fix apparent x86_64 AVX512 RCE
Has been applied upstream.  No CVE.
2022-06-27 13:14:30 +00:00
Martin Weinelt deb8ef1162 openssl_3_0: 3.0.3 -> 3.0.4
Fixes additional sanitization issues in the c_rehash script.

https://mta.openssl.org/pipermail/openssl-announce/2022-June/000227.html

Fixes: CVE-2022-2068
2022-06-21 18:02:47 +02:00
Martin Weinelt 0c21382922 openssl_1_1: 1.1.1o -> 1.1.1p
Fixes additional sanitization issues in the c_rehash script.

https://mta.openssl.org/pipermail/openssl-announce/2022-June/000226.html

Fixes: CVE-2022-2068
2022-06-21 18:02:47 +02:00
Jörg Thalheim cc60c24909
openssl: disable ct feature in static mode (#173288)
For static binaries to be relocatable, they can't depend on data files.

Co-authored-by: zimbatm <zimbatm@zimbatm.com>
2022-05-17 11:42:46 +02:00