change unittests to match just the ede code

diff --git a/testdata/autotrust_init_failsig.rpl b/testdata/autotrust_init_failsig.rpl
index 81787fdf41d3dd25cd9cf61fe4dd65f07349b27c..56d8dd1af9d34922fa3f4dd228c70b673ae67e6a 100644 (file)
--- 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 064d573876575dd40dff44b59449a27e3842da2d..189bb98acf07c7921e4195cf78e32ed096b1a655 100644 (file)
--- 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 d1bba5d60dd7a3c50881eb155bf1a2c791984cec..344af5c1f37c8a7a006ef4525eb6bae1fba9b113 100644 (file)
--- 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 35912cdf6e9f41783dcfbf0e5dca43ec932b4ca1..4a4133cd999bc3f1ea100989104d5e6a253d4f16 100644 (file)
--- 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 ca49dbf742faf7c42dbcb926e86c695fac642ecb..7be6a2c5b7375f6f3b6e88d9d0cdf74a1d8780bf 100644 (file)
--- 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 74ec0d4c5a056f34446e21b1e56b079e2b8466b7..ee7ed1db38790fa7c0b13adebd3354eb006a7273 100644 (file)
--- 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 1dbf828c6ef8be4d47d4a607444230b4643d882a..4a18f549c23c874b4d62799ae8492a178071a0bd 100644 (file)
--- 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 21be39c199770ce8cf84a6852c0a316af7d05f33..59728b29883f37cd13fabcf913ee5d77e450e1c7 100644 (file)
--- 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 36cbd90e38f9a1c0d1555673a7507abd27b51877..2f39c8ed97f1dcd45b0fe5edff85fa0e7dd59e0b 100644 (file)
--- 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 58bd97b2f4f3622492a351f99e5267a48a8be46c..21fed04039ae0aff66a8ccb058e96906759179a4 100644 (file)
--- 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 5fee9e6d89f136e700164d5da06cd02ff5a99713..d920d32ec67ccc25734b3fa3766b145db8d385d2 100644 (file)
--- 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 69670b277a0278fd54bd9063137f83fe3f34e0b9..2241b5edccbc73eceece105c6889d77cbfd8ebfa 100644 (file)
--- 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 45170b4c4aea0fe01a296afd3528f72ae2870e7e..02f9df99214cf9eb5ac9449de4c7c13ca75e9cfc 100644 (file)
--- 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 ba8d853a064dca82649d808542eea6b81188b83c..099d0529fcc555294bbee5b10c69dc1c7dcde04a 100644 (file)
--- 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 19feb00676d1ca4d3e16ae5b5ac94d34ad05a3de..b645d152feff9614303b5278cd0cf3e0a31fe51c 100644 (file)
--- 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 f561643e7bc215849724d1f1711ddf11389aca7e..7594b446103108e6663ef603b02bac28a9fcfd97 100644 (file)
--- 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 28d1193ec7c13320f640cd15a71bf5624e11e431..e8763da2eacdf920c240b282a688fa2ada5f12f1 100644 (file)
--- 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 35d29fb02d32a18f3ba82abc2a4e3f3ba91b3aa2..30ae023470fd8f9000744f5d0f05943dbdf78d1f 100644 (file)
--- 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 7d5307bec79a93ec372914a9439018a260b948b1..2d0297c0bd9dc5d149087098c62292105851d498 100644 (file)
--- 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 179ba27d9fe82c26de475e4fb5e51d1ee59581fb..442f5e0430d0c75fa41b7bf8457bf1316738a256 100644 (file)
--- 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 ddf1c87b29f93f299a16a5ffd2ad06f7760762bb..91007837ac43adab5bf037df746a521ebfd72865 100644 (file)
--- 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 59798a57e4c791c882d0394b70d8f90c07561b0b..35f6b579c755afa390c28970587b7164f9c88f9d 100644 (file)
--- 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 ba0fa88f7d46075dfda0fa5c71df80d8da454fdf..9ff3ac4fc4db21615a1f925eeb2e474f770b2a90 100644 (file)
--- 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 1db1b4dd80985e6721f44d20bb65e369a3b3a979..8a10385529a1639d65b9f626b1b5c5cff8402a2b 100644 (file)
--- 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 ee7feefc100fdf03d787de541d49ae6375859f1a..fccb7bf54d35aaa9e85621b44a58d98422d4efb9 100644 (file)
--- 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 ab2acb07ef7fbe1f1a459dee81474a5897ab9895..3a9cdaf1d2cd9afb94b21d44283731584ef8e9a1 100644 (file)
--- 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