diff options
| author | Damien Miller <djm@mindrot.org> | 2015-01-30 13:10:17 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2015-02-18 12:29:32 +0100 |
| commit | 773dda25e828c4c9a52f7bdce6e1e5924157beab (patch) | |
| tree | 831507f35a8feb0ae984a7a13f521932a0fedb61 /packet.h | |
| parent | hook up hostkeys unittest to portable Makefiles (diff) | |
| download | openssh-773dda25e828c4c9a52f7bdce6e1e5924157beab.tar.xz openssh-773dda25e828c4c9a52f7bdce6e1e5924157beab.zip | |
repair --without-openssl; broken in refactor
Diffstat (limited to 'packet.h')
| -rw-r--r-- | packet.h | 25 |
1 files changed, 23 insertions, 2 deletions
@@ -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 */ |