[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
81/155: gnu: openssh: Update to 7.4p1.
From: |
John Darrington |
Subject: |
81/155: gnu: openssh: Update to 7.4p1. |
Date: |
Wed, 21 Dec 2016 20:48:35 +0000 (UTC) |
jmd pushed a commit to branch wip-installer
in repository guix.
commit 74e163909b42cfa6c462de200d9216a8a5b6e7b3
Author: Leo Famulari <address@hidden>
Date: Mon Dec 19 10:33:17 2016 -0500
gnu: openssh: Update to 7.4p1.
* gnu/packages/ssh.scm (openssh): Update to 7.4p1.
[source]: Remove 'openssh-memory-exhaustion.patch'.
* gnu/packages/patches/openssh-memory-exhaustion.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
---
gnu/local.mk | 1 -
.../patches/openssh-memory-exhaustion.patch | 39 --------------------
gnu/packages/ssh.scm | 5 +--
3 files changed, 2 insertions(+), 43 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index e0ff3f3..3fb6037 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -767,7 +767,6 @@ dist_patch_DATA =
\
%D%/packages/patches/openjpeg-CVE-2016-9850-CVE-2016-9851.patch
\
%D%/packages/patches/openjpeg-use-after-free-fix.patch \
%D%/packages/patches/openocd-nrf52.patch \
- %D%/packages/patches/openssh-memory-exhaustion.patch \
%D%/packages/patches/openssl-runpath.patch \
%D%/packages/patches/openssl-1.1.0-c-rehash-in.patch \
%D%/packages/patches/openssl-c-rehash-in.patch \
diff --git a/gnu/packages/patches/openssh-memory-exhaustion.patch
b/gnu/packages/patches/openssh-memory-exhaustion.patch
deleted file mode 100644
index 91fe294..0000000
--- a/gnu/packages/patches/openssh-memory-exhaustion.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Fix a memory exhaustion bug in the key exchange, whereby an unauthenticated
user
-could potentially consume 38400 MB of memory on the server:
-
-http://seclists.org/oss-sec/2016/q4/185
-
-Patch adapted from upstream source repository:
-
-https://github.com/openssh/openssh-portable/commit/ec165c392ca54317dbe3064a8c200de6531e89ad
-
-From ec165c392ca54317dbe3064a8c200de6531e89ad Mon Sep 17 00:00:00 2001
-From: "address@hidden" <address@hidden>
-Date: Mon, 10 Oct 2016 19:28:48 +0000
-Subject: [PATCH] upstream commit
-
-Unregister the KEXINIT handler after message has been
-received. Otherwise an unauthenticated peer can repeat the KEXINIT and cause
-allocation of up to 128MB -- until the connection is closed. Reported by
-shilei-c at 360.cn
-
-Upstream-ID: 43649ae12a27ef94290db16d1a98294588b75c05
----
- kex.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/kex.c b/kex.c
-index 3f97f8c..6a94bc5 100644
---- a/kex.c
-+++ b/kex.c
-@@ -481,6 +481,7 @@ kex_input_kexinit(int type, u_int32_t seq, void *ctxt)
- if (kex == NULL)
- return SSH_ERR_INVALID_ARGUMENT;
-
-+ ssh_dispatch_set(ssh, SSH2_MSG_KEXINIT, NULL);
- ptr = sshpkt_ptr(ssh, &dlen);
- if ((r = sshbuf_put(kex->peer, ptr, dlen)) != 0)
- return r;
---
-2.10.1
-
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index ea5ec81..0fe6598 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -112,7 +112,7 @@ a server that supports the SSH-2 protocol.")
(define-public openssh
(package
(name "openssh")
- (version "7.3p1")
+ (version "7.4p1")
(source (origin
(method url-fetch)
(uri (let ((tail (string-append name "-" version ".tar.gz")))
@@ -122,9 +122,8 @@ a server that supports the SSH-2 protocol.")
tail)
(string-append
"http://ftp2.fr.openbsd.org/pub/OpenBSD/OpenSSH/portable/"
tail))))
- (patches (search-patches "openssh-memory-exhaustion.patch"))
(sha256 (base32
- "1k5y1wi29d47cgizbryxrhc1fbjsba2x8l5mqfa9b9nadnd9iyrz"))))
+ "1l8r3x4fr2kb6xm95s7kjdif1wp6f94d4kljh4qjj9109shw87qv"))))
(build-system gnu-build-system)
(inputs `(("groff" ,groff)
("openssl" ,openssl)
- 69/155: gnu: tor: split description into two parts for easier reading., (continued)
- 69/155: gnu: tor: split description into two parts for easier reading., John Darrington, 2016/12/21
- 72/155: gnu: gnumach-headers: Update to 1.8., John Darrington, 2016/12/21
- 75/155: gnu: pcsc-lite: Update to 1.8.19., John Darrington, 2016/12/21
- 87/155: gexp: Slightly simplify 'gexp-inputs'., John Darrington, 2016/12/21
- 84/155: doc: Mention 'grub' field of 'grub-configuration'., John Darrington, 2016/12/21
- 80/155: gnu: samba: Update to 4.5.3 [fixes CVE-2016-{2123, 2125, 2126}]., John Darrington, 2016/12/21
- 97/155: install: The list of services is now a plain list., John Darrington, 2016/12/21
- 90/155: gnu: linux-libre: Update to 4.8.15., John Darrington, 2016/12/21
- 95/155: Revert "gnu: grub: Add dependency on efibootmgr.", John Darrington, 2016/12/21
- 108/155: gnu: enlightenment: Update to 0.21.5., John Darrington, 2016/12/21
- 81/155: gnu: openssh: Update to 7.4p1.,
John Darrington <=
- 105/155: services: guix: Remove dependency on lsh., John Darrington, 2016/12/21
- 123/155: build: Bump version number., John Darrington, 2016/12/21
- 119/155: gnu: cuirass: Make sure 'cuirass' has 'evaluate' in $PATH., John Darrington, 2016/12/21
- 125/155: import: pypi: Match new 'pypi-uri' domain in updater., John Darrington, 2016/12/21
- 133/155: gnu: nss: Add comment about test failures in NSS 3.27.2, John Darrington, 2016/12/21
- 73/155: gnu: mig: Update to 1.8., John Darrington, 2016/12/21
- 99/155: gnu: utox: Update to 0.11.0., John Darrington, 2016/12/21
- 109/155: gnu: cutadapt: Use ‘modify-phases’ syntax., John Darrington, 2016/12/21
- 106/155: services: guix: Add 'log-file' configuration option., John Darrington, 2016/12/21
- 121/155: services: cuirass: Add Cuirass to the system profile., John Darrington, 2016/12/21