diff options
| author |   markus <markus@openbsd.org> | 2014-04-29 18:01:49 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2014-04-29 18:01:49 +0000 |
| commit | 1249177580e91cb4476836a604cfbb1fd56d87ec (patch) | |
| tree | 2c4439e34f8788b6b9ae0b0faf20fd17685253be /usr.bin/ssh/ssh-keysign.c | |
| parent | a bit more merge for traceroute6 stuff, and some consistency fixes; (diff) | |
| download | wireguard-openbsd-1249177580e91cb4476836a604cfbb1fd56d87ec.tar.xz wireguard-openbsd-1249177580e91cb4476836a604cfbb1fd56d87ec.zip | |
make compiling against OpenSSL optional (make OPENSSL=no);
reduces algorithms to curve25519, aes-ctr, chacha, ed25519;
allows us to explore further options; with and ok djm
Diffstat (limited to 'usr.bin/ssh/ssh-keysign.c')
| -rw-r--r-- | usr.bin/ssh/ssh-keysign.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.bin/ssh/ssh-keysign.c b/usr.bin/ssh/ssh-keysign.c index 96de058f85e..1da6eb7adce 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.41 2014/04/19 14:53:48 tedu Exp $ */ +/* $OpenBSD: ssh-keysign.c,v 1.42 2014/04/29 18:01:49 markus Exp $ */ /* * Copyright (c) 2002 Markus Friedl. All rights reserved. * @@ -198,8 +198,11 @@ main(int argc, char **argv) keys[i] = NULL; if (key_fd[i] == -1) continue; +#ifdef WITH_OPENSSL +/* XXX wrong api */ keys[i] = key_load_private_pem(key_fd[i], KEY_UNSPEC, NULL, NULL); +#endif close(key_fd[i]); if (keys[i] != NULL) found = 1; |