diff options
author | Damien Miller <djm@mindrot.org> | 2014-05-15 14:24:09 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2014-05-15 14:24:09 +1000 |
commit | 1f0311c7c7d10c94ff7f823de9c5b2ed79368b14 (patch) | |
tree | ae708c2a25f84a04bcb04f2dbf3e8039e0f692bc /ssh-keysign.c | |
parent | c5893785564498cea73cb60d2cf199490483e080 (diff) |
- markus@cvs.openbsd.org 2014/04/29 18:01:49
[auth.c authfd.c authfile.c bufaux.c cipher.c cipher.h hostfile.c]
[kex.c key.c mac.c monitor.c monitor_wrap.c myproposal.h packet.c]
[roaming_client.c ssh-agent.c ssh-keygen.c ssh-keyscan.c ssh-keysign.c]
[ssh-pkcs11.h ssh.c sshconnect.c sshconnect2.c sshd.c]
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 'ssh-keysign.c')
-rw-r--r-- | ssh-keysign.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ssh-keysign.c b/ssh-keysign.c index ed24f66d1..d95bb7d9d 100644 --- a/ssh-keysign.c +++ b/ssh-keysign.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-keysign.c,v 1.41 2014/04/19 14:53:48 tedu Exp $ */ | 1 | /* $OpenBSD: ssh-keysign.c,v 1.42 2014/04/29 18:01:49 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2002 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2002 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -209,8 +209,11 @@ main(int argc, char **argv) | |||
209 | keys[i] = NULL; | 209 | keys[i] = NULL; |
210 | if (key_fd[i] == -1) | 210 | if (key_fd[i] == -1) |
211 | continue; | 211 | continue; |
212 | #ifdef WITH_OPENSSL | ||
213 | /* XXX wrong api */ | ||
212 | keys[i] = key_load_private_pem(key_fd[i], KEY_UNSPEC, | 214 | keys[i] = key_load_private_pem(key_fd[i], KEY_UNSPEC, |
213 | NULL, NULL); | 215 | NULL, NULL); |
216 | #endif | ||
214 | close(key_fd[i]); | 217 | close(key_fd[i]); |
215 | if (keys[i] != NULL) | 218 | if (keys[i] != NULL) |
216 | found = 1; | 219 | found = 1; |