diff options
| -rw-r--r-- | ssh_config.5 | 7 | ||||
| -rw-r--r-- | sshd_config.5 | 11 |
2 files changed, 14 insertions, 4 deletions
diff --git a/ssh_config.5 b/ssh_config.5 index 27c649fab..a128e4f0e 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.265 2018/02/10 09:03:54 djm Exp $ | 36 | .\" $OpenBSD: ssh_config.5,v 1.266 2018/02/16 02:40:45 djm Exp $ |
| 37 | .Dd $Mdocdate: February 10 2018 $ | 37 | .Dd $Mdocdate: February 16 2018 $ |
| 38 | .Dt SSH_CONFIG 5 | 38 | .Dt SSH_CONFIG 5 |
| 39 | .Os | 39 | .Os |
| 40 | .Sh NAME | 40 | .Sh NAME |
| @@ -1015,7 +1015,10 @@ The default is: | |||
| 1015 | curve25519-sha256,curve25519-sha256@libssh.org, | 1015 | curve25519-sha256,curve25519-sha256@libssh.org, |
| 1016 | ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521, | 1016 | ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521, |
| 1017 | diffie-hellman-group-exchange-sha256, | 1017 | diffie-hellman-group-exchange-sha256, |
| 1018 | diffie-hellman-group16-sha512, | ||
| 1019 | diffie-hellman-group18-sha512, | ||
| 1018 | diffie-hellman-group-exchange-sha1, | 1020 | diffie-hellman-group-exchange-sha1, |
| 1021 | diffie-hellman-group14-sha256, | ||
| 1019 | diffie-hellman-group14-sha1 | 1022 | diffie-hellman-group14-sha1 |
| 1020 | .Ed | 1023 | .Ed |
| 1021 | .Pp | 1024 | .Pp |
diff --git a/sshd_config.5 b/sshd_config.5 index fd7ab1a24..e3c7c3936 100644 --- a/sshd_config.5 +++ b/sshd_config.5 | |||
| @@ -33,7 +33,7 @@ | |||
| 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.262 2018/02/16 02:32:40 djm Exp $ | 36 | .\" $OpenBSD: sshd_config.5,v 1.263 2018/02/16 02:40:45 djm Exp $ |
| 37 | .Dd $Mdocdate: February 16 2018 $ | 37 | .Dd $Mdocdate: February 16 2018 $ |
| 38 | .Dt SSHD_CONFIG 5 | 38 | .Dt SSHD_CONFIG 5 |
| 39 | .Os | 39 | .Os |
| @@ -879,6 +879,12 @@ diffie-hellman-group1-sha1 | |||
| 879 | .It | 879 | .It |
| 880 | diffie-hellman-group14-sha1 | 880 | diffie-hellman-group14-sha1 |
| 881 | .It | 881 | .It |
| 882 | diffie-hellman-group14-sha256 | ||
| 883 | .It | ||
| 884 | diffie-hellman-group16-sha512 | ||
| 885 | .It | ||
| 886 | diffie-hellman-group18-sha512 | ||
| 887 | .It | ||
| 882 | diffie-hellman-group-exchange-sha1 | 888 | diffie-hellman-group-exchange-sha1 |
| 883 | .It | 889 | .It |
| 884 | diffie-hellman-group-exchange-sha256 | 890 | diffie-hellman-group-exchange-sha256 |
| @@ -895,7 +901,8 @@ The default is: | |||
| 895 | curve25519-sha256,curve25519-sha256@libssh.org, | 901 | curve25519-sha256,curve25519-sha256@libssh.org, |
| 896 | ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521, | 902 | ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521, |
| 897 | diffie-hellman-group-exchange-sha256, | 903 | diffie-hellman-group-exchange-sha256, |
| 898 | diffie-hellman-group14-sha1 | 904 | diffie-hellman-group16-sha512,diffie-hellman-group18-sha512, |
| 905 | diffie-hellman-group14-sha256,diffie-hellman-group14-sha1 | ||
| 899 | .Ed | 906 | .Ed |
| 900 | .Pp | 907 | .Pp |
| 901 | The list of available key exchange algorithms may also be obtained using | 908 | The list of available key exchange algorithms may also be obtained using |