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

- dtucker@cvs.openbsd.org 2013/12/08 09:53:27 

[sshd_config.5]
     Use a literal for the default value of KEXAlgorithms.  ok deraadt jmc
This commit is contained in:
Damien Miller 2013-12-18 17:47:02 +11:00
parent 8ba0ead698
commit 6575c3acf3
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -7,6 +7,9 @@
[ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh-keysign.8 ssh.1] [ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh-keysign.8 ssh.1]
[ssh_config.5 sshd.8 sshd_config.5] [ssh_config.5 sshd.8 sshd_config.5]
add missing mentions of ed25519; ok djm@ add missing mentions of ed25519; ok djm@
- dtucker@cvs.openbsd.org 2013/12/08 09:53:27
[sshd_config.5]
Use a literal for the default value of KEXAlgorithms. ok deraadt jmc
20131208 20131208
- (djm) [openbsd-compat/bsd-setres_id.c] Missing header; from Corinna - (djm) [openbsd-compat/bsd-setres_id.c] Missing header; from Corinna

20
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.169 2013/12/07 11:58:46 naddy Exp $ .\" $OpenBSD: sshd_config.5,v 1.170 2013/12/08 09:53:27 dtucker Exp $
.Dd $Mdocdate: December 7 2013 $ .Dd $Mdocdate: December 8 2013 $
.Dt SSHD_CONFIG 5 .Dt SSHD_CONFIG 5
.Os .Os
.Sh NAME .Sh NAME
@ -662,14 +662,14 @@ 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 , .Bd -literal -offset indent
.Dq ecdh-sha2-nistp256 , curve25519-sha256@libssh.org,
.Dq ecdh-sha2-nistp384 , ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,
.Dq ecdh-sha2-nistp521 , diffie-hellman-group-exchange-sha256,
.Dq diffie-hellman-group-exchange-sha256 , diffie-hellman-group-exchange-sha1,
.Dq diffie-hellman-group-exchange-sha1 , diffie-hellman-group14-sha1,
.Dq diffie-hellman-group14-sha1 , diffie-hellman-group1-sha1
.Dq diffie-hellman-group1-sha1 . .Ed
.It Cm KeyRegenerationInterval .It Cm KeyRegenerationInterval
In protocol version 1, the ephemeral server key is automatically regenerated In protocol version 1, the ephemeral server key is automatically regenerated
after this many seconds (if it has been used). after this many seconds (if it has been used).