diff options
| author | Damien Miller <djm@mindrot.org> | 2014-05-15 06:24:09 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2014-05-15 06:24:09 +0200 |
| commit | 1f0311c7c7d10c94ff7f823de9c5b2ed79368b14 (patch) | |
| tree | ae708c2a25f84a04bcb04f2dbf3e8039e0f692bc /ssh-pkcs11.h | |
| parent | - djm@cvs.openbsd.org 2014/04/29 13:10:30 (diff) | |
| download | openssh-1f0311c7c7d10c94ff7f823de9c5b2ed79368b14.tar.xz openssh-1f0311c7c7d10c94ff7f823de9c5b2ed79368b14.zip | |
- 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-pkcs11.h')
| -rw-r--r-- | ssh-pkcs11.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ssh-pkcs11.h b/ssh-pkcs11.h index 59f456adf..4d2efda13 100644 --- a/ssh-pkcs11.h +++ b/ssh-pkcs11.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-pkcs11.h,v 1.2 2010/02/24 06:12:53 djm Exp $ */ +/* $OpenBSD: ssh-pkcs11.h,v 1.3 2014/04/29 18:01:49 markus Exp $ */ /* * Copyright (c) 2010 Markus Friedl. All rights reserved. * @@ -18,3 +18,7 @@ int pkcs11_init(int); void pkcs11_terminate(void); int pkcs11_add_provider(char *, char *, Key ***); int pkcs11_del_provider(char *); + +#if !defined(WITH_OPENSSL) && defined(ENABLE_PKCS11) +#undef ENABLE_PKCS11 +#endif |