diff options
Diffstat (limited to 'crypto/openssh/ssh.1')
| -rw-r--r-- | crypto/openssh/ssh.1 | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/crypto/openssh/ssh.1 b/crypto/openssh/ssh.1 index 35cf00e20d2c..bffaadbbae12 100644 --- a/crypto/openssh/ssh.1 +++ b/crypto/openssh/ssh.1 @@ -33,9 +33,9 @@ .\" (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.1,v 1.396 2018/07/19 10:28:47 dtucker Exp $ +.\" $OpenBSD: ssh.1,v 1.399 2018/09/20 06:58:48 jmc Exp $ .\" $FreeBSD$ -.Dd $Mdocdate: July 19 2018 $ +.Dd $Mdocdate: September 20 2018 $ .Dt SSH 1 .Os .Sh NAME @@ -392,7 +392,10 @@ options places .Nm into .Dq master -mode with confirmation required before slave connections are accepted. +mode but with confirmation required using +.Xr ssh-askpass 1 +before each operation that changes the multiplexing state +(e.g. opening a new session). Refer to the description of .Cm ControlMaster in @@ -467,6 +470,7 @@ For full details of the options listed below, and their possible values, see .It CanonicalizeHostname .It CanonicalizeMaxDots .It CanonicalizePermittedCNAMEs +.It CASignatureAlgorithms .It CertificateFile .It ChallengeResponseAuthentication .It CheckHostIP @@ -558,6 +562,10 @@ The available features are: (supported symmetric ciphers), .Ar cipher-auth (supported symmetric ciphers that support authenticated encryption), +.Ar help +(supported query terms for use with the +.Fl Q +flag), .Ar mac (supported message integrity codes), .Ar kex @@ -567,9 +575,11 @@ The available features are: .Ar key-cert (certificate key types), .Ar key-plain -(non-certificate key types), and +(non-certificate key types), .Ar protocol-version -(supported SSH protocol versions). +(supported SSH protocol versions), and +.Ar sig +(supported signature algorithms). .Pp .It Fl q Quiet mode. |