summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2014-02-27 17:29:02 +0000
committerdes <des@FreeBSD.org>2014-02-27 17:29:02 +0000
commit255d8413daf4c3747aeb37e6a71bf2771beed29d (patch)
tree28087af50eaf299f287c7fe4b7050c317771c89e /etc
parentea1005cca47f4d3aace134a0acd6809943e46acc (diff)
downloadFreeBSD-src-255d8413daf4c3747aeb37e6a71bf2771beed29d.zip
FreeBSD-src-255d8413daf4c3747aeb37e6a71bf2771beed29d.tar.gz
MFH (r261320): upgrade openssh to 6.5p1
MFH (r261340): enable sandboxing by default
Diffstat (limited to 'etc')
-rwxr-xr-xetc/rc.d/sshd4
1 files changed, 3 insertions, 1 deletions
diff --git a/etc/rc.d/sshd b/etc/rc.d/sshd
index 5ad1b10..9f74716 100755
--- a/etc/rc.d/sshd
+++ b/etc/rc.d/sshd
@@ -24,6 +24,7 @@ extra_commands="configtest keygen reload"
: ${sshd_rsa_enable:="yes"}
: ${sshd_dsa_enable:="yes"}
: ${sshd_ecdsa_enable:="yes"}
+: ${sshd_ed25519_enable:="yes"}
sshd_keygen_alg()
{
@@ -39,7 +40,7 @@ sshd_keygen_alg()
rsa1)
keyfile="/etc/ssh/ssh_host_key"
;;
- rsa|dsa|ecdsa)
+ rsa|dsa|ecdsa|ed25519)
keyfile="/etc/ssh/ssh_host_${alg}_key"
;;
*)
@@ -67,6 +68,7 @@ sshd_keygen()
sshd_keygen_alg rsa
sshd_keygen_alg dsa
sshd_keygen_alg ecdsa
+ sshd_keygen_alg ed25519
}
sshd_configtest()
OpenPOWER on IntegriCloud