diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2015-07-09 09:49:47 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2015-07-09 09:49:47 +0000 |
| commit | 9323816bbc60c67b901f912f35eda67cc970f45d (patch) | |
| tree | a041e4a9d4df0cb9b6640d72652f9823a01fc026 /usr.bin/ssh/authfile.c | |
| parent | 39031b997d778620ff82da919ce3ba3bdeb22b5c (diff) | |
re-enable ed25519-certs if compiled w/o openssl; ok djm
Diffstat (limited to 'usr.bin/ssh/authfile.c')
| -rw-r--r-- | usr.bin/ssh/authfile.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/ssh/authfile.c b/usr.bin/ssh/authfile.c index dc90551cb30..4ab7edc1262 100644 --- a/usr.bin/ssh/authfile.c +++ b/usr.bin/ssh/authfile.c @@ -1,4 +1,4 @@ -/* $OpenBSD: authfile.c,v 1.115 2015/07/03 03:43:18 djm Exp $ */ +/* $OpenBSD: authfile.c,v 1.116 2015/07/09 09:49:46 markus Exp $ */ /* * Copyright (c) 2000, 2013 Markus Friedl. All rights reserved. * @@ -37,13 +37,13 @@ #include <limits.h> #include "cipher.h" -#include "key.h" #include "ssh.h" #include "log.h" #include "authfile.h" #include "rsa.h" #include "misc.h" #include "atomicio.h" +#include "sshkey.h" #include "sshbuf.h" #include "ssherr.h" #include "krl.h" @@ -443,8 +443,8 @@ sshkey_load_private_cert(int type, const char *filename, const char *passphrase, case KEY_RSA: case KEY_DSA: case KEY_ECDSA: - case KEY_ED25519: #endif /* WITH_OPENSSL */ + case KEY_ED25519: case KEY_UNSPEC: break; default: |