diff options
| author | Damien Miller <djm@mindrot.org> | 2013-12-07 01:24:01 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2013-12-07 01:24:01 +0100 |
| commit | 5be9d9e3cbd9c66f24745d25bf2e809c1d158ee0 (patch) | |
| tree | d2086d37436014ea44f0f024396a1a8638640b00 /servconf.c | |
| parent | - markus@cvs.openbsd.org 2013/12/06 13:34:54 (diff) | |
| download | openssh-5be9d9e3cbd9c66f24745d25bf2e809c1d158ee0.tar.xz openssh-5be9d9e3cbd9c66f24745d25bf2e809c1d158ee0.zip | |
- markus@cvs.openbsd.org 2013/12/06 13:39:49
[authfd.c authfile.c key.c key.h myproposal.h pathnames.h readconf.c]
[servconf.c ssh-agent.c ssh-keygen.c ssh-keyscan.1 ssh-keyscan.c]
[ssh-keysign.c ssh.c ssh_config.5 sshd.8 sshd.c verify.c ssh-ed25519.c]
[sc25519.h sc25519.c hash.c ge25519_base.data ge25519.h ge25519.c]
[fe25519.h fe25519.c ed25519.c crypto_api.h blocks.c]
support ed25519 keys (hostkeys and user identities) using the public
domain ed25519 reference code from SUPERCOP, see
http://ed25519.cr.yp.to/software.html
feedback, help & ok djm@
Diffstat (limited to 'servconf.c')
| -rw-r--r-- | servconf.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/servconf.c b/servconf.c index 6db89f7c1..9bcd05bf2 100644 --- a/servconf.c +++ b/servconf.c @@ -1,5 +1,5 @@ -/* $OpenBSD: servconf.c,v 1.247 2013/12/05 01:16:41 djm Exp $ */ +/* $OpenBSD: servconf.c,v 1.248 2013/12/06 13:39:49 markus Exp $ */ /* * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * All rights reserved @@ -180,6 +180,8 @@ fill_default_server_options(ServerOptions *options) options->host_key_files[options->num_host_key_files++] = _PATH_HOST_ECDSA_KEY_FILE; #endif + options->host_key_files[options->num_host_key_files++] = + _PATH_HOST_ED25519_KEY_FILE; } } /* No certificates by default */ |