Differential D3103

ssh: canonicize the host name before looking it up in the host file
ClosedPublic
Actions

Authored by vangyzen on Jul 15 2015, 8:35 PM.

Details

Reviewers

des

Commits

rS285642: ssh: canonicize the host name before looking it up in the host file

Summary

Re-apply r99054 by des in 2002. This was accidentally dropped
by the update to OpenSSH 6.5p1 (r261320).

This change is actually taken from r387082 of
ports/security/openssh-portable/files/patch-ssh.c

PR: 198043
Reviewed by: des
Approved by: kib (mentor)
Sponsored by: Dell Inc.
MFC after: 3 days

Test Plan

Before:

rm ~/.ssh/known_hosts
ssh box.example.com
<add key to known_hosts>
ssh box
<ssh asks to very host key>

After:

rm ~/.ssh/known_hosts
ssh box.example.com
<add key to known_hosts>
ssh box
<host key is already in known_hosts>

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

vangyzen updated this revision to Diff 6980.Jul 15 2015, 8:35 PM

vangyzen retitled this revision from to ssh: canonicize the host name before looking it up in the host file.

vangyzen updated this object.

vangyzen edited the test plan for this revision. (Show Details)

vangyzen added a reviewer: des.

vangyzen added a subscriber: kib.

Herald added a subscriber: imp. · View Herald TranscriptJul 15 2015, 8:35 PM

vangyzen updated this object.Jul 15 2015, 8:41 PM

des accepted this revision.Jul 16 2015, 5:20 PM

des edited edge metadata.

This revision is now accepted and ready to land.Jul 16 2015, 5:20 PM

Closed by commit rS285642: ssh: canonicize the host name before looking it up in the host file (authored by vangyzen). · Explain WhyJul 16 2015, 6:44 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Path

Size

head/

crypto/

openssh/

ssh.c

17 lines

Diff 7028

View Options

ssh: canonicize the host name before looking it up in the host fileClosedPublicActions