diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2021-09-03 05:25:50 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2021-09-03 17:33:08 +1000 |
| commit | eb4362e5e3aa7ac26138b11e44d8c191910aff64 (patch) | |
| tree | 8a7b1349c29dad4c293000715f46b05275a9be3b | |
| parent | b3318946ce5725da43c4bf7eeea1b73129c47d2a (diff) | |
upstream: Refer to KEX "algorithms" instead of "methods" to match
other references and improve consistency. Patch from scop via github PR#241,
ok djm@
OpenBSD-Commit-ID: 840bc94ff6861b28d8603c8e8c16499bfb65e32c
| -rw-r--r-- | ssh_config.5 | 10 | ||||
| -rw-r--r-- | sshd_config.5 | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/ssh_config.5 b/ssh_config.5 index cd0eea86..9e0db96b 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.362 2021/08/12 23:59:25 djm Exp $ -.Dd $Mdocdate: August 12 2021 $ +.\" $OpenBSD: ssh_config.5,v 1.363 2021/09/03 05:25:50 dtucker Exp $ +.Dd $Mdocdate: September 3 2021 $ .Dt SSH_CONFIG 5 .Os .Sh NAME @@ -1150,15 +1150,15 @@ Specifies the available KEX (Key Exchange) algorithms. Multiple algorithms must be comma-separated. If the specified list begins with a .Sq + -character, then the specified methods will be appended to the default set +character, then the specified algorithms will be appended to the default set instead of replacing them. If the specified list begins with a .Sq - -character, then the specified methods (including wildcards) will be removed +character, then the specified algorithms (including wildcards) will be removed from the default set instead of replacing them. If the specified list begins with a .Sq ^ -character, then the specified methods will be placed at the head of the +character, then the specified algorithms will be placed at the head of the default set. The default is: .Bd -literal -offset indent diff --git a/sshd_config.5 b/sshd_config.5 index 69d55206..a8d0545c 100644 --- a/sshd_config.5 +++ b/sshd_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: sshd_config.5,v 1.334 2021/08/12 23:59:25 djm Exp $ -.Dd $Mdocdate: August 12 2021 $ +.\" $OpenBSD: sshd_config.5,v 1.335 2021/09/03 05:25:50 dtucker Exp $ +.Dd $Mdocdate: September 3 2021 $ .Dt SSHD_CONFIG 5 .Os .Sh NAME @@ -920,15 +920,15 @@ Specifies the available KEX (Key Exchange) algorithms. Multiple algorithms must be comma-separated. Alternately if the specified list begins with a .Sq + -character, then the specified methods will be appended to the default set +character, then the specified algorithms will be appended to the default set instead of replacing them. If the specified list begins with a .Sq - -character, then the specified methods (including wildcards) will be removed +character, then the specified algorithms (including wildcards) will be removed from the default set instead of replacing them. If the specified list begins with a .Sq ^ -character, then the specified methods will be placed at the head of the +character, then the specified algorithms will be placed at the head of the default set. The supported algorithms are: .Pp |