add EDE responses to unittests

diff --git a/testdata/autotrust_init_fail.rpl b/testdata/autotrust_init_fail.rpl
index fd924f16f0be026f2c6e042bfcde3d55659c3c7f..b7507e8eb33a54b969f1950cb058651aebf31030 100644 (file)
--- 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 04cf530acc6ea62a777f2f9be1fe9da96aff695f..81787fdf41d3dd25cd9cf61fe4dd65f07349b27c 100644 (file)
--- 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 d3ac6aedf7f236331221e17c97c9c5afc29a6a68..064d573876575dd40dff44b59449a27e3842da2d 100644 (file)
--- 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 48230050239e947e31a3697ab19a5319ab44441f..d1bba5d60dd7a3c50881eb155bf1a2c791984cec 100644 (file)
--- 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 e2367a980d3188525c561cc5cd83baa5e23f4889..35912cdf6e9f41783dcfbf0e5dca43ec932b4ca1 100644 (file)
--- 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 37946c008cfd4f5fb6b0c74947f26562438ac1d7..ca49dbf742faf7c42dbcb926e86c695fac642ecb 100644 (file)
--- 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 8221d2db6b58adcdca5e6acb16582703b451384c..74ec0d4c5a056f34446e21b1e56b079e2b8466b7 100644 (file)
--- 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 9d00b6cf762a95f953f6ad3637f3bed8eb527d1d..1dbf828c6ef8be4d47d4a607444230b4643d882a 100644 (file)
--- 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 1b66c5aac77dac32c5432e28152f02dd33c26376..21be39c199770ce8cf84a6852c0a316af7d05f33 100644 (file)
--- 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 cfd0d72c8f46e42d76bdc8c8e3a0a3ac6782ab38..36cbd90e38f9a1c0d1555673a7507abd27b51877 100644 (file)
--- 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 c1346ceb491da773551ea8ec76241359f05e5c17..58bd97b2f4f3622492a351f99e5267a48a8be46c 100644 (file)
--- 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 343c3e2bbed85a3a9a97710588174d63ca515486..5fee9e6d89f136e700164d5da06cd02ff5a99713 100644 (file)
--- 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 6e8f1bd8379158b7dfdc46b00b7c72e9a0972be5..69670b277a0278fd54bd9063137f83fe3f34e0b9 100644 (file)
--- 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 b011af88a4def42e0e25017f7f4814f67f3432a1..45170b4c4aea0fe01a296afd3528f72ae2870e7e 100644 (file)
--- 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 7c3e41be3560537c972a8d95162ba7aaa07e1a9f..ba8d853a064dca82649d808542eea6b81188b83c 100644 (file)
--- 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 4c3139ac5e013e70bf800a823021267674a15a03..19feb00676d1ca4d3e16ae5b5ac94d34ad05a3de 100644 (file)
--- 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 f1be6636c1e9648005a56c5f989739ecfbd0471f..f561643e7bc215849724d1f1711ddf11389aca7e 100644 (file)
--- 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 76fa8acac3e31c97a0fee011eb545978937bc89c..28d1193ec7c13320f640cd15a71bf5624e11e431 100644 (file)
--- 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 4675a382bc99ecee28620165f4c7114f1d56abfd..35d29fb02d32a18f3ba82abc2a4e3f3ba91b3aa2 100644 (file)
--- 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 6c77421a2603d03510d8223fe722f123ed6ba071..7d5307bec79a93ec372914a9439018a260b948b1 100644 (file)
--- 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 43d815e76e83a28fef1b640faadec7583d10a3e2..179ba27d9fe82c26de475e4fb5e51d1ee59581fb 100644 (file)
--- 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 7bf202e3abbb84784b05ebf013d163618ffdfd60..ddf1c87b29f93f299a16a5ffd2ad06f7760762bb 100644 (file)
--- 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 1c37d21e12f551d6679a929e510ac7c643ed763d..59798a57e4c791c882d0394b70d8f90c07561b0b 100644 (file)
--- 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 eb2f5ba7e421bee640ab8f0d3c63b38c16f42b5d..ba0fa88f7d46075dfda0fa5c71df80d8da454fdf 100644 (file)
--- 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 c63d4da5c3d8509bf4d78524cb255ba1de68b6f9..1db1b4dd80985e6721f44d20bb65e369a3b3a979 100644 (file)
--- 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 453cfa6ad4961f4858dccc6ca566e3a6a445a31f..ee7feefc100fdf03d787de541d49ae6375859f1a 100644 (file)
--- 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 a905c223bb20ace6442da226562b8fcd19e51fc2..ab2acb07ef7fbe1f1a459dee81474a5897ab9895 100644 (file)
--- 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 c30b02282a2b798ab7e2354db06942f95460adc1..67db8cfe469e6ff1150497c12afde0afa1bf5e82 100644 (file)
--- 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<num; i++) {

diff --git a/validator/val_sigcrypt.h b/validator/val_sigcrypt.h
index af16c293c20679f5b91ae387eb6f2a6a14cec37e..80e85dd43342d4e58d6bf7d3e487080e216e613b 100644 (file)
--- a/validator/val_sigcrypt.h
+++ b/validator/val_sigcrypt.h
@@ -292,6 +292,12 @@ enum sec_status dnskey_verify_rrset(struct module_env* env,
        struct ub_packed_rrset_key* dnskey, size_t dnskey_idx, char** reason,
        sldns_pkt_section section, struct module_qstate* 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);
+
 #if 0
 /** 
  * verify rrset, with dnskey rrset, for a specific rrsig in rrset