summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/ssh-pkcs11.h
diff options
context:
space:
mode:
authorMarkus Friedl <markus@cvs.openbsd.org>2014-04-29 18:01:50 +0000
committerMarkus Friedl <markus@cvs.openbsd.org>2014-04-29 18:01:50 +0000
commit37790797bff794cb8568109494b4219ce0efe114 (patch)
treefd18910fac16eb18b0335b454f721e19ab10476f /usr.bin/ssh/ssh-pkcs11.h
parent5f95fb61bf8bbcc318d67e4081c9fb35a7df925e (diff)
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-pkcs11.h')
-rw-r--r--usr.bin/ssh/ssh-pkcs11.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/usr.bin/ssh/ssh-pkcs11.h b/usr.bin/ssh/ssh-pkcs11.h
index 59f456adf09..4d2efda13f1 100644
--- a/usr.bin/ssh/ssh-pkcs11.h
+++ b/usr.bin/ssh/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