tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- markus@cvs.openbsd.org 2013/11/02 22:39:19 

[ssh_config.5 sshd_config.5]
     the default kex is now curve25519-sha256@libssh.org
This commit is contained in:
Damien Miller 2013-11-04 08:55:43 +11:00
parent 4c3ba0767f
commit 0bd8f1519d
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -17,6 +17,9 @@
- markus@cvs.openbsd.org 2013/11/02 22:34:01 - markus@cvs.openbsd.org 2013/11/02 22:34:01
[auth-options.c] [auth-options.c]
no need to include monitor_wrap.h and ssh-gss.h no need to include monitor_wrap.h and ssh-gss.h
- markus@cvs.openbsd.org 2013/11/02 22:39:19
[ssh_config.5 sshd_config.5]
the default kex is now curve25519-sha256@libssh.org
20131103 20131103
- (dtucker) [openbsd-compat/bsd-misc.c] Include time.h for nanosleep. - (dtucker) [openbsd-compat/bsd-misc.c] Include time.h for nanosleep.

5
ssh_config.5
View File

@ -33,8 +33,8 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" 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 $ .\" $OpenBSD: ssh_config.5,v 1.179 2013/11/02 22:39:19 markus Exp $
.Dd $Mdocdate: October 24 2013 $ .Dd $Mdocdate: November 2 2013 $
.Dt SSH_CONFIG 5 .Dt SSH_CONFIG 5
.Os .Os
.Sh NAME .Sh NAME
@ -873,6 +873,7 @@ Specifies the available KEX (Key Exchange) algorithms.
Multiple algorithms must be comma-separated. Multiple algorithms must be comma-separated.
The default is: The default is:
.Bd -literal -offset indent .Bd -literal -offset indent
curve25519-sha256@libssh.org,
ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521, ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,
diffie-hellman-group-exchange-sha256, diffie-hellman-group-exchange-sha256,
diffie-hellman-group-exchange-sha1, diffie-hellman-group-exchange-sha1,

5
sshd_config.5
View File

@ -33,8 +33,8 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" 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 $ .\" $OpenBSD: sshd_config.5,v 1.166 2013/11/02 22:39:19 markus Exp $
.Dd $Mdocdate: October 29 2013 $ .Dd $Mdocdate: November 2 2013 $
.Dt SSHD_CONFIG 5 .Dt SSHD_CONFIG 5
.Os .Os
.Sh NAME .Sh NAME
@ -651,6 +651,7 @@ The default is
Specifies the available KEX (Key Exchange) algorithms. Specifies the available KEX (Key Exchange) algorithms.
Multiple algorithms must be comma-separated. Multiple algorithms must be comma-separated.
The default is The default is
.Dq curve25519-sha256@libssh.org ,
.Dq ecdh-sha2-nistp256 , .Dq ecdh-sha2-nistp256 ,
.Dq ecdh-sha2-nistp384 , .Dq ecdh-sha2-nistp384 ,
.Dq ecdh-sha2-nistp521 , .Dq ecdh-sha2-nistp521 ,