diff options
-rw-r--r-- | ssh_config.5 | 12 | ||||
-rw-r--r-- | sshd_config.5 | 24 |
2 files changed, 18 insertions, 18 deletions
diff --git a/ssh_config.5 b/ssh_config.5 index 14d57d77d..14d96beaf 100644 --- a/ssh_config.5 +++ b/ssh_config.5 | |||
@@ -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_config.5,v 1.299 2019/08/16 11:16:32 kn Exp $ | 36 | .\" $OpenBSD: ssh_config.5,v 1.300 2019/09/04 20:31:15 naddy Exp $ |
37 | .Dd $Mdocdate: August 16 2019 $ | 37 | .Dd $Mdocdate: September 4 2019 $ |
38 | .Dt SSH_CONFIG 5 | 38 | .Dt SSH_CONFIG 5 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -786,11 +786,11 @@ or | |||
786 | .It Cm HostbasedKeyTypes | 786 | .It Cm HostbasedKeyTypes |
787 | Specifies the key types that will be used for hostbased authentication | 787 | Specifies the key types that will be used for hostbased authentication |
788 | as a comma-separated list of patterns. | 788 | as a comma-separated list of patterns. |
789 | Alternately if the specified value begins with a | 789 | Alternately if the specified list begins with a |
790 | .Sq + | 790 | .Sq + |
791 | character, then the specified key types will be appended to the default set | 791 | character, then the specified key types will be appended to the default set |
792 | instead of replacing them. | 792 | instead of replacing them. |
793 | If the specified value begins with a | 793 | If the specified list begins with a |
794 | .Sq - | 794 | .Sq - |
795 | character, then the specified key types (including wildcards) will be removed | 795 | character, then the specified key types (including wildcards) will be removed |
796 | from the default set instead of replacing them. | 796 | from the default set instead of replacing them. |
@@ -814,11 +814,11 @@ may be used to list supported key types. | |||
814 | .It Cm HostKeyAlgorithms | 814 | .It Cm HostKeyAlgorithms |
815 | Specifies the host key algorithms | 815 | Specifies the host key algorithms |
816 | that the client wants to use in order of preference. | 816 | that the client wants to use in order of preference. |
817 | Alternately if the specified value begins with a | 817 | Alternately if the specified list begins with a |
818 | .Sq + | 818 | .Sq + |
819 | character, then the specified key types will be appended to the default set | 819 | character, then the specified key types will be appended to the default set |
820 | instead of replacing them. | 820 | instead of replacing them. |
821 | If the specified value begins with a | 821 | If the specified list begins with a |
822 | .Sq - | 822 | .Sq - |
823 | character, then the specified key types (including wildcards) will be removed | 823 | character, then the specified key types (including wildcards) will be removed |
824 | from the default set instead of replacing them. | 824 | from the default set instead of replacing them. |
diff --git a/sshd_config.5 b/sshd_config.5 index e6ae87145..f42d10417 100644 --- a/sshd_config.5 +++ b/sshd_config.5 | |||
@@ -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: sshd_config.5,v 1.288 2019/08/09 04:24:03 dtucker Exp $ | 36 | .\" $OpenBSD: sshd_config.5,v 1.289 2019/09/04 20:31:15 naddy Exp $ |
37 | .Dd $Mdocdate: August 9 2019 $ | 37 | .Dd $Mdocdate: September 4 2019 $ |
38 | .Dt SSHD_CONFIG 5 | 38 | .Dt SSHD_CONFIG 5 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -454,11 +454,11 @@ indicating not to | |||
454 | .It Cm Ciphers | 454 | .It Cm Ciphers |
455 | Specifies the ciphers allowed. | 455 | Specifies the ciphers allowed. |
456 | Multiple ciphers must be comma-separated. | 456 | Multiple ciphers must be comma-separated. |
457 | If the specified value begins with a | 457 | If the specified list begins with a |
458 | .Sq + | 458 | .Sq + |
459 | character, then the specified ciphers will be appended to the default set | 459 | character, then the specified ciphers will be appended to the default set |
460 | instead of replacing them. | 460 | instead of replacing them. |
461 | If the specified value begins with a | 461 | If the specified list begins with a |
462 | .Sq - | 462 | .Sq - |
463 | character, then the specified ciphers (including wildcards) will be removed | 463 | character, then the specified ciphers (including wildcards) will be removed |
464 | from the default set instead of replacing them. | 464 | from the default set instead of replacing them. |
@@ -668,11 +668,11 @@ The default is | |||
668 | .It Cm HostbasedAcceptedKeyTypes | 668 | .It Cm HostbasedAcceptedKeyTypes |
669 | Specifies the key types that will be accepted for hostbased authentication | 669 | Specifies the key types that will be accepted for hostbased authentication |
670 | as a list of comma-separated patterns. | 670 | as a list of comma-separated patterns. |
671 | Alternately if the specified value begins with a | 671 | Alternately if the specified list begins with a |
672 | .Sq + | 672 | .Sq + |
673 | character, then the specified key types will be appended to the default set | 673 | character, then the specified key types will be appended to the default set |
674 | instead of replacing them. | 674 | instead of replacing them. |
675 | If the specified value begins with a | 675 | If the specified list begins with a |
676 | .Sq - | 676 | .Sq - |
677 | character, then the specified key types (including wildcards) will be removed | 677 | character, then the specified key types (including wildcards) will be removed |
678 | from the default set instead of replacing them. | 678 | from the default set instead of replacing them. |
@@ -873,11 +873,11 @@ The default is | |||
873 | .It Cm KexAlgorithms | 873 | .It Cm KexAlgorithms |
874 | Specifies the available KEX (Key Exchange) algorithms. | 874 | Specifies the available KEX (Key Exchange) algorithms. |
875 | Multiple algorithms must be comma-separated. | 875 | Multiple algorithms must be comma-separated. |
876 | Alternately if the specified value begins with a | 876 | Alternately if the specified list begins with a |
877 | .Sq + | 877 | .Sq + |
878 | character, then the specified methods will be appended to the default set | 878 | character, then the specified methods will be appended to the default set |
879 | instead of replacing them. | 879 | instead of replacing them. |
880 | If the specified value begins with a | 880 | If the specified list begins with a |
881 | .Sq - | 881 | .Sq - |
882 | character, then the specified methods (including wildcards) will be removed | 882 | character, then the specified methods (including wildcards) will be removed |
883 | from the default set instead of replacing them. | 883 | from the default set instead of replacing them. |
@@ -990,11 +990,11 @@ Logging with a DEBUG level violates the privacy of users and is not recommended. | |||
990 | Specifies the available MAC (message authentication code) algorithms. | 990 | Specifies the available MAC (message authentication code) algorithms. |
991 | The MAC algorithm is used for data integrity protection. | 991 | The MAC algorithm is used for data integrity protection. |
992 | Multiple algorithms must be comma-separated. | 992 | Multiple algorithms must be comma-separated. |
993 | If the specified value begins with a | 993 | If the specified list begins with a |
994 | .Sq + | 994 | .Sq + |
995 | character, then the specified algorithms will be appended to the default set | 995 | character, then the specified algorithms will be appended to the default set |
996 | instead of replacing them. | 996 | instead of replacing them. |
997 | If the specified value begins with a | 997 | If the specified list begins with a |
998 | .Sq - | 998 | .Sq - |
999 | character, then the specified algorithms (including wildcards) will be removed | 999 | character, then the specified algorithms (including wildcards) will be removed |
1000 | from the default set instead of replacing them. | 1000 | from the default set instead of replacing them. |
@@ -1395,11 +1395,11 @@ The default is | |||
1395 | .It Cm PubkeyAcceptedKeyTypes | 1395 | .It Cm PubkeyAcceptedKeyTypes |
1396 | Specifies the key types that will be accepted for public key authentication | 1396 | Specifies the key types that will be accepted for public key authentication |
1397 | as a list of comma-separated patterns. | 1397 | as a list of comma-separated patterns. |
1398 | Alternately if the specified value begins with a | 1398 | Alternately if the specified list begins with a |
1399 | .Sq + | 1399 | .Sq + |
1400 | character, then the specified key types will be appended to the default set | 1400 | character, then the specified key types will be appended to the default set |
1401 | instead of replacing them. | 1401 | instead of replacing them. |
1402 | If the specified value begins with a | 1402 | If the specified list begins with a |
1403 | .Sq - | 1403 | .Sq - |
1404 | character, then the specified key types (including wildcards) will be removed | 1404 | character, then the specified key types (including wildcards) will be removed |
1405 | from the default set instead of replacing them. | 1405 | from the default set instead of replacing them. |