Import openssh_7.6p1.orig.tar.gz

1 files changed, 4 insertions, 9 deletions

diff --git a/ssh-keyscan.0 b/ssh-keyscan.0
index e9d9f0d8b..1a9751ef1 100644
--- a/ssh-keyscan.0
+++ b/ssh-keyscan.0
@@ -49,10 +49,9 @@ DESCRIPTION
 
      -t type
              Specifies the type of the key to fetch from the scanned hosts.
-             The possible values are M-bM-^@M-^\rsa1M-bM-^@M-^] for protocol version 1 and M-bM-^@M-^\dsaM-bM-^@M-^],
-             M-bM-^@M-^\ecdsaM-bM-^@M-^], M-bM-^@M-^\ed25519M-bM-^@M-^], or M-bM-^@M-^\rsaM-bM-^@M-^] for protocol version 2.  Multiple
-             values may be specified by separating them with commas.  The
-             default is to fetch M-bM-^@M-^\rsaM-bM-^@M-^], M-bM-^@M-^\ecdsaM-bM-^@M-^], and M-bM-^@M-^\ed25519M-bM-^@M-^] keys.
+             The possible values are M-bM-^@M-^\dsaM-bM-^@M-^], M-bM-^@M-^\ecdsaM-bM-^@M-^], M-bM-^@M-^\ed25519M-bM-^@M-^], or M-bM-^@M-^\rsaM-bM-^@M-^].
+             Multiple values may be specified by separating them with commas.
+             The default is to fetch M-bM-^@M-^\rsaM-bM-^@M-^], M-bM-^@M-^\ecdsaM-bM-^@M-^], and M-bM-^@M-^\ed25519M-bM-^@M-^] keys.
 
      -v      Verbose mode.  Causes ssh-keyscan to print debugging messages
              about its progress.
@@ -70,10 +69,6 @@ FILES
 
      1.2.3.4,1.2.4.4 name.my.domain,name,n.my.domain,n,1.2.3.4,1.2.4.4
 
-     Output format for RSA1 keys:
-
-     host-or-namelist bits exponent modulus
-
      Output format for RSA, DSA, ECDSA, and Ed25519 keys:
 
      host-or-namelist keytype base64-encoded-key
@@ -108,4 +103,4 @@ BUGS
      This is because it opens a connection to the ssh port, reads the public
      key, and drops the connection as soon as it gets the key.
 
-OpenBSD 6.0                    November 8, 2015                    OpenBSD 6.0
+OpenBSD 6.2                       May 2, 2017                      OpenBSD 6.2