summaryrefslogtreecommitdiff
path: root/sshkey.h
diff options
context:
space:
mode:
Diffstat (limited to 'sshkey.h')
-rw-r--r--sshkey.h38
1 files changed, 24 insertions, 14 deletions
diff --git a/sshkey.h b/sshkey.h
index 4127db244..450b30c1f 100644
--- a/sshkey.h
+++ b/sshkey.h
@@ -31,13 +31,19 @@
31#ifdef WITH_OPENSSL 31#ifdef WITH_OPENSSL
32#include <openssl/rsa.h> 32#include <openssl/rsa.h>
33#include <openssl/dsa.h> 33#include <openssl/dsa.h>
34#include <openssl/ec.h> 34# ifdef OPENSSL_HAS_ECC
35#else /* OPENSSL */ 35# include <openssl/ec.h>
36#define RSA void 36# else /* OPENSSL_HAS_ECC */
37#define DSA void 37# define EC_KEY void
38#define EC_KEY void 38# define EC_GROUP void
39#define EC_GROUP void 39# define EC_POINT void
40#define EC_POINT void 40# endif /* OPENSSL_HAS_ECC */
41#else /* WITH_OPENSSL */
42# define RSA void
43# define DSA void
44# define EC_KEY void
45# define EC_GROUP void
46# define EC_POINT void
41#endif /* WITH_OPENSSL */ 47#endif /* WITH_OPENSSL */
42 48
43#define SSH_RSA_MINIMUM_MODULUS_SIZE 768 49#define SSH_RSA_MINIMUM_MODULUS_SIZE 768
@@ -211,12 +217,16 @@ int ssh_ed25519_verify(const struct sshkey *key,
211 const u_char *data, size_t datalen, u_int compat); 217 const u_char *data, size_t datalen, u_int compat);
212#endif 218#endif
213 219
214#ifndef WITH_OPENSSL 220#if !defined(WITH_OPENSSL)
215#undef RSA 221# undef RSA
216#undef DSA 222# undef DSA
217#undef EC_KEY 223# undef EC_KEY
218#undef EC_GROUP 224# undef EC_GROUP
219#undef EC_POINT 225# undef EC_POINT
220#endif /* WITH_OPENSSL */ 226#elif !defined(OPENSSL_HAS_ECC)
227# undef EC_KEY
228# undef EC_GROUP
229# undef EC_POINT
230#endif
221 231
222#endif /* SSHKEY_H */ 232#endif /* SSHKEY_H */