From: TCY16 Date: Wed, 13 Oct 2021 13:28:10 +0000 (+0200) Subject: change unittests to match just the ede code X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abd948f3d7eb5481f69a7c3cd8df0b04dd58de0d;p=thirdparty%2Funbound.git change unittests to match just the ede code --- diff --git a/testdata/autotrust_init_failsig.rpl b/testdata/autotrust_init_failsig.rpl index 81787fdf4..56d8dd1af 100644 --- a/testdata/autotrust_init_failsig.rpl +++ b/testdata/autotrust_init_failsig.rpl @@ -136,21 +136,13 @@ SECTION QUESTION www.example.com. IN A ENTRY_END -HEX_EDNSDATA_BEGIN -000F 0106 -HEX_EDNSDATA_END - STEP 20 CHECK_ANSWER ENTRY_BEGIN -MATCH all +MATCH all_noedns ede=6 REPLY QR RD RA DO SERVFAIL SECTION QUESTION www.example.com. IN A SECTION ANSWER -SECTION ADDITIONAL -HEX_EDNSDATA_BEGIN -000F 0106 000676616C69646174696F6E206661696C757265203C7777772E6578616D706C652E636F6D2E204120494E3E3A206B657920666F722076616C69646174696F6E206578616D706C652E636F6D2E206973206D61726B656420617320696E76616C69642062656361757365206F6620612070726576696F75732076616C69646174696F6E206661696C757265203C6578616D706C652E636F6D2E20444E534B455920494E3E3A207369676E61747572652063727970746F206661696C65642066726F6D20312E322E332E3420666F7220747275737420616E63686F72206578616D706C652E636F6D2E207768696C65206275696C64696E6720636861696E206F66207472757374 -HEX_EDNSDATA_END ENTRY_END ; The autotrust anchor was probed due to the query. diff --git a/testdata/autotrust_probefail.rpl b/testdata/autotrust_probefail.rpl index 064d57387..189bb98ac 100644 --- a/testdata/autotrust_probefail.rpl +++ b/testdata/autotrust_probefail.rpl @@ -155,15 +155,11 @@ ENTRY_END STEP 30 CHECK_ANSWER ENTRY_BEGIN -MATCH all +MATCH all_noedns ede=6 REPLY QR RD RA DO SERVFAIL SECTION QUESTION www.example.com. IN A SECTION ANSWER -SECTION ADDITIONAL -HEX_EDNSDATA_BEGIN -000F 0079 000676616C69646174696F6E206661696C757265203C7777772E6578616D706C652E636F6D2E204120494E3E3A206E6F20444E534B455920727273657420666F7220747275737420616E63686F72206578616D706C652E636F6D2E207768696C65206275696C64696E6720636861696E206F66207472757374 -HEX_EDNSDATA_END ENTRY_END SCENARIO_END diff --git a/testdata/autotrust_probefailsig.rpl b/testdata/autotrust_probefailsig.rpl index d1bba5d60..344af5c1f 100644 --- a/testdata/autotrust_probefailsig.rpl +++ b/testdata/autotrust_probefailsig.rpl @@ -155,15 +155,11 @@ ENTRY_END STEP 30 CHECK_ANSWER ENTRY_BEGIN -MATCH all +MATCH all_noedns ede=6 REPLY QR RD RA DO SERVFAIL SECTION QUESTION www.example.com. IN A SECTION ANSWER -SECTION ADDITIONAL -HEX_EDNSDATA_BEGIN -000F 0100 000676616C69646174696F6E206661696C757265203C7777772E6578616D706C652E636F6D2E204120494E3E3A206B657920666F722076616C69646174696F6E206578616D706C652E636F6D2E206973206D61726B656420617320696E76616C69642062656361757365206F6620612070726576696F75732076616C69646174696F6E206661696C757265203C6578616D706C652E636F6D2E20444E534B455920494E3E3A207369676E6174757265206D697373696E672066726F6D20312E322E332E3420666F7220747275737420616E63686F72206578616D706C652E636F6D2E207768696C65206275696C64696E6720636861696E206F66207472757374 -HEX_EDNSDATA_END ENTRY_END SCENARIO_END diff --git a/testdata/black_ds_entry.rpl b/testdata/black_ds_entry.rpl index 35912cdf6..4a4133cd9 100644 --- a/testdata/black_ds_entry.rpl +++ b/testdata/black_ds_entry.rpl @@ -578,15 +578,11 @@ ENTRY_END ; recursion happens here. STEP 10 CHECK_ANSWER ENTRY_BEGIN -MATCH all +MATCH all_noedns ede=6 REPLY QR RD RA DO SERVFAIL SECTION QUESTION www.sub.example.com. IN A SECTION ANSWER -SECTION ADDITIONAL -HEX_EDNSDATA_BEGIN -000F 0086 000676616C69646174696F6E206661696C757265203C7777772E7375622E6578616D706C652E636F6D2E204120494E3E3A207369676E617475726520657870697265642066726F6D20312E322E332E3420666F72204453207375622E6578616D706C652E636F6D2E207768696C65206275696C64696E6720636861696E206F66207472757374 -HEX_EDNSDATA_END ENTRY_END ; no more outgoing traffic possible. @@ -599,15 +595,11 @@ ENTRY_END STEP 120 CHECK_ANSWER ENTRY_BEGIN -MATCH all +MATCH all_noedns ede=6 REPLY QR RD RA DO SERVFAIL SECTION QUESTION ftp.sub.example.com. IN A SECTION ANSWER -SECTION ADDITIONAL -HEX_EDNSDATA_BEGIN -000F 0105 000676616C69646174696F6E206661696C757265203C6674702E7375622E6578616D706C652E636F6D2E204120494E3E3A206B657920666F722076616C69646174696F6E207375622E6578616D706C652E636F6D2E206973206D61726B656420617320696E76616C69642062656361757365206F6620612070726576696F75732076616C69646174696F6E206661696C757265203C7777772E7375622E6578616D706C652E636F6D2E204120494E3E3A207369676E617475726520657870697265642066726F6D20312E322E332E3420666F72204453207375622E6578616D706C652E636F6D2E207768696C65206275696C64696E6720636861696E206F66207472757374 -HEX_EDNSDATA_END ENTRY_END ; wait for timeout seconds. diff --git a/testdata/black_key_entry.rpl b/testdata/black_key_entry.rpl index ca49dbf74..7be6a2c5b 100644 --- a/testdata/black_key_entry.rpl +++ b/testdata/black_key_entry.rpl @@ -560,15 +560,11 @@ ENTRY_END ; recursion happens here. STEP 10 CHECK_ANSWER ENTRY_BEGIN -MATCH all +MATCH all_noedns ede=6 REPLY QR RD RA DO SERVFAIL SECTION QUESTION www.sub.example.com. IN A SECTION ANSWER -SECTION ADDITIONAL -HEX_EDNSDATA_BEGIN -000F 0087 000676616C69646174696F6E206661696C757265203C7777772E7375622E6578616D706C652E636F6D2E204120494E3E3A207369676E617475726520657870697265642066726F6D20312E322E342E3620666F72206B6579207375622E6578616D706C652E636F6D2E207768696C65206275696C64696E6720636861696E206F66207472757374 -HEX_EDNSDATA_END ENTRY_END ; no more outgoing traffic possible. @@ -581,15 +577,11 @@ ENTRY_END STEP 120 CHECK_ANSWER ENTRY_BEGIN -MATCH all +MATCH all_noedns ede=6 REPLY QR RD RA DO SERVFAIL SECTION QUESTION ftp.sub.example.com. IN A SECTION ANSWER -SECTION ADDITIONAL -HEX_EDNSDATA_BEGIN -000F 0106 000676616C69646174696F6E206661696C757265203C6674702E7375622E6578616D706C652E636F6D2E204120494E3E3A206B657920666F722076616C69646174696F6E207375622E6578616D706C652E636F6D2E206973206D61726B656420617320696E76616C69642062656361757365206F6620612070726576696F75732076616C69646174696F6E206661696C757265203C7777772E7375622E6578616D706C652E636F6D2E204120494E3E3A207369676E617475726520657870697265642066726F6D20312E322E342E3620666F72206B6579207375622E6578616D706C652E636F6D2E207768696C65206275696C64696E6720636861696E206F66207472757374 -HEX_EDNSDATA_END ENTRY_END ; wait for timeout seconds. diff --git a/testdata/black_prime_entry.rpl b/testdata/black_prime_entry.rpl index 74ec0d4c5..ee7ed1db3 100644 --- a/testdata/black_prime_entry.rpl +++ b/testdata/black_prime_entry.rpl @@ -285,14 +285,10 @@ ENTRY_END ; recursion happens here. STEP 10 CHECK_ANSWER ENTRY_BEGIN -MATCH all +MATCH all_noedns ede=6 REPLY QR RD RA DO SERVFAIL SECTION QUESTION www.example.com. IN A -SECTION ADDITIONAL -HEX_EDNSDATA_BEGIN -000F 0088 000676616C69646174696F6E206661696C757265203C7777772E6578616D706C652E636F6D2E204120494E3E3A207369676E617475726520657870697265642066726F6D20312E322E332E3420666F7220747275737420616E63686F72206578616D706C652E636F6D2E207768696C65206275696C64696E6720636861696E206F66207472757374 -HEX_EDNSDATA_END ENTRY_END STEP 100 TIME_PASSES ELAPSE 10 @@ -308,14 +304,10 @@ ENTRY_END ; recursion happens here. STEP 120 CHECK_ANSWER ENTRY_BEGIN -MATCH all +MATCH all_noedns ede=6 REPLY QR RD RA DO SERVFAIL SECTION QUESTION ftp.example.com. IN A -SECTION ADDITIONAL -HEX_EDNSDATA_BEGIN -000F 00FF 000676616C69646174696F6E206661696C757265203C6674702E6578616D706C652E636F6D2E204120494E3E3A206B657920666F722076616C69646174696F6E206578616D706C652E636F6D2E206973206D61726B656420617320696E76616C69642062656361757365206F6620612070726576696F75732076616C69646174696F6E206661696C757265203C7777772E6578616D706C652E636F6D2E204120494E3E3A207369676E617475726520657870697265642066726F6D20312E322E332E3420666F7220747275737420616E63686F72206578616D706C652E636F6D2E207768696C65206275696C64696E6720636861696E206F66207472757374 -HEX_EDNSDATA_END ENTRY_END diff --git a/testdata/edns_keepalive.rpl b/testdata/edns_keepalive.rpl index 1dbf828c6..4a18f549c 100644 --- a/testdata/edns_keepalive.rpl +++ b/testdata/edns_keepalive.rpl @@ -47,14 +47,10 @@ STEP 1 QUERY STEP 10 CHECK_ANSWER ENTRY_BEGIN - MATCH TCP ednsdata + MATCH TCP ede=0 REPLY RD FORMERR SECTION QUESTION www.example.com. IN A - SECTION ADDITIONAL - HEX_EDNSDATA_BEGIN - 000F 001F 000071756572792077697468206261642065646E73206B656570616C697665 - HEX_EDNSDATA_END ENTRY_END STEP 20 QUERY diff --git a/testdata/root_key_sentinel.rpl b/testdata/root_key_sentinel.rpl index 21be39c19..59728b298 100644 --- a/testdata/root_key_sentinel.rpl +++ b/testdata/root_key_sentinel.rpl @@ -138,14 +138,10 @@ ENTRY_END ; recursion happens here. STEP 22 CHECK_ANSWER ENTRY_BEGIN -MATCH all +MATCH all_noedns ede=6 REPLY QR RD RA DO SERVFAIL SECTION QUESTION root-key-sentinel-not-ta-19036. IN A -SECTION ADDITIONAL -HEX_EDNSDATA_BEGIN -000F 0049 000676616C69646174696F6E206661696C757265203C726F6F742D6B65792D73656E74696E656C2D6E6F742D74612D31393033362E204120494E3E3A206D697363206661696C757265 -HEX_EDNSDATA_END ENTRY_END STEP 30 QUERY @@ -158,14 +154,10 @@ ENTRY_END ; recursion happens here. STEP 33 CHECK_ANSWER ENTRY_BEGIN -MATCH all +MATCH all_noedns ede=6 REPLY QR RD RA DO SERVFAIL SECTION QUESTION root-key-sentinel-is-ta-20326. IN A -SECTION ADDITIONAL -HEX_EDNSDATA_BEGIN -000F 0048 000676616C69646174696F6E206661696C757265203C726F6F742D6B65792D73656E74696E656C2D69732D74612D32303332362E204120494E3E3A206D697363206661696C757265 -HEX_EDNSDATA_END ENTRY_END STEP 40 QUERY diff --git a/testdata/val_cnametocloser_nosig.rpl b/testdata/val_cnametocloser_nosig.rpl index 36cbd90e3..2f39c8ed9 100644 --- a/testdata/val_cnametocloser_nosig.rpl +++ b/testdata/val_cnametocloser_nosig.rpl @@ -88,15 +88,11 @@ ENTRY_END ; recursion happens here. STEP 10 CHECK_ANSWER ENTRY_BEGIN -MATCH all +MATCH all_noedns ede=6 REPLY QR RD RA DO SERVFAIL SECTION QUESTION www.example.com. IN AAAA SECTION ANSWER -SECTION ADDITIONAL -HEX_EDNSDATA_BEGIN -000F 008D 000676616C69646174696F6E206661696C757265203C7777772E6578616D706C652E636F6D2E204141414120494E3E3A206E6F207369676E6174757265732066726F6D203139322E302E322E3120666F7220747275737420616E63686F7220612E622E6578616D706C652E636F6D2E207768696C65206275696C64696E6720636861696E206F66207472757374 -HEX_EDNSDATA_END ENTRY_END SCENARIO_END diff --git a/testdata/val_cnametonodata_nonsec.rpl b/testdata/val_cnametonodata_nonsec.rpl index 58bd97b2f..21fed0403 100644 --- a/testdata/val_cnametonodata_nonsec.rpl +++ b/testdata/val_cnametonodata_nonsec.rpl @@ -254,15 +254,11 @@ ENTRY_END ; recursion happens here. STEP 10 CHECK_ANSWER ENTRY_BEGIN -MATCH all +MATCH all_noedns ede=10 REPLY QR RD RA DO SERVFAIL SECTION QUESTION www.example.com. IN A SECTION ANSWER -SECTION ADDITIONAL -HEX_EDNSDATA_BEGIN -000F 0054 000A76616C69646174696F6E206661696C757265203C7777772E6578616D706C652E636F6D2E204120494E3E3A206E6F207369676E6174757265732066726F6D20312E322E332E3520616E6420312E322E332E34 -HEX_EDNSDATA_END ENTRY_END SCENARIO_END diff --git a/testdata/val_cnametoposnowc.rpl b/testdata/val_cnametoposnowc.rpl index 5fee9e6d8..d920d32ec 100644 --- a/testdata/val_cnametoposnowc.rpl +++ b/testdata/val_cnametoposnowc.rpl @@ -253,16 +253,11 @@ ENTRY_END ; recursion happens here. STEP 10 CHECK_ANSWER ENTRY_BEGIN -MATCH all +MATCH all_noedns ede=6 REPLY QR RD RA DO SERVFAIL SECTION QUESTION www.example.com. IN A SECTION ANSWER -SECTION AUTHORITY -SECTION ADDITIONAL -HEX_EDNSDATA_BEGIN -000F 005C 000676616C69646174696F6E206661696C757265203C7777772E6578616D706C652E636F6D2E204120494E3E3A2077696C64636172642070726F6F66206661696C65642066726F6D20312E322E332E3520616E6420312E322E332E34 -HEX_EDNSDATA_END ENTRY_END SCENARIO_END diff --git a/testdata/val_deleg_nons.rpl b/testdata/val_deleg_nons.rpl index 69670b277..2241b5edc 100644 --- a/testdata/val_deleg_nons.rpl +++ b/testdata/val_deleg_nons.rpl @@ -261,15 +261,11 @@ ENTRY_END ; recursion happens here. STEP 10 CHECK_ANSWER ENTRY_BEGIN -MATCH all +MATCH all_noedns ede=10 REPLY QR RD RA DO SERVFAIL SECTION QUESTION foo.www.example.com. IN A SECTION ANSWER -SECTION ADDITIONAL -HEX_EDNSDATA_BEGIN -000F 004C 000A76616C69646174696F6E206661696C757265203C666F6F2E7777772E6578616D706C652E636F6D2E204120494E3E3A206E6F207369676E6174757265732066726F6D20312E322E332E34 -HEX_EDNSDATA_END ENTRY_END SCENARIO_END diff --git a/testdata/val_dnamewc.rpl b/testdata/val_dnamewc.rpl index 45170b4c4..02f9df992 100644 --- a/testdata/val_dnamewc.rpl +++ b/testdata/val_dnamewc.rpl @@ -256,16 +256,11 @@ ENTRY_END ; recursion happens here. STEP 10 CHECK_ANSWER ENTRY_BEGIN -MATCH all +MATCH all_noedns ede=6 REPLY QR RD RA DO SERVFAIL SECTION QUESTION www.sub.example.com. IN A SECTION ANSWER -SECTION AUTHORITY -SECTION ADDITIONAL -HEX_EDNSDATA_BEGIN -000F 005D 000676616C69646174696F6E206661696C757265203C7777772E7375622E6578616D706C652E636F6D2E204120494E3E3A20636E616D652070726F6F66206661696C65642066726F6D20312E322E332E3520616E6420312E322E332E34 -HEX_EDNSDATA_END ENTRY_END SCENARIO_END diff --git a/testdata/val_ds_cname.rpl b/testdata/val_ds_cname.rpl index ba8d853a0..099d0529f 100644 --- a/testdata/val_ds_cname.rpl +++ b/testdata/val_ds_cname.rpl @@ -195,15 +195,10 @@ ENTRY_END ; recursion happens here. STEP 10 CHECK_ANSWER ENTRY_BEGIN -MATCH all +MATCH all_noedns ede=10 REPLY QR RD RA DO SERVFAIL SECTION QUESTION www.example.com. IN A -SECTION ANSWER -SECTION ADDITIONAL -HEX_EDNSDATA_BEGIN -000F 0048 000A76616C69646174696F6E206661696C757265203C7777772E6578616D706C652E636F6D2E204120494E3E3A206E6F207369676E6174757265732066726F6D20312E322E332E34 -HEX_EDNSDATA_END ENTRY_END SCENARIO_END diff --git a/testdata/val_faildnskey.rpl b/testdata/val_faildnskey.rpl index 19feb0067..b645d152f 100644 --- a/testdata/val_faildnskey.rpl +++ b/testdata/val_faildnskey.rpl @@ -160,15 +160,12 @@ ENTRY_END ; recursion happens here. STEP 10 CHECK_ANSWER ENTRY_BEGIN -MATCH all +MATCH all_noedns ede=6 REPLY QR RD RA DO SERVFAIL SECTION QUESTION www.example.com. IN A SECTION ANSWER SECTION ADDITIONAL -HEX_EDNSDATA_BEGIN -000F 0079 000676616C69646174696F6E206661696C757265203C7777772E6578616D706C652E636F6D2E204120494E3E3A206E6F20444E534B455920727273657420666F7220747275737420616E63686F72206578616D706C652E636F6D2E207768696C65206275696C64696E6720636861696E206F66207472757374 -HEX_EDNSDATA_END ENTRY_END SCENARIO_END diff --git a/testdata/val_nodata_failsig.rpl b/testdata/val_nodata_failsig.rpl index f561643e7..7594b4461 100644 --- a/testdata/val_nodata_failsig.rpl +++ b/testdata/val_nodata_failsig.rpl @@ -154,16 +154,11 @@ ENTRY_END ; recursion happens here. STEP 10 CHECK_ANSWER ENTRY_BEGIN -MATCH all +MATCH all_noedns ede=6 REPLY QR RD RA DO SERVFAIL SECTION QUESTION www.example.com. IN A SECTION ANSWER -SECTION AUTHORITY -SECTION ADDITIONAL -HEX_EDNSDATA_BEGIN -000F 0080 000676616C69646174696F6E206661696C757265203C7777772E6578616D706C652E636F6D2E204120494E3E3A207369676E617475726520746F6F2073686F72742C206E6F207369676E617475726520646174612066726F6D20312E322E332E3420666F72203C7777772E6578616D706C652E636F6D2E204E53454320494E3E -HEX_EDNSDATA_END ENTRY_END SCENARIO_END diff --git a/testdata/val_nodata_failwc.rpl b/testdata/val_nodata_failwc.rpl index 28d1193ec..e8763da2e 100644 --- a/testdata/val_nodata_failwc.rpl +++ b/testdata/val_nodata_failwc.rpl @@ -60,16 +60,11 @@ ENTRY_END ; recursion happens here. STEP 10 CHECK_ANSWER ENTRY_BEGIN -MATCH all +MATCH all_noedns ede=6 REPLY QR RD RA DO SERVFAIL SECTION QUESTION _25._tcp.mail.nsecwc.nlnetlabs.nl. IN TLSA SECTION ANSWER -SECTION AUTHORITY -SECTION ADDITIONAL -HEX_EDNSDATA_BEGIN -000F 0069 000676616C69646174696F6E206661696C757265203C5F32352E5F7463702E6D61696C2E6E73656377632E6E6C6E65746C6162732E6E6C2E20544C534120494E3E3A206E6F646174612070726F6F66206661696C65642066726F6D203138352E34392E3134302E3630 -HEX_EDNSDATA_END ENTRY_END SCENARIO_END diff --git a/testdata/val_nokeyprime.rpl b/testdata/val_nokeyprime.rpl index 35d29fb02..30ae02347 100644 --- a/testdata/val_nokeyprime.rpl +++ b/testdata/val_nokeyprime.rpl @@ -153,15 +153,11 @@ ENTRY_END STEP 10 CHECK_ANSWER ENTRY_BEGIN -MATCH all +MATCH all_noedns ede=6 REPLY QR RD RA DO SERVFAIL SECTION QUESTION www.example.com. IN A SECTION ANSWER -SECTION ADDITIONAL -HEX_EDNSDATA_BEGIN -000F 0086 000676616C69646174696F6E206661696C757265203C7777772E6578616D706C652E636F6D2E204120494E3E3A206E6F20444E534B45592072727365742066726F6D20312E322E332E3420666F7220747275737420616E63686F72206578616D706C652E636F6D2E207768696C65206275696C64696E6720636861696E206F66207472757374 -HEX_EDNSDATA_END ENTRY_END SCENARIO_END diff --git a/testdata/val_nsec3_b1_nameerror_nowc.rpl b/testdata/val_nsec3_b1_nameerror_nowc.rpl index 7d5307bec..2d0297c0b 100644 --- a/testdata/val_nsec3_b1_nameerror_nowc.rpl +++ b/testdata/val_nsec3_b1_nameerror_nowc.rpl @@ -133,7 +133,7 @@ ENTRY_END ; recursion happens here. STEP 10 CHECK_ANSWER ENTRY_BEGIN -MATCH all +MATCH all_noedns ede=6 REPLY QR RD RA DO SERVFAIL SECTION QUESTION a.c.x.w.example. IN A @@ -145,10 +145,6 @@ SECTION AUTHORITY ; 0p9mhaveqvm6t7vbl5lop2u3t2rp3tom.example. RRSIG NSEC3 7 2 3600 20150420235959 20051021000000 ( 40430 example. OSgWSm26B+cS+dDL8b5QrWr/dEWhtCsKlwKL IBHYH6blRxK9rC0bMJPwQ4mLIuw85H2EY762 BOCXJZMnpuwhpA== ) ; b4um86eghhds6nea196smvmlo4ors995.example. NSEC3 1 1 12 aabbccdd ( gjeqe526plbf1g8mklp59enfd789njgi MX RRSIG ) ; b4um86eghhds6nea196smvmlo4ors995.example. RRSIG NSEC3 7 2 3600 20150420235959 20051021000000 ( 40430 example. ZkPG3M32lmoHM6pa3D6gZFGB/rhL//Bs3Omh 5u4m/CUiwtblEVOaAKKZd7S959OeiX43aLX3 pOv0TSTyiTxIZg== ) -SECTION ADDITIONAL -HEX_EDNSDATA_BEGIN -000F 0053 000676616C69646174696F6E206661696C757265203C612E632E782E772E6578616D706C652E204120494E3E3A206E616D656572726F722070726F6F66206661696C65642066726F6D203139322E302E322E31 -HEX_EDNSDATA_END ENTRY_END SCENARIO_END diff --git a/testdata/val_nsec3_b2_nodata_nons.rpl b/testdata/val_nsec3_b2_nodata_nons.rpl index 179ba27d9..442f5e043 100644 --- a/testdata/val_nsec3_b2_nodata_nons.rpl +++ b/testdata/val_nsec3_b2_nodata_nons.rpl @@ -127,16 +127,11 @@ ENTRY_END ; recursion happens here. STEP 10 CHECK_ANSWER ENTRY_BEGIN -MATCH all +MATCH all_noedns ede=6 REPLY QR RD RA DO SERVFAIL SECTION QUESTION ns1.example. IN MX SECTION ANSWER -SECTION AUTHORITY -SECTION ADDITIONAL -HEX_EDNSDATA_BEGIN -000F 007D 000676616C69646174696F6E206661696C757265203C6E73312E6578616D706C652E204D5820494E3E3A206E6F20444E53534543207265636F7264732066726F6D203139322E302E322E3120666F72204453206E73312E6578616D706C652E207768696C65206275696C64696E6720636861696E206F66207472757374 -HEX_EDNSDATA_END ENTRY_END SCENARIO_END diff --git a/testdata/val_nsec3_entnodata_optout_badopt.rpl b/testdata/val_nsec3_entnodata_optout_badopt.rpl index ddf1c87b2..91007837a 100644 --- a/testdata/val_nsec3_entnodata_optout_badopt.rpl +++ b/testdata/val_nsec3_entnodata_optout_badopt.rpl @@ -186,16 +186,11 @@ ENTRY_END ; recursion happens here. STEP 10 CHECK_ANSWER ENTRY_BEGIN -MATCH all +MATCH all_noedns ede=6 REPLY QR RD RA DO SERVFAIL SECTION QUESTION ent.example.com. IN A SECTION ANSWER -SECTION AUTHORITY -SECTION ADDITIONAL -HEX_EDNSDATA_BEGIN -000F 004E 000676616C69646174696F6E206661696C757265203C656E742E6578616D706C652E636F6D2E204120494E3E3A206E6F646174612070726F6F66206661696C65642066726F6D20312E322E332E34 -HEX_EDNSDATA_END ENTRY_END SCENARIO_END diff --git a/testdata/val_nsec3_nods_badsig.rpl b/testdata/val_nsec3_nods_badsig.rpl index 59798a57e..35f6b579c 100644 --- a/testdata/val_nsec3_nods_badsig.rpl +++ b/testdata/val_nsec3_nods_badsig.rpl @@ -226,16 +226,11 @@ ENTRY_END ; recursion happens here. STEP 10 CHECK_ANSWER ENTRY_BEGIN -MATCH all +MATCH all_noedns ede=6 REPLY QR RD RA DO SERVFAIL SECTION QUESTION www.sub.example.com. IN A SECTION ANSWER -SECTION AUTHORITY -SECTION ADDITIONAL -HEX_EDNSDATA_BEGIN -000F 0086 000676616C69646174696F6E206661696C757265203C7777772E7375622E6578616D706C652E636F6D2E204120494E3E3A207369676E617475726520657870697265642066726F6D20312E322E332E3420666F72204453207375622E6578616D706C652E636F6D2E207768696C65206275696C64696E6720636861696E206F66207472757374 -HEX_EDNSDATA_END ENTRY_END SCENARIO_END diff --git a/testdata/val_nx_failwc.rpl b/testdata/val_nx_failwc.rpl index ba0fa88f7..9ff3ac4fc 100644 --- a/testdata/val_nx_failwc.rpl +++ b/testdata/val_nx_failwc.rpl @@ -58,16 +58,11 @@ ENTRY_END ; recursion happens here. STEP 10 CHECK_ANSWER ENTRY_BEGIN -MATCH all +MATCH all_noedns ede=6 REPLY QR RD RA DO SERVFAIL SECTION QUESTION a.nsecwc.nlnetlabs.nl. IN TXT SECTION ANSWER -SECTION AUTHORITY -SECTION ADDITIONAL -HEX_EDNSDATA_BEGIN -000F 005F 000676616C69646174696F6E206661696C757265203C612E6E73656377632E6E6C6E65746C6162732E6E6C2E2054585420494E3E3A206E616D656572726F722070726F6F66206661696C65642066726F6D203138352E34392E3134302E3630 -HEX_EDNSDATA_END ENTRY_END SCENARIO_END diff --git a/testdata/val_nx_overreach.rpl b/testdata/val_nx_overreach.rpl index 1db1b4dd8..8a1038552 100644 --- a/testdata/val_nx_overreach.rpl +++ b/testdata/val_nx_overreach.rpl @@ -154,16 +154,11 @@ ENTRY_END ; recursion happens here. STEP 10 CHECK_ANSWER ENTRY_BEGIN -MATCH all +MATCH all_noedns ede=6 REPLY QR RD RA DO SERVFAIL SECTION QUESTION www.example.com. IN A SECTION ANSWER -SECTION AUTHORITY -SECTION ADDITIONAL -HEX_EDNSDATA_BEGIN -000F 0051 000676616C69646174696F6E206661696C757265203C7777772E6578616D706C652E636F6D2E204120494E3E3A206E616D656572726F722070726F6F66206661696C65642066726F6D20312E322E332E34 -HEX_EDNSDATA_END ENTRY_END SCENARIO_END diff --git a/testdata/val_secds_nosig.rpl b/testdata/val_secds_nosig.rpl index ee7feefc1..fccb7bf54 100644 --- a/testdata/val_secds_nosig.rpl +++ b/testdata/val_secds_nosig.rpl @@ -223,14 +223,10 @@ ENTRY_END ; recursion happens here. STEP 10 CHECK_ANSWER ENTRY_BEGIN -MATCH all +MATCH all_noedns ede=6 REPLY QR RD RA DO SERVFAIL SECTION QUESTION www.sub.example.com. IN A -SECTION ADDITIONAL -HEX_EDNSDATA_BEGIN -000F 0083 000676616C69646174696F6E206661696C757265203C7777772E7375622E6578616D706C652E636F6D2E204120494E3E3A206E6F207369676E6174757265732066726F6D20312E322E332E3620666F72206B6579207375622E6578616D706C652E636F6D2E207768696C65206275696C64696E6720636861696E206F66207472757374 -HEX_EDNSDATA_END ENTRY_END SCENARIO_END diff --git a/testdata/val_ta_algo_missing.rpl b/testdata/val_ta_algo_missing.rpl index ab2acb07e..3a9cdaf1d 100644 --- a/testdata/val_ta_algo_missing.rpl +++ b/testdata/val_ta_algo_missing.rpl @@ -165,15 +165,11 @@ ENTRY_END ; recursion happens here. STEP 10 CHECK_ANSWER ENTRY_BEGIN -MATCH all +MATCH all_noedns ede=6 REPLY QR RD RA DO SERVFAIL SECTION QUESTION www.example.com. IN A SECTION ANSWER -SECTION ADDITIONAL -HEX_EDNSDATA_BEGIN -000F 00AA 000676616C69646174696F6E206661696C757265203C7777772E6578616D706C652E636F6D2E204120494E3E3A206E6F206B65797320686176652061204453207769746820616C676F726974686D20525341534841312D4E534543332D534841312066726F6D20312E322E332E3420666F7220747275737420616E63686F72206578616D706C652E636F6D2E207768696C65206275696C64696E6720636861696E206F66207472757374 -HEX_EDNSDATA_END ENTRY_END SCENARIO_END