diff options
author | Damien Miller <djm@mindrot.org> | 2019-09-07 19:25:00 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-09-08 10:37:17 +1000 |
commit | f61f29afda6c71eda26effa54d3c2e5306fd0833 (patch) | |
tree | 065e02eead3f8085a6c69a8976a8fa11e313ac6c /regress/unittests/sshbuf | |
parent | 105e1c9218940eb53473f55a9177652d889ddbad (diff) |
make unittests pass for no-openssl case
Diffstat (limited to 'regress/unittests/sshbuf')
-rw-r--r-- | regress/unittests/sshbuf/test_sshbuf_getput_crypto.c | 3 | ||||
-rw-r--r-- | regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c | 8 | ||||
-rw-r--r-- | regress/unittests/sshbuf/tests.c | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/regress/unittests/sshbuf/test_sshbuf_getput_crypto.c b/regress/unittests/sshbuf/test_sshbuf_getput_crypto.c index 5d39e63e1..492b3bdf0 100644 --- a/regress/unittests/sshbuf/test_sshbuf_getput_crypto.c +++ b/regress/unittests/sshbuf/test_sshbuf_getput_crypto.c | |||
@@ -7,6 +7,8 @@ | |||
7 | 7 | ||
8 | #include "includes.h" | 8 | #include "includes.h" |
9 | 9 | ||
10 | #ifdef WITH_OPENSSL | ||
11 | |||
10 | #include <sys/types.h> | 12 | #include <sys/types.h> |
11 | #include <sys/param.h> | 13 | #include <sys/param.h> |
12 | #include <stdio.h> | 14 | #include <stdio.h> |
@@ -276,3 +278,4 @@ sshbuf_getput_crypto_tests(void) | |||
276 | #endif | 278 | #endif |
277 | } | 279 | } |
278 | 280 | ||
281 | #endif /* WITH_OPENSSL */ | ||
diff --git a/regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c b/regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c index ca06bfb00..1ca30be97 100644 --- a/regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c +++ b/regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c | |||
@@ -32,10 +32,12 @@ static void | |||
32 | attempt_parse_blob(u_char *blob, size_t len) | 32 | attempt_parse_blob(u_char *blob, size_t len) |
33 | { | 33 | { |
34 | struct sshbuf *p1; | 34 | struct sshbuf *p1; |
35 | #ifdef WITH_OPENSSL | ||
35 | BIGNUM *bn; | 36 | BIGNUM *bn; |
36 | #if defined(OPENSSL_HAS_ECC) && defined(OPENSSL_HAS_NISTP256) | 37 | #if defined(OPENSSL_HAS_ECC) && defined(OPENSSL_HAS_NISTP256) |
37 | EC_KEY *eck; | 38 | EC_KEY *eck; |
38 | #endif | 39 | #endif /* defined(OPENSSL_HAS_ECC) && defined(OPENSSL_HAS_NISTP256) */ |
40 | #endif /* WITH_OPENSSL */ | ||
39 | u_char *s; | 41 | u_char *s; |
40 | size_t l; | 42 | size_t l; |
41 | u_int8_t u8; | 43 | u_int8_t u8; |
@@ -54,6 +56,7 @@ attempt_parse_blob(u_char *blob, size_t len) | |||
54 | bzero(s, l); | 56 | bzero(s, l); |
55 | free(s); | 57 | free(s); |
56 | } | 58 | } |
59 | #ifdef WITH_OPENSSL | ||
57 | bn = NULL; | 60 | bn = NULL; |
58 | sshbuf_get_bignum2(p1, &bn); | 61 | sshbuf_get_bignum2(p1, &bn); |
59 | BN_clear_free(bn); | 62 | BN_clear_free(bn); |
@@ -62,7 +65,8 @@ attempt_parse_blob(u_char *blob, size_t len) | |||
62 | ASSERT_PTR_NE(eck, NULL); | 65 | ASSERT_PTR_NE(eck, NULL); |
63 | sshbuf_get_eckey(p1, eck); | 66 | sshbuf_get_eckey(p1, eck); |
64 | EC_KEY_free(eck); | 67 | EC_KEY_free(eck); |
65 | #endif | 68 | #endif /* defined(OPENSSL_HAS_ECC) && defined(OPENSSL_HAS_NISTP256) */ |
69 | #endif /* WITH_OPENSSL */ | ||
66 | sshbuf_free(p1); | 70 | sshbuf_free(p1); |
67 | } | 71 | } |
68 | 72 | ||
diff --git a/regress/unittests/sshbuf/tests.c b/regress/unittests/sshbuf/tests.c index 1557e4342..29916a10b 100644 --- a/regress/unittests/sshbuf/tests.c +++ b/regress/unittests/sshbuf/tests.c | |||
@@ -20,7 +20,9 @@ tests(void) | |||
20 | { | 20 | { |
21 | sshbuf_tests(); | 21 | sshbuf_tests(); |
22 | sshbuf_getput_basic_tests(); | 22 | sshbuf_getput_basic_tests(); |
23 | #ifdef WITH_OPENSSL | ||
23 | sshbuf_getput_crypto_tests(); | 24 | sshbuf_getput_crypto_tests(); |
25 | #endif | ||
24 | sshbuf_misc_tests(); | 26 | sshbuf_misc_tests(); |
25 | sshbuf_fuzz_tests(); | 27 | sshbuf_fuzz_tests(); |
26 | sshbuf_getput_fuzz_tests(); | 28 | sshbuf_getput_fuzz_tests(); |