summaryrefslogtreecommitdiff
path: root/gnu/packages/tls.scm
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2018-08-15 00:24:17 +0200
committerTobias Geerinckx-Rice <me@tobias.gr>2018-08-15 00:35:53 +0200
commitd87e547702bcffdf0eb3948409a94f146538afb8 (patch)
tree837c12d9a6ae1625a67bcfe0519153ab3f5832b8 /gnu/packages/tls.scm
parent34362ff6d656eef7a24cbdcf5d7c9c26a29d2ccf (diff)
gnu: openssl@1.1: Update to 1.1.0i [fix CVE-2018-0737].
Also includes a fix for CVE-2018-0732, and a different approach to fixing CVE-2018-0495. * gnu/packages/tls.scm (openssl-next): Update to 1.1.0i. [sources]: Remove CVE patches. * gnu/packages/patches/openssl-1.1.0-CVE-2018-0495.patch: Delete... * gnu/packages/patches/openssl-1.1.0-CVE-2018-0732.patch: ...both files. * gnu/local.mk (dist_patch_DATA): Remove them.
Diffstat (limited to 'gnu/packages/tls.scm')
-rw-r--r--gnu/packages/tls.scm10
1 files changed, 4 insertions, 6 deletions
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index cafe71bd41..28d2ea5fd5 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -410,7 +410,7 @@ required structures.")
(package
(inherit openssl)
(name "openssl")
- (version "1.1.0h")
+ (version "1.1.0i")
(source (origin
(method url-fetch)
(uri (list (string-append "https://www.openssl.org/source/openssl-"
@@ -420,14 +420,12 @@ required structures.")
(string-append "ftp://ftp.openssl.org/source/old/"
(string-trim-right version char-set:letter)
"/" name "-" version ".tar.gz")))
- (patches (search-patches "openssl-1.1.0-c-rehash-in.patch"
- "openssl-1.1.0-CVE-2018-0495.patch"
- "openssl-1.1.0-CVE-2018-0732.patch"))
+ (patches (search-patches "openssl-1.1.0-c-rehash-in.patch"))
(sha256
(base32
- "05x509lccqjscgyi935z809pwfm708islypwhmjnb6cyvrn64daq"))))
+ "16fgaf113p6s5ixw227sycvihh3zx6f6rf0hvjjhxk68m12cigzb"))))
(outputs '("out"
- "doc" ;1.3MiB of man3 pages
+ "doc" ; 1.3MiB of man3 pages
"static")) ; 5.5MiB of .a files
(arguments
(substitute-keyword-arguments (package-arguments openssl)