summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ssh_config.55
-rw-r--r--sshd_config.55
2 files changed, 6 insertions, 4 deletions
diff --git a/ssh_config.5 b/ssh_config.5
index 3ef49461..8809568a 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.178 2013/10/24 00:51:48 dtucker Exp $
-.Dd $Mdocdate: October 24 2013 $
+.\" $OpenBSD: ssh_config.5,v 1.179 2013/11/02 22:39:19 markus Exp $
+.Dd $Mdocdate: November 2 2013 $
.Dt SSH_CONFIG 5
.Os
.Sh NAME
@@ -873,6 +873,7 @@ Specifies the available KEX (Key Exchange) algorithms.
Multiple algorithms must be comma-separated.
The default is:
.Bd -literal -offset indent
+curve25519-sha256@libssh.org,
ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,
diffie-hellman-group-exchange-sha256,
diffie-hellman-group-exchange-sha1,
diff --git a/sshd_config.5 b/sshd_config.5
index bcfcc9c3..02c45a7d 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.165 2013/10/29 18:49:32 jmc Exp $
-.Dd $Mdocdate: October 29 2013 $
+.\" $OpenBSD: sshd_config.5,v 1.166 2013/11/02 22:39:19 markus Exp $
+.Dd $Mdocdate: November 2 2013 $
.Dt SSHD_CONFIG 5
.Os
.Sh NAME
@@ -651,6 +651,7 @@ The default is
Specifies the available KEX (Key Exchange) algorithms.
Multiple algorithms must be comma-separated.
The default is
+.Dq curve25519-sha256@libssh.org ,
.Dq ecdh-sha2-nistp256 ,
.Dq ecdh-sha2-nistp384 ,
.Dq ecdh-sha2-nistp521 ,