diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2018-05-03 23:39:10 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2018-05-03 23:39:10 +0000 |
| commit | a68f18cd9b491c6b52191a8ebde909e12ad9e16b (patch) | |
| tree | 0badbad66c660a123df14f9b4501cdf124e92a8c /security/openssh-portable/files/patch-341727df910e12e26ef161508ed76d91c40a61eb | |
| parent | Update to LLVM 5.0.2. (diff) | |
- Add XMSS option to enable experimental key support added in 7.7 [1]
- Bring in upstream patches post 7.7 to fix various issues [2]:
b81b2d120e9c8a83489e241620843687758925ad - Fix tunnel forwarding broken in 7.7p1
341727df910e12e26ef161508ed76d91c40a61eb - don't kill ssh-agent's listening socket entriely if we fail to accept a connection
85fe48fd49f2e81fa30902841b362cfbb7f1933b - don't free the %C expansion, it's used later for LocalCommand
868afa68469de50d8a43e5daf867d7c624a34d20 - Disable SSH2_MSG_DEBUG messages for Twisted Conch clients
f5baa36ba79a6e8c534fb4e0a00f2614ccc42ea6 - Omit 3des-cbc if OpenSSL built without DES
PR: 227758 [1]
Submitted by: IWAMOTO Kouichi <sue@iwmt.org> [1]
PR: 227551 [2]
Reported by: rozhuk.im@gmail.com [2]
Obtained from: upstream mirror https://github.com/openssh/openssh-portable [2]
Diffstat (limited to 'security/openssh-portable/files/patch-341727df910e12e26ef161508ed76d91c40a61eb')
| -rw-r--r-- | security/openssh-portable/files/patch-341727df910e12e26ef161508ed76d91c40a61eb | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/security/openssh-portable/files/patch-341727df910e12e26ef161508ed76d91c40a61eb b/security/openssh-portable/files/patch-341727df910e12e26ef161508ed76d91c40a61eb new file mode 100644 index 000000000000..d17acd109fb9 --- /dev/null +++ b/security/openssh-portable/files/patch-341727df910e12e26ef161508ed76d91c40a61eb @@ -0,0 +1,35 @@ +From 341727df910e12e26ef161508ed76d91c40a61eb Mon Sep 17 00:00:00 2001 +From: "djm@openbsd.org" <djm@openbsd.org> +Date: Mon, 9 Apr 2018 23:54:49 +0000 +Subject: [PATCH] upstream: don't kill ssh-agent's listening socket entriely if + we + +fail to accept a connection; bz#2837, patch from Lukas Kuster + +OpenBSD-Commit-ID: 52413f5069179bebf30d38f524afe1a2133c738f +--- + ssh-agent.c | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git ssh-agent.c ssh-agent.c +index 2a4578b03..68de56ce6 100644 +--- ssh-agent.c ++++ ssh-agent.c +@@ -1,4 +1,4 @@ +-/* $OpenBSD: ssh-agent.c,v 1.228 2018/02/23 15:58:37 markus Exp $ */ ++/* $OpenBSD: ssh-agent.c,v 1.229 2018/04/09 23:54:49 djm Exp $ */ + /* + * Author: Tatu Ylonen <ylo@cs.hut.fi> + * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland +@@ -909,9 +909,8 @@ after_poll(struct pollfd *pfd, size_t npfd) + /* Process events */ + switch (sockets[socknum].type) { + case AUTH_SOCKET: +- if ((pfd[i].revents & (POLLIN|POLLERR)) != 0 && +- handle_socket_read(socknum) != 0) +- close_socket(&sockets[socknum]); ++ if ((pfd[i].revents & (POLLIN|POLLERR)) != 0) ++ handle_socket_read(socknum); + break; + case AUTH_CONNECTION: + if ((pfd[i].revents & (POLLIN|POLLERR)) != 0 && |