diff options
| author | Damien Miller <djm@mindrot.org> | 2013-12-18 07:46:27 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2013-12-18 07:46:27 +0100 |
| commit | 8ba0ead6985ea14999265136b14ffd5aeec516f9 (patch) | |
| tree | 1fdf16c075d97bbcbe5548ce8ec2082d04d3925c /sshd_config.5 | |
| parent | - djm@cvs.openbsd.org 2013/12/07 08:08:26 (diff) | |
| download | openssh-8ba0ead6985ea14999265136b14ffd5aeec516f9.tar.xz openssh-8ba0ead6985ea14999265136b14ffd5aeec516f9.zip | |
- naddy@cvs.openbsd.org 2013/12/07 11:58:46
[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]
add missing mentions of ed25519; ok djm@
Diffstat (limited to '')
| -rw-r--r-- | sshd_config.5 | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sshd_config.5 b/sshd_config.5 index 0418c86ed..0ae1740bb 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.168 2013/11/21 08:05:09 jmc Exp $ -.Dd $Mdocdate: November 21 2013 $ +.\" $OpenBSD: sshd_config.5,v 1.169 2013/12/07 11:58:46 naddy Exp $ +.Dd $Mdocdate: December 7 2013 $ .Dt SSHD_CONFIG 5 .Os .Sh NAME @@ -540,7 +540,8 @@ The default is .Pa /etc/ssh/ssh_host_key for protocol version 1, and .Pa /etc/ssh/ssh_host_dsa_key , -.Pa /etc/ssh/ssh_host_ecdsa_key +.Pa /etc/ssh/ssh_host_ecdsa_key , +.Pa /etc/ssh/ssh_host_ed25519_key and .Pa /etc/ssh/ssh_host_rsa_key for protocol version 2. @@ -551,7 +552,8 @@ It is possible to have multiple host key files. .Dq rsa1 keys are used for version 1 and .Dq dsa , -.Dq ecdsa +.Dq ecdsa , +.Dq ed25519 or .Dq rsa are used for version 2 of the SSH protocol. |