[openssh-commits] [openssh] 05/05: upstream commit

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

dtucker pushed a commit to branch master
in repository openssh.

commit 3e615090de0ce36a833d811e01c28aec531247c4
Author: dtucker at openbsd.org <dtucker at openbsd.org>
Date:   Tue Feb 6 06:01:54 2018 +0000

    upstream commit
    
    Replace "trojan horse" with the correct term (MITM).
    From maikel at predikkta.com via bz#2822, ok markus@
    
    OpenBSD-Commit-ID: e86ac64c512057c89edfadb43302ac0aa81a6c53
---
 ssh_config.5 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ssh_config.5 b/ssh_config.5
index c1bd7df4..8afa0c13 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -33,8 +33,8 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: ssh_config.5,v 1.262 2017/10/24 06:27:42 jmc Exp $
-.Dd $Mdocdate: October 24 2017 $
+.\" $OpenBSD: ssh_config.5,v 1.263 2018/02/06 06:01:54 dtucker Exp $
+.Dd $Mdocdate: February 6 2018 $
 .Dt SSH_CONFIG 5
 .Os
 .Sh NAME
@@ -1458,7 +1458,7 @@ If this flag is set to
 will never automatically add host keys to the
 .Pa ~/.ssh/known_hosts
 file, and refuses to connect to hosts whose host key has changed.
-This provides maximum protection against trojan horse attacks,
+This provides maximum protection against man-in-the-middle (MITM) attacks,
 though it can be annoying when the
 .Pa /etc/ssh/ssh_known_hosts
 file is poorly maintained or when connections to new hosts are

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.