upstream: group14-sha1 is no longer a default algorithm

OpenBSD-Commit-ID: a96f04d5e9c2ff760c6799579dc44f69b4ff431d
This commit is contained in:
tedu@openbsd.org 2020-01-25 07:09:14 +00:00 committed by Damien Miller
parent 3432b6e05d
commit 0b813436bb
2 changed files with 4 additions and 5 deletions

View File

@ -33,7 +33,7 @@
.\" (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.316 2020/01/25 07:02:51 djm Exp $
.\" $OpenBSD: ssh_config.5,v 1.317 2020/01/25 07:09:14 tedu Exp $
.Dd $Mdocdate: January 25 2020 $
.Dt SSH_CONFIG 5
.Os
@ -1094,8 +1094,7 @@ ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,
diffie-hellman-group-exchange-sha256,
diffie-hellman-group16-sha512,
diffie-hellman-group18-sha512,
diffie-hellman-group14-sha256,
diffie-hellman-group14-sha1
diffie-hellman-group14-sha256
.Ed
.Pp
The list of available key exchange algorithms may also be obtained using

View File

@ -33,7 +33,7 @@
.\" (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.299 2020/01/25 06:03:11 djm Exp $
.\" $OpenBSD: sshd_config.5,v 1.300 2020/01/25 07:09:14 tedu Exp $
.Dd $Mdocdate: January 25 2020 $
.Dt SSHD_CONFIG 5
.Os
@ -940,7 +940,7 @@ curve25519-sha256,curve25519-sha256@libssh.org,
ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,
diffie-hellman-group-exchange-sha256,
diffie-hellman-group16-sha512,diffie-hellman-group18-sha512,
diffie-hellman-group14-sha256,diffie-hellman-group14-sha1
diffie-hellman-group14-sha256
.Ed
.Pp
The list of available key exchange algorithms may also be obtained using