diff options
author | dtucker@openbsd.org <dtucker@openbsd.org> | 2018-02-06 06:01:54 +0000 |
---|---|---|
committer | Darren Tucker <dtucker@dtucker.net> | 2018-02-07 07:50:46 +1100 |
commit | 3e615090de0ce36a833d811e01c28aec531247c4 (patch) | |
tree | 30c9ac3f84f41d51978e4fa20ffb458bc208a201 | |
parent | 3484380110d437c50e17f87d18544286328c75cb (diff) |
upstream commit
Replace "trojan horse" with the correct term (MITM).
From maikel at predikkta.com via bz#2822, ok markus@
OpenBSD-Commit-ID: e86ac64c512057c89edfadb43302ac0aa81a6c53
-rw-r--r-- | ssh_config.5 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ssh_config.5 b/ssh_config.5 index c1bd7df41..8afa0c138 100644 --- a/ssh_config.5 +++ b/ssh_config.5 | |||
@@ -33,8 +33,8 @@ | |||
33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
35 | .\" | 35 | .\" |
36 | .\" $OpenBSD: ssh_config.5,v 1.262 2017/10/24 06:27:42 jmc Exp $ | 36 | .\" $OpenBSD: ssh_config.5,v 1.263 2018/02/06 06:01:54 dtucker Exp $ |
37 | .Dd $Mdocdate: October 24 2017 $ | 37 | .Dd $Mdocdate: February 6 2018 $ |
38 | .Dt SSH_CONFIG 5 | 38 | .Dt SSH_CONFIG 5 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -1458,7 +1458,7 @@ If this flag is set to | |||
1458 | will never automatically add host keys to the | 1458 | will never automatically add host keys to the |
1459 | .Pa ~/.ssh/known_hosts | 1459 | .Pa ~/.ssh/known_hosts |
1460 | file, and refuses to connect to hosts whose host key has changed. | 1460 | file, and refuses to connect to hosts whose host key has changed. |
1461 | This provides maximum protection against trojan horse attacks, | 1461 | This provides maximum protection against man-in-the-middle (MITM) attacks, |
1462 | though it can be annoying when the | 1462 | though it can be annoying when the |
1463 | .Pa /etc/ssh/ssh_known_hosts | 1463 | .Pa /etc/ssh/ssh_known_hosts |
1464 | file is poorly maintained or when connections to new hosts are | 1464 | file is poorly maintained or when connections to new hosts are |