upstream commit

document FingerprintHash here too

1 files changed, 13 insertions, 4 deletions

diff --git a/ssh_config.5 b/ssh_config.5
index f0a4b293a..33da983ea 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.196 2014/12/04 02:24:32 djm Exp $
-.Dd $Mdocdate: December 4 2014 $
+.\" $OpenBSD: ssh_config.5,v 1.197 2014/12/21 23:12:42 djm Exp $
+.Dd $Mdocdate: December 21 2014 $
 .Dt SSH_CONFIG 5
 .Os
 .Sh NAME
@@ -638,6 +638,15 @@ or
 .Dq no .
 The default is
 .Dq no .
+.It Cm FingerprintHash
+Specifies the hash algorithm used when displaying key fingerprints.
+Valid options are:
+.Dq md5
+and
+.Dq sha256 .
+.Dq md5 ,
+The default is
+.Dq sha256 .
 .It Cm ForwardAgent
 Specifies whether the connection to the authentication agent (if any)
 will be forwarded to the remote machine.
@@ -1519,12 +1528,12 @@ See also VERIFYING HOST KEYS in
 If this flag is set to
 .Dq yes ,
 an ASCII art representation of the remote host key fingerprint is
-printed in addition to the hex fingerprint string at login and
+printed in addition to the fingerprint string at login and
 for unknown host keys.
 If this flag is set to
 .Dq no ,
 no fingerprint strings are printed at login and
-only the hex fingerprint string will be printed for unknown host keys.
+only the fingerprint string will be printed for unknown host keys.
 The default is
 .Dq no .
 .It Cm XAuthLocation