summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh
diff options
context:
space:
mode:
authortedu <tedu@openbsd.org>2020-01-25 07:09:14 +0000
committertedu <tedu@openbsd.org>2020-01-25 07:09:14 +0000
commit77d2326a9537d88a06c07849d295fec1bd74a4e5 (patch)
tree0d52d386e11b3fdf217b6ee81755804f11d0294d /usr.bin/ssh
parentreword HashKnownHosts description a little more; some people found (diff)
downloadwireguard-openbsd-77d2326a9537d88a06c07849d295fec1bd74a4e5.tar.xz
wireguard-openbsd-77d2326a9537d88a06c07849d295fec1bd74a4e5.zip
group14-sha1 is no longer a default algorithm
Diffstat (limited to 'usr.bin/ssh')
-rw-r--r--usr.bin/ssh/ssh_config.55
-rw-r--r--usr.bin/ssh/sshd_config.54
2 files changed, 4 insertions, 5 deletions
diff --git a/usr.bin/ssh/ssh_config.5 b/usr.bin/ssh/ssh_config.5
index e33002e1ea3..07c34d442e4 100644
--- a/usr.bin/ssh/ssh_config.5
+++ b/usr.bin/ssh/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
@@ -1095,8 +1095,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/usr.bin/ssh/sshd_config.5 b/usr.bin/ssh/sshd_config.5
index afdc556045b..c338ddf2e85 100644
--- a/usr.bin/ssh/sshd_config.5
+++ b/usr.bin/ssh/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
@@ -942,7 +942,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