Fix and call tsig_badsig unit test

(cherry picked from commit 8da2310511c26c1d0264c028aed12bda48376c44)

diff --git a/tests/dns/tsig_test.c b/tests/dns/tsig_test.c
index 60ef3e24b46184212da6830958c1275437a04027..5057e18ad317a539dc896da7953330f1342dc585 100644 (file)
--- a/tests/dns/tsig_test.c
+++ b/tests/dns/tsig_test.c
@@ -438,7 +438,16 @@ tsig_tcp(isc_stdtime_t now, isc_result_t expected_result, bool mangle_sig) {
                assert_int_equal(msg->verified_sig, 1);
                assert_int_equal(msg->tsigstatus, dns_tsigerror_badtime);
                break;
+       case DNS_R_TSIGVERIFYFAILURE:
+               assert_int_equal(result, DNS_R_TSIGVERIFYFAILURE);
+               assert_int_equal(msg->verified_sig, 0);
+               assert_int_equal(msg->tsigstatus, dns_tsigerror_badsig);
+               break;
        default:
+               if (debug) {
+                       fprintf(stderr, "# result = %s\n",
+                               isc_result_totext(result));
+               }
                UNREACHABLE();
        }
 
@@ -490,7 +499,7 @@ ISC_RUN_TEST_IMPL(tsig_badtime) {
 }
 
 ISC_RUN_TEST_IMPL(tsig_badsig) {
-       tsig_tcp(isc_stdtime_now(), DNS_R_TSIGERRORSET, true);
+       tsig_tcp(isc_stdtime_now(), DNS_R_TSIGVERIFYFAILURE, true);
 }
 
 /* Tests the dns__tsig_algvalid function */
@@ -509,9 +518,10 @@ ISC_RUN_TEST_IMPL(algvalid) {
 }
 
 ISC_TEST_LIST_START
-ISC_TEST_ENTRY_CUSTOM(tsig_tcp, setup_test, teardown_test)
-ISC_TEST_ENTRY_CUSTOM(tsig_badtime, setup_test, teardown_test)
 ISC_TEST_ENTRY(algvalid)
+ISC_TEST_ENTRY_CUSTOM(tsig_badsig, setup_test, teardown_test)
+ISC_TEST_ENTRY_CUSTOM(tsig_badtime, setup_test, teardown_test)
+ISC_TEST_ENTRY_CUSTOM(tsig_tcp, setup_test, teardown_test)
 ISC_TEST_LIST_END
 
 ISC_TEST_MAIN