diff options
| author | Damien Miller <djm@mindrot.org> | 2014-08-27 04:04:40 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2014-08-27 04:04:40 +1000 |
| commit | 1b215c098b3b37e38aa4e4c91bb908eee41183b1 (patch) | |
| tree | de9b86538832aafd8678e633e2984c0098efca20 /regress/unittests/sshkey | |
| parent | ad013944af0a19e3f612089d0099bb397cf6502d (diff) | |
- (djm) [regress/unittests/sshbuf/test_sshbuf_getput_crypto.c]
[regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c]
[regress/unittests/sshkey/common.c]
[regress/unittests/sshkey/test_file.c]
[regress/unittests/sshkey/test_fuzz.c]
[regress/unittests/sshkey/test_sshkey.c] Don't include openssl/ec.h
on !ECC OpenSSL systems
Diffstat (limited to 'regress/unittests/sshkey')
| -rw-r--r-- | regress/unittests/sshkey/common.c | 4 | ||||
| -rw-r--r-- | regress/unittests/sshkey/test_file.c | 4 | ||||
| -rw-r--r-- | regress/unittests/sshkey/test_fuzz.c | 4 | ||||
| -rw-r--r-- | regress/unittests/sshkey/test_sshkey.c | 4 |
4 files changed, 12 insertions, 4 deletions
diff --git a/regress/unittests/sshkey/common.c b/regress/unittests/sshkey/common.c index bed9a62b3..0a4b3a90c 100644 --- a/regress/unittests/sshkey/common.c +++ b/regress/unittests/sshkey/common.c | |||
| @@ -20,10 +20,12 @@ | |||
| 20 | #include <unistd.h> | 20 | #include <unistd.h> |
| 21 | 21 | ||
| 22 | #include <openssl/bn.h> | 22 | #include <openssl/bn.h> |
| 23 | #include <openssl/ec.h> | ||
| 24 | #include <openssl/rsa.h> | 23 | #include <openssl/rsa.h> |
| 25 | #include <openssl/dsa.h> | 24 | #include <openssl/dsa.h> |
| 26 | #include <openssl/objects.h> | 25 | #include <openssl/objects.h> |
| 26 | #ifdef OPENSSL_HAS_NISTP256 | ||
| 27 | # include <openssl/ec.h> | ||
| 28 | #endif | ||
| 27 | 29 | ||
| 28 | #include "../test_helper/test_helper.h" | 30 | #include "../test_helper/test_helper.h" |
| 29 | 31 | ||
diff --git a/regress/unittests/sshkey/test_file.c b/regress/unittests/sshkey/test_file.c index d113e2da8..764f7fb76 100644 --- a/regress/unittests/sshkey/test_file.c +++ b/regress/unittests/sshkey/test_file.c | |||
| @@ -20,10 +20,12 @@ | |||
| 20 | #include <unistd.h> | 20 | #include <unistd.h> |
| 21 | 21 | ||
| 22 | #include <openssl/bn.h> | 22 | #include <openssl/bn.h> |
| 23 | #include <openssl/ec.h> | ||
| 24 | #include <openssl/rsa.h> | 23 | #include <openssl/rsa.h> |
| 25 | #include <openssl/dsa.h> | 24 | #include <openssl/dsa.h> |
| 26 | #include <openssl/objects.h> | 25 | #include <openssl/objects.h> |
| 26 | #ifdef OPENSSL_HAS_NISTP256 | ||
| 27 | # include <openssl/ec.h> | ||
| 28 | #endif | ||
| 27 | 29 | ||
| 28 | #include "../test_helper/test_helper.h" | 30 | #include "../test_helper/test_helper.h" |
| 29 | 31 | ||
diff --git a/regress/unittests/sshkey/test_fuzz.c b/regress/unittests/sshkey/test_fuzz.c index f9da086a4..a3f61a6df 100644 --- a/regress/unittests/sshkey/test_fuzz.c +++ b/regress/unittests/sshkey/test_fuzz.c | |||
| @@ -20,10 +20,12 @@ | |||
| 20 | #include <unistd.h> | 20 | #include <unistd.h> |
| 21 | 21 | ||
| 22 | #include <openssl/bn.h> | 22 | #include <openssl/bn.h> |
| 23 | #include <openssl/ec.h> | ||
| 24 | #include <openssl/rsa.h> | 23 | #include <openssl/rsa.h> |
| 25 | #include <openssl/dsa.h> | 24 | #include <openssl/dsa.h> |
| 26 | #include <openssl/objects.h> | 25 | #include <openssl/objects.h> |
| 26 | #ifdef OPENSSL_HAS_NISTP256 | ||
| 27 | # include <openssl/ec.h> | ||
| 28 | #endif | ||
| 27 | 29 | ||
| 28 | #include "../test_helper/test_helper.h" | 30 | #include "../test_helper/test_helper.h" |
| 29 | 31 | ||
diff --git a/regress/unittests/sshkey/test_sshkey.c b/regress/unittests/sshkey/test_sshkey.c index 292303063..ef0c67956 100644 --- a/regress/unittests/sshkey/test_sshkey.c +++ b/regress/unittests/sshkey/test_sshkey.c | |||
| @@ -17,9 +17,11 @@ | |||
| 17 | #include <string.h> | 17 | #include <string.h> |
| 18 | 18 | ||
| 19 | #include <openssl/bn.h> | 19 | #include <openssl/bn.h> |
| 20 | #include <openssl/ec.h> | ||
| 21 | #include <openssl/rsa.h> | 20 | #include <openssl/rsa.h> |
| 22 | #include <openssl/dsa.h> | 21 | #include <openssl/dsa.h> |
| 22 | #ifdef OPENSSL_HAS_NISTP256 | ||
| 23 | # include <openssl/ec.h> | ||
| 24 | #endif | ||
| 23 | 25 | ||
| 24 | #include "../test_helper/test_helper.h" | 26 | #include "../test_helper/test_helper.h" |
| 25 | 27 | ||