diff options
| author | Mark H Weaver <mhw@netris.org> | 2021-06-13 20:03:29 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2021-06-14 03:30:03 -0400 |
| commit | 3abaca2aaed87927b18d80381fe64897ac889f8c (patch) | |
| tree | 8d6b6c730f9cd07c53db0c12473fdccc7a74bc70 /gnu/packages/nettle.scm | |
| parent | d3acad16260e96d3df606817fc4e467aad27741a (diff) | |
| download | guix-3abaca2aaed87927b18d80381fe64897ac889f8c.tar guix-3abaca2aaed87927b18d80381fe64897ac889f8c.tar.gz | |
gnu: nettle-3.5: Add replacement to fix CVE-2021-3580 et al.
* gnu/packages/patches/nettle-3.5-check-_pkcs1_sec_decrypt-msg-len.patch,
gnu/packages/patches/nettle-3.5-CVE-2021-3580-pt1.patch,
gnu/packages/patches/nettle-3.5-CVE-2021-3580-pt2.patch: New files.
* gnu/local.mk (dist_patch_DATA): Add them.
* gnu/packages/nettle.scm (nettle)[replacement]: New field.
(nettle-3.5/fixed): New variable.
Diffstat (limited to 'gnu/packages/nettle.scm')
| -rw-r--r-- | gnu/packages/nettle.scm | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/gnu/packages/nettle.scm b/gnu/packages/nettle.scm index 753e2d6e7e..3d394dc746 100644 --- a/gnu/packages/nettle.scm +++ b/gnu/packages/nettle.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> -;;; Copyright © 2016 Mark H Weaver <mhw@netris.org> +;;; Copyright © 2016, 2021 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; @@ -25,6 +25,7 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) + #:use-module (gnu packages) #:use-module (gnu packages multiprecision) #:use-module (gnu packages m4)) @@ -77,6 +78,7 @@ themselves.") ;; cannot use it yet. So keep it separate. (package (inherit nettle-2) (version "3.5.1") + (replacement nettle-3.5/fixed) (source (origin (method url-fetch) (uri (string-append "mirror://gnu/nettle/nettle-" @@ -91,6 +93,13 @@ themselves.") ;; at run time based on CPU features (starting from 3.1.) `(cons "--enable-fat" ,flags)))))) +(define nettle-3.5/fixed + (package-with-extra-patches + nettle-3.5 + (search-patches "nettle-3.5-check-_pkcs1_sec_decrypt-msg-len.patch" + "nettle-3.5-CVE-2021-3580-pt1.patch" + "nettle-3.5-CVE-2021-3580-pt2.patch"))) + (define-public nettle-3.7 (package (inherit nettle-3.5) (version "3.7.2") |