summaryrefslogtreecommitdiff
path: root/packet.h
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2015-01-30 23:10:17 +1100
committerDamien Miller <djm@mindrot.org>2015-02-18 22:29:32 +1100
commit773dda25e828c4c9a52f7bdce6e1e5924157beab (patch)
tree831507f35a8feb0ae984a7a13f521932a0fedb61 /packet.h
parente89c780886b23600de1e1c8d74aabd1ff61f43f0 (diff)
downloadopenssh-git-773dda25e828c4c9a52f7bdce6e1e5924157beab.tar.gz
repair --without-openssl; broken in refactor
Diffstat (limited to 'packet.h')
-rw-r--r--packet.h25
1 files changed, 23 insertions, 2 deletions
diff --git a/packet.h b/packet.h
index 01df9f41..cb194567 100644
--- a/packet.h
+++ b/packet.h
@@ -22,8 +22,18 @@
# include <openssl/bn.h>
# ifdef OPENSSL_HAS_ECC
# include <openssl/ec.h>
-# endif
-#endif
+# else /* OPENSSL_HAS_ECC */
+# define EC_KEY void
+# define EC_GROUP void
+# define EC_POINT void
+# endif /* OPENSSL_HAS_ECC */
+#else /* WITH_OPENSSL */
+# define BIGNUM void
+# define EC_KEY void
+# define EC_GROUP void
+# define EC_POINT void
+#endif /* WITH_OPENSSL */
+
#include <sys/signal.h>
#include <sys/queue.h>
@@ -182,4 +192,15 @@ const u_char *sshpkt_ptr(struct ssh *, size_t *lenp);
extern struct ssh *active_state;
#include "opacket.h"
+#if !defined(WITH_OPENSSL)
+# undef BIGNUM
+# undef EC_KEY
+# undef EC_GROUP
+# undef EC_POINT
+#elif !defined(OPENSSL_HAS_ECC)
+# undef EC_KEY
+# undef EC_GROUP
+# undef EC_POINT
+#endif
+
#endif /* PACKET_H */