diff options
| author |   markus <markus@openbsd.org> | 2013-12-06 13:39:49 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2013-12-06 13:39:49 +0000 |
| commit | 8ffbcf6d17e8775510029e60a52819f50c2b6e51 (patch) | |
| tree | a5e7d241214bd17ce28800908b837349ad6cebe4 /usr.bin/ssh/ssh-keysign.c | |
| parent | new private key format, bcrypt as KDF by default; details in PROTOCOL.key; (diff) | |
| download | wireguard-openbsd-8ffbcf6d17e8775510029e60a52819f50c2b6e51.tar.xz wireguard-openbsd-8ffbcf6d17e8775510029e60a52819f50c2b6e51.zip | |
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 'usr.bin/ssh/ssh-keysign.c')
| -rw-r--r-- | usr.bin/ssh/ssh-keysign.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/ssh/ssh-keysign.c b/usr.bin/ssh/ssh-keysign.c index e0602b26a56..4b0996f3641 100644 --- a/usr.bin/ssh/ssh-keysign.c +++ b/usr.bin/ssh/ssh-keysign.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-keysign.c,v 1.38 2013/10/14 22:22:04 djm Exp $ */ +/* $OpenBSD: ssh-keysign.c,v 1.39 2013/12/06 13:39:49 markus Exp $ */ /* * Copyright (c) 2002 Markus Friedl. All rights reserved. * @@ -145,7 +145,7 @@ main(int argc, char **argv) { Buffer b; Options options; -#define NUM_KEYTYPES 3 +#define NUM_KEYTYPES 4 Key *keys[NUM_KEYTYPES], *key = NULL; struct passwd *pw; int key_fd[NUM_KEYTYPES], i, found, version = 2, fd; @@ -164,6 +164,7 @@ main(int argc, char **argv) i = 0; key_fd[i++] = open(_PATH_HOST_DSA_KEY_FILE, O_RDONLY); key_fd[i++] = open(_PATH_HOST_ECDSA_KEY_FILE, O_RDONLY); + key_fd[i++] = open(_PATH_HOST_ED25519_KEY_FILE, O_RDONLY); key_fd[i++] = open(_PATH_HOST_RSA_KEY_FILE, O_RDONLY); original_real_uid = getuid(); /* XXX readconf.c needs this */ |