diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-12-19 01:42:40 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-12-19 01:42:40 +0100 |
| commit | 32cd878be0bb7e153fcaa6f3bfa2632867390ff9 (patch) | |
| tree | fc1ff93949817c9d172c84d0410ac9225cad57ae /gnu/packages/tls.scm | |
| parent | 753425610274ccb59cce13490c096027c61621d0 (diff) | |
| parent | 98bd11cfe7b931e9c6d6bf002a8a225fb7a1025b (diff) | |
| download | guix-32cd878be0bb7e153fcaa6f3bfa2632867390ff9.tar guix-32cd878be0bb7e153fcaa6f3bfa2632867390ff9.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/tls.scm')
| -rw-r--r-- | gnu/packages/tls.scm | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index d0948ab555..8eff723543 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -247,6 +247,7 @@ required structures.") (package (name "openssl") (version "1.0.2m") + (replacement openssl-1.0.2n) (source (origin (method url-fetch) (uri (list (string-append "https://www.openssl.org/source/openssl-" @@ -390,6 +391,25 @@ required structures.") (license license:openssl) (home-page "http://www.openssl.org/"))) +;; Fixes CVE-2017-3735, CVE-2017-3736, CVE-2017-3737, and CVE-2017-3738. +;; See <https://www.openssl.org/news/cl102.txt>. +(define-public openssl-1.0.2n + (package + (inherit openssl) + (version "1.0.2n") + (source (origin + (inherit (package-source openssl)) + (uri (list (string-append "https://www.openssl.org/source/openssl-" + version ".tar.gz") + (string-append "ftp://ftp.openssl.org/source/openssl-" + version ".tar.gz") + (string-append "ftp://ftp.openssl.org/source/old/" + (string-trim-right version char-set:letter) + "/openssl-" version ".tar.gz"))) + (sha256 + (base32 + "1zm82pyq5a9jm10q6iv7d3dih3xwjds4x30fqph3k317byvsn2rp")))))) + (define-public openssl-next (package (inherit openssl) @@ -681,7 +701,7 @@ OpenSSL libraries).") (define-public perl-crypt-openssl-bignum (package (name "perl-crypt-openssl-bignum") - (version "0.08") + (version "0.09") (source (origin (method url-fetch) @@ -691,7 +711,7 @@ OpenSSL libraries).") ".tar.gz")) (sha256 (base32 - "0gamn4dff1bz77nswacy1dlpn9fkwahzw7yvvik4nbwwy2s63hc8")))) + "1p22znbajq91lbk2k3yg12ig7hy5b4vy8igxwqkmbm4nhgxp4ki3")))) (build-system perl-build-system) (inputs `(("openssl" ,openssl))) (arguments perl-crypt-arguments) |