diff options
| author | Darren Tucker <dtucker@dtucker.net> | 2019-10-28 15:57:22 +1100 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2019-10-28 16:27:53 +1100 |
| commit | 850ec1773d656cbff44d78a79e369dc262ce5853 (patch) | |
| tree | a86962aeef13881e79345f184e24c0d90b0aba97 | |
| parent | 6fc7e1c6fec3ba589869ae98e968c0e5e2e4695b (diff) | |
Wrap OpenSSL bits in WITH_OPENSSL.
| -rw-r--r-- | myproposal.h | 2 | ||||
| -rw-r--r-- | sshbuf-getput-crypto.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/myproposal.h b/myproposal.h index 34bd10c9f..45db30e5b 100644 --- a/myproposal.h +++ b/myproposal.h | |||
| @@ -24,7 +24,9 @@ | |||
| 24 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 24 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #ifdef WITH_OPENSSL | ||
| 27 | #include <openssl/opensslv.h> | 28 | #include <openssl/opensslv.h> |
| 29 | #endif | ||
| 28 | 30 | ||
| 29 | /* conditional algorithm support */ | 31 | /* conditional algorithm support */ |
| 30 | 32 | ||
diff --git a/sshbuf-getput-crypto.c b/sshbuf-getput-crypto.c index 3dd1e1446..ecbfa550f 100644 --- a/sshbuf-getput-crypto.c +++ b/sshbuf-getput-crypto.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <stdio.h> | 23 | #include <stdio.h> |
| 24 | #include <string.h> | 24 | #include <string.h> |
| 25 | 25 | ||
| 26 | #ifdef WITH_OPENSSL | ||
| 26 | #include <openssl/bn.h> | 27 | #include <openssl/bn.h> |
| 27 | #ifdef OPENSSL_HAS_ECC | 28 | #ifdef OPENSSL_HAS_ECC |
| 28 | # include <openssl/ec.h> | 29 | # include <openssl/ec.h> |
| @@ -182,4 +183,4 @@ sshbuf_put_eckey(struct sshbuf *buf, const EC_KEY *v) | |||
| 182 | EC_KEY_get0_group(v)); | 183 | EC_KEY_get0_group(v)); |
| 183 | } | 184 | } |
| 184 | #endif /* OPENSSL_HAS_ECC */ | 185 | #endif /* OPENSSL_HAS_ECC */ |
| 185 | 186 | #endif /* WITH_OPENSSL */ | |