diff options
Diffstat (limited to 'ssh.1')
-rw-r--r-- | ssh.1 | 20 |
1 files changed, 15 insertions, 5 deletions
@@ -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.1,v 1.396 2018/07/19 10:28:47 dtucker Exp $ | 36 | .\" $OpenBSD: ssh.1,v 1.399 2018/09/20 06:58:48 jmc Exp $ |
37 | .Dd $Mdocdate: July 19 2018 $ | 37 | .Dd $Mdocdate: September 20 2018 $ |
38 | .Dt SSH 1 | 38 | .Dt SSH 1 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -391,7 +391,10 @@ options places | |||
391 | .Nm | 391 | .Nm |
392 | into | 392 | into |
393 | .Dq master | 393 | .Dq master |
394 | mode with confirmation required before slave connections are accepted. | 394 | mode but with confirmation required using |
395 | .Xr ssh-askpass 1 | ||
396 | before each operation that changes the multiplexing state | ||
397 | (e.g. opening a new session). | ||
395 | Refer to the description of | 398 | Refer to the description of |
396 | .Cm ControlMaster | 399 | .Cm ControlMaster |
397 | in | 400 | in |
@@ -466,6 +469,7 @@ For full details of the options listed below, and their possible values, see | |||
466 | .It CanonicalizeHostname | 469 | .It CanonicalizeHostname |
467 | .It CanonicalizeMaxDots | 470 | .It CanonicalizeMaxDots |
468 | .It CanonicalizePermittedCNAMEs | 471 | .It CanonicalizePermittedCNAMEs |
472 | .It CASignatureAlgorithms | ||
469 | .It CertificateFile | 473 | .It CertificateFile |
470 | .It ChallengeResponseAuthentication | 474 | .It ChallengeResponseAuthentication |
471 | .It CheckHostIP | 475 | .It CheckHostIP |
@@ -556,6 +560,10 @@ The available features are: | |||
556 | (supported symmetric ciphers), | 560 | (supported symmetric ciphers), |
557 | .Ar cipher-auth | 561 | .Ar cipher-auth |
558 | (supported symmetric ciphers that support authenticated encryption), | 562 | (supported symmetric ciphers that support authenticated encryption), |
563 | .Ar help | ||
564 | (supported query terms for use with the | ||
565 | .Fl Q | ||
566 | flag), | ||
559 | .Ar mac | 567 | .Ar mac |
560 | (supported message integrity codes), | 568 | (supported message integrity codes), |
561 | .Ar kex | 569 | .Ar kex |
@@ -565,9 +573,11 @@ The available features are: | |||
565 | .Ar key-cert | 573 | .Ar key-cert |
566 | (certificate key types), | 574 | (certificate key types), |
567 | .Ar key-plain | 575 | .Ar key-plain |
568 | (non-certificate key types), and | 576 | (non-certificate key types), |
569 | .Ar protocol-version | 577 | .Ar protocol-version |
570 | (supported SSH protocol versions). | 578 | (supported SSH protocol versions), and |
579 | .Ar sig | ||
580 | (supported signature algorithms). | ||
571 | .Pp | 581 | .Pp |
572 | .It Fl q | 582 | .It Fl q |
573 | Quiet mode. | 583 | Quiet mode. |