diff options
Diffstat (limited to 'regress/unittests/sshbuf')
-rw-r--r-- | regress/unittests/sshbuf/test_sshbuf_getput_crypto.c | 8 | ||||
-rw-r--r-- | regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/regress/unittests/sshbuf/test_sshbuf_getput_crypto.c b/regress/unittests/sshbuf/test_sshbuf_getput_crypto.c index 0c4c71ecd..a68e1329e 100644 --- a/regress/unittests/sshbuf/test_sshbuf_getput_crypto.c +++ b/regress/unittests/sshbuf/test_sshbuf_getput_crypto.c | |||
@@ -32,8 +32,6 @@ void | |||
32 | sshbuf_getput_crypto_tests(void) | 32 | sshbuf_getput_crypto_tests(void) |
33 | { | 33 | { |
34 | struct sshbuf *p1; | 34 | struct sshbuf *p1; |
35 | const u_char *d; | ||
36 | size_t s; | ||
37 | BIGNUM *bn, *bn2; | 35 | BIGNUM *bn, *bn2; |
38 | /* This one has num_bits != num_bytes * 8 to test bignum1 encoding */ | 36 | /* This one has num_bits != num_bytes * 8 to test bignum1 encoding */ |
39 | const char *hexbn1 = "0102030405060708090a0b0c0d0e0f10"; | 37 | const char *hexbn1 = "0102030405060708090a0b0c0d0e0f10"; |
@@ -48,7 +46,9 @@ sshbuf_getput_crypto_tests(void) | |||
48 | 0x70, 0x60, 0x50, 0x40, 0x30, 0x20, 0x10, 0x00, | 46 | 0x70, 0x60, 0x50, 0x40, 0x30, 0x20, 0x10, 0x00, |
49 | 0x7f, 0xff, 0x11 | 47 | 0x7f, 0xff, 0x11 |
50 | }; | 48 | }; |
51 | #ifdef OPENSSL_HAS_NISTP256 | 49 | #if defined(OPENSSL_HAS_ECC) && defined(OPENSSL_HAS_NISTP256) |
50 | const u_char *d; | ||
51 | size_t s; | ||
52 | BIGNUM *bn_x, *bn_y; | 52 | BIGNUM *bn_x, *bn_y; |
53 | int ec256_nid = NID_X9_62_prime256v1; | 53 | int ec256_nid = NID_X9_62_prime256v1; |
54 | char *ec256_x = "0C828004839D0106AA59575216191357" | 54 | char *ec256_x = "0C828004839D0106AA59575216191357" |
@@ -352,7 +352,7 @@ sshbuf_getput_crypto_tests(void) | |||
352 | sshbuf_free(p1); | 352 | sshbuf_free(p1); |
353 | TEST_DONE(); | 353 | TEST_DONE(); |
354 | 354 | ||
355 | #ifdef OPENSSL_HAS_NISTP256 | 355 | #if defined(OPENSSL_HAS_ECC) && defined(OPENSSL_HAS_NISTP256) |
356 | TEST_START("sshbuf_put_ec"); | 356 | TEST_START("sshbuf_put_ec"); |
357 | eck = EC_KEY_new_by_curve_name(ec256_nid); | 357 | eck = EC_KEY_new_by_curve_name(ec256_nid); |
358 | ASSERT_PTR_NE(eck, NULL); | 358 | ASSERT_PTR_NE(eck, NULL); |
diff --git a/regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c b/regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c index 8c3269b13..c6b5c29d1 100644 --- a/regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c +++ b/regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c | |||
@@ -33,7 +33,7 @@ attempt_parse_blob(u_char *blob, size_t len) | |||
33 | { | 33 | { |
34 | struct sshbuf *p1; | 34 | struct sshbuf *p1; |
35 | BIGNUM *bn; | 35 | BIGNUM *bn; |
36 | #ifdef OPENSSL_HAS_NISTP256 | 36 | #if defined(OPENSSL_HAS_ECC) && defined(OPENSSL_HAS_NISTP256) |
37 | EC_KEY *eck; | 37 | EC_KEY *eck; |
38 | #endif | 38 | #endif |
39 | u_char *s; | 39 | u_char *s; |
@@ -60,7 +60,7 @@ attempt_parse_blob(u_char *blob, size_t len) | |||
60 | bn = BN_new(); | 60 | bn = BN_new(); |
61 | sshbuf_get_bignum2(p1, bn); | 61 | sshbuf_get_bignum2(p1, bn); |
62 | BN_clear_free(bn); | 62 | BN_clear_free(bn); |
63 | #ifdef OPENSSL_HAS_NISTP256 | 63 | #if defined(OPENSSL_HAS_ECC) && defined(OPENSSL_HAS_NISTP256) |
64 | eck = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1); | 64 | eck = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1); |
65 | ASSERT_PTR_NE(eck, NULL); | 65 | ASSERT_PTR_NE(eck, NULL); |
66 | sshbuf_get_eckey(p1, eck); | 66 | sshbuf_get_eckey(p1, eck); |