diff options
Diffstat (limited to 'testcode')
| -rw-r--r-- | testcode/fake_event.c | 9 | ||||
| -rw-r--r-- | testcode/petal.c | 2 | ||||
| -rw-r--r-- | testcode/unitmain.c | 27 | ||||
| -rw-r--r-- | testcode/unitverify.c | 2 |
4 files changed, 30 insertions, 10 deletions
diff --git a/testcode/fake_event.c b/testcode/fake_event.c index e1bec24d1a38..1578b7ddca2f 100644 --- a/testcode/fake_event.c +++ b/testcode/fake_event.c @@ -1039,9 +1039,9 @@ struct serviced_query* outnet_serviced_query(struct outside_network* outnet, uint8_t* qname, size_t qnamelen, uint16_t qtype, uint16_t qclass, uint16_t flags, int dnssec, int ATTR_UNUSED(want_dnssec), int ATTR_UNUSED(nocaps), int ATTR_UNUSED(tcp_upstream), - int ATTR_UNUSED(ssl_upstream), struct sockaddr_storage* addr, - socklen_t addrlen, uint8_t* zone, size_t zonelen, - comm_point_callback_t* callback, void* callback_arg, + int ATTR_UNUSED(ssl_upstream), struct edns_option* opt_list, + struct sockaddr_storage* addr, socklen_t addrlen, uint8_t* zone, + size_t zonelen, comm_point_callback_t* callback, void* callback_arg, sldns_buffer* ATTR_UNUSED(buff)) { struct replay_runtime* runtime = (struct replay_runtime*)outnet->base; @@ -1077,6 +1077,7 @@ struct serviced_query* outnet_serviced_query(struct outside_network* outnet, edns.edns_version = EDNS_ADVERTISED_VERSION; edns.udp_size = EDNS_ADVERTISED_SIZE; edns.bits = 0; + edns.opt_list = opt_list; if(dnssec) edns.bits = EDNS_DO; attach_edns_record(pend->buffer, &edns); @@ -1387,7 +1388,7 @@ void comm_base_set_slow_accept_handlers(struct comm_base* ATTR_UNUSED(b), (void)start_acc; } -struct event_base* comm_base_internal(struct comm_base* ATTR_UNUSED(b)) +struct ub_event_base* comm_base_internal(struct comm_base* ATTR_UNUSED(b)) { /* no pipe comm possible in testbound */ return NULL; diff --git a/testcode/petal.c b/testcode/petal.c index a54181c372f1..24d94a556969 100644 --- a/testcode/petal.c +++ b/testcode/petal.c @@ -642,8 +642,6 @@ int main(int argc, char* argv[]) do_service(addr, port, key, cert); CRYPTO_cleanup_all_ex_data(); - ERR_remove_state(0); ERR_free_strings(); - RAND_cleanup(); return 0; } diff --git a/testcode/unitmain.c b/testcode/unitmain.c index 0b32dcd86903..e8bb898b0d74 100644 --- a/testcode/unitmain.c +++ b/testcode/unitmain.c @@ -380,6 +380,28 @@ config_memsize_test(void) unit_assert( cfg_parse_memsize("0 Gb", &v) && v==0*1024*1024); } +/** test config_file: test tag code */ +static void +config_tag_test(void) +{ + unit_show_func("util/config_file.c", "taglist_intersect"); + unit_assert( taglist_intersect( + (uint8_t*)"\000\000\000", 3, (uint8_t*)"\001\000\001", 3 + ) == 0); + unit_assert( taglist_intersect( + (uint8_t*)"\000\000\001", 3, (uint8_t*)"\001\000\001", 3 + ) == 1); + unit_assert( taglist_intersect( + (uint8_t*)"\001\000\000", 3, (uint8_t*)"\001\000\001", 3 + ) == 1); + unit_assert( taglist_intersect( + (uint8_t*)"\001", 1, (uint8_t*)"\001\000\001", 3 + ) == 1); + unit_assert( taglist_intersect( + (uint8_t*)"\001\000\001", 3, (uint8_t*)"\001", 1 + ) == 1); +} + #include "util/rtt.h" /** test RTT code */ static void @@ -564,9 +586,6 @@ main(int argc, char* argv[]) printf("Start of %s unit test.\n", PACKAGE_STRING); #ifdef HAVE_SSL ERR_load_crypto_strings(); -# ifdef HAVE_OPENSSL_CONFIG - OPENSSL_config("unbound"); -# endif # ifdef USE_GOST (void)sldns_key_EVP_load_gost_id(); # endif @@ -580,6 +599,7 @@ main(int argc, char* argv[]) verify_test(); net_test(); config_memsize_test(); + config_tag_test(); dname_test(); rtt_test(); anchors_test(); @@ -602,7 +622,6 @@ main(int argc, char* argv[]) CONF_modules_free(); # endif CRYPTO_cleanup_all_ex_data(); - ERR_remove_state(0); ERR_free_strings(); RAND_cleanup(); #elif defined(HAVE_NSS) diff --git a/testcode/unitverify.c b/testcode/unitverify.c index 9cb0eb99e7cc..f6445e2815c4 100644 --- a/testcode/unitverify.c +++ b/testcode/unitverify.c @@ -497,12 +497,14 @@ verify_test(void) { unit_show_feature("signature verify"); verifytest_file("testdata/test_signatures.1", "20070818005004"); +#ifdef USE_DSA verifytest_file("testdata/test_signatures.2", "20080414005004"); verifytest_file("testdata/test_signatures.3", "20080416005004"); verifytest_file("testdata/test_signatures.4", "20080416005004"); verifytest_file("testdata/test_signatures.5", "20080416005004"); verifytest_file("testdata/test_signatures.6", "20080416005004"); verifytest_file("testdata/test_signatures.7", "20070829144150"); +#endif /* USE_DSA */ verifytest_file("testdata/test_signatures.8", "20070829144150"); #if (defined(HAVE_EVP_SHA256) || defined(HAVE_NSS) || defined(HAVE_NETTLE)) && defined(USE_SHA2) verifytest_file("testdata/test_sigs.rsasha256", "20070829144150"); |