upstream: group14-sha1 is no longer a default algorithm

OpenBSD-Commit-ID: a96f04d5e9c2ff760c6799579dc44f69b4ff431d

diff --git a/ssh_config.5 b/ssh_config.5
index d6779860ea229980c5123211f92ec073f1bd50b5..8c6660a98f34d9fc26725c5bb3ef34bc3f4511e5 100644 (file)
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -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

diff --git a/sshd_config.5 b/sshd_config.5
index 53d943760929d23cc5865b5fe4cff3f9ecf1e81a..63a7dfddefe9f1eccbfedf85598878933f9426bd 100644 (file)
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -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