From: TCY16 Date: Fri, 1 Oct 2021 12:46:29 +0000 (+0200) Subject: add EDE responses to unittests X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=86e8050352771c915cf0dbe07e451788d57b67f4;p=thirdparty%2Funbound.git add EDE responses to unittests --- diff --git a/testdata/autotrust_init_fail.rpl b/testdata/autotrust_init_fail.rpl index fd924f16f..b7507e8eb 100644 --- a/testdata/autotrust_init_fail.rpl +++ b/testdata/autotrust_init_fail.rpl @@ -155,6 +155,7 @@ 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 diff --git a/testdata/autotrust_init_failsig.rpl b/testdata/autotrust_init_failsig.rpl index 04cf530ac..81787fdf4 100644 --- a/testdata/autotrust_init_failsig.rpl +++ b/testdata/autotrust_init_failsig.rpl @@ -136,6 +136,10 @@ 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 @@ -143,6 +147,7 @@ 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 diff --git a/testdata/autotrust_probefail.rpl b/testdata/autotrust_probefail.rpl index d3ac6aedf..064d57387 100644 --- a/testdata/autotrust_probefail.rpl +++ b/testdata/autotrust_probefail.rpl @@ -160,6 +160,10 @@ 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 482300502..d1bba5d60 100644 --- a/testdata/autotrust_probefailsig.rpl +++ b/testdata/autotrust_probefailsig.rpl @@ -160,6 +160,10 @@ 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 e2367a980..35912cdf6 100644 --- a/testdata/black_ds_entry.rpl +++ b/testdata/black_ds_entry.rpl @@ -583,6 +583,10 @@ 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. @@ -600,6 +604,10 @@ 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 37946c008..ca49dbf74 100644 --- a/testdata/black_key_entry.rpl +++ b/testdata/black_key_entry.rpl @@ -565,6 +565,10 @@ 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. @@ -582,6 +586,10 @@ 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 8221d2db6..74ec0d4c5 100644 --- a/testdata/black_prime_entry.rpl +++ b/testdata/black_prime_entry.rpl @@ -289,6 +289,10 @@ MATCH all 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,6 +312,10 @@ MATCH all 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 9d00b6cf7..1dbf828c6 100644 --- a/testdata/edns_keepalive.rpl +++ b/testdata/edns_keepalive.rpl @@ -53,7 +53,7 @@ STEP 10 CHECK_ANSWER www.example.com. IN A SECTION ADDITIONAL HEX_EDNSDATA_BEGIN - ; Empty + 000F 001F 000071756572792077697468206261642065646E73206B656570616C697665 HEX_EDNSDATA_END ENTRY_END diff --git a/testdata/root_key_sentinel.rpl b/testdata/root_key_sentinel.rpl index 1b66c5aac..21be39c19 100644 --- a/testdata/root_key_sentinel.rpl +++ b/testdata/root_key_sentinel.rpl @@ -142,6 +142,10 @@ MATCH all 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,6 +162,10 @@ MATCH all 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 cfd0d72c8..36cbd90e3 100644 --- a/testdata/val_cnametocloser_nosig.rpl +++ b/testdata/val_cnametocloser_nosig.rpl @@ -93,6 +93,10 @@ 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 c1346ceb4..58bd97b2f 100644 --- a/testdata/val_cnametonodata_nonsec.rpl +++ b/testdata/val_cnametonodata_nonsec.rpl @@ -260,6 +260,9 @@ 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 343c3e2bb..5fee9e6d8 100644 --- a/testdata/val_cnametoposnowc.rpl +++ b/testdata/val_cnametoposnowc.rpl @@ -260,6 +260,9 @@ 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 6e8f1bd83..69670b277 100644 --- a/testdata/val_deleg_nons.rpl +++ b/testdata/val_deleg_nons.rpl @@ -266,6 +266,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 b011af88a..45170b4c4 100644 --- a/testdata/val_dnamewc.rpl +++ b/testdata/val_dnamewc.rpl @@ -263,6 +263,9 @@ 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 7c3e41be3..ba8d853a0 100644 --- a/testdata/val_ds_cname.rpl +++ b/testdata/val_ds_cname.rpl @@ -200,6 +200,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 4c3139ac5..19feb0067 100644 --- a/testdata/val_faildnskey.rpl +++ b/testdata/val_faildnskey.rpl @@ -165,6 +165,10 @@ 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 f1be6636c..f561643e7 100644 --- a/testdata/val_nodata_failsig.rpl +++ b/testdata/val_nodata_failsig.rpl @@ -161,6 +161,9 @@ 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 76fa8acac..28d1193ec 100644 --- a/testdata/val_nodata_failwc.rpl +++ b/testdata/val_nodata_failwc.rpl @@ -67,6 +67,9 @@ _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 4675a382b..35d29fb02 100644 --- a/testdata/val_nokeyprime.rpl +++ b/testdata/val_nokeyprime.rpl @@ -158,6 +158,10 @@ 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 6c77421a2..7d5307bec 100644 --- a/testdata/val_nsec3_b1_nameerror_nowc.rpl +++ b/testdata/val_nsec3_b1_nameerror_nowc.rpl @@ -146,6 +146,9 @@ SECTION AUTHORITY ; 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 43d815e76..179ba27d9 100644 --- a/testdata/val_nsec3_b2_nodata_nons.rpl +++ b/testdata/val_nsec3_b2_nodata_nons.rpl @@ -134,6 +134,9 @@ 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 7bf202e3a..ddf1c87b2 100644 --- a/testdata/val_nsec3_entnodata_optout_badopt.rpl +++ b/testdata/val_nsec3_entnodata_optout_badopt.rpl @@ -193,6 +193,9 @@ 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 1c37d21e1..59798a57e 100644 --- a/testdata/val_nsec3_nods_badsig.rpl +++ b/testdata/val_nsec3_nods_badsig.rpl @@ -233,6 +233,9 @@ 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 eb2f5ba7e..ba0fa88f7 100644 --- a/testdata/val_nx_failwc.rpl +++ b/testdata/val_nx_failwc.rpl @@ -65,6 +65,9 @@ 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 c63d4da5c..1db1b4dd8 100644 --- a/testdata/val_nx_overreach.rpl +++ b/testdata/val_nx_overreach.rpl @@ -161,6 +161,9 @@ 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 453cfa6ad..ee7feefc1 100644 --- a/testdata/val_secds_nosig.rpl +++ b/testdata/val_secds_nosig.rpl @@ -227,6 +227,10 @@ MATCH all 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 a905c223b..ab2acb07e 100644 --- a/testdata/val_ta_algo_missing.rpl +++ b/testdata/val_ta_algo_missing.rpl @@ -170,6 +170,10 @@ 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 diff --git a/validator/val_sigcrypt.c b/validator/val_sigcrypt.c index c30b02282..67db8cfe4 100644 --- a/validator/val_sigcrypt.c +++ b/validator/val_sigcrypt.c @@ -622,6 +622,16 @@ dnskey_verify_rrset(struct module_env* env, struct val_env* ve, struct ub_packed_rrset_key* rrset, struct ub_packed_rrset_key* dnskey, size_t dnskey_idx, char** reason, sldns_pkt_section section, struct module_qstate* qstate) +{ + return dnskey_verify_rrset_ede(env, ve, rrset, dnskey, dnskey_idx, + reason, NULL, section, qstate); +} + +enum sec_status +dnskey_verify_rrset_ede(struct module_env* env, struct val_env* ve, + struct ub_packed_rrset_key* rrset, struct ub_packed_rrset_key* dnskey, + size_t dnskey_idx, char** reason, sldns_ede_code *reason_bogus, + sldns_pkt_section section, struct module_qstate* qstate) { enum sec_status sec; size_t i, num, numchecked = 0; @@ -635,6 +645,7 @@ dnskey_verify_rrset(struct module_env* env, struct val_env* ve, verbose(VERB_QUERY, "rrset failed to verify due to a lack of " "signatures"); *reason = "no signatures"; + // @TODO ADD EDE 10 return sec_status_bogus; } for(i=0; i