- For #1289: test num.valops in existing stat_values.tdir.

diff --git a/doc/Changelog b/doc/Changelog
index 342bd411fcf7a7ccb7394fb6f06a5e983ba15aae..1fb20d3806941bcd094faaf454f808859d213f32 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -2,6 +2,7 @@
        - Merge #1289 from Roland van Rijswijk-Deij: Add extra statistic to
          track the number of signature validation operations.
          Adds 'num.valops' to extended statistics.
+       - For #1289: test num.valops in existing stat_values.tdir.
 
 11 July 2025: Wouter
        - Fix detection of SSL_CTX_set_tmp_ecdh function.

diff --git a/testdata/stat_values.tdir/stat_values.conf b/testdata/stat_values.tdir/stat_values.conf
index 312a7e17494f775569af72110e8b510feb6945eb..a22746297dcef28702d70791d2080204417fc6e7 100644 (file)
--- a/testdata/stat_values.tdir/stat_values.conf
+++ b/testdata/stat_values.tdir/stat_values.conf
@@ -17,7 +17,7 @@ server:
        serve-expired-client-timeout: 0
        dns-error-reporting: yes
 
-       trust-anchor: "bogusdnssec. DS 1444 8 2 5224fb17d630a2e3efdc863a05a4032c5db415b5de3f32472ee9abed42e10146"
+       trust-anchor: "bogusdnssec. DNSKEY  257 3 8 AwEAAbwL6LuXTLXtb23CsXhpkxxyGbEFUROh/L8BWA1EEF8LdQ4Rmsj4 D5D8uAnRFDkNhM6XiII9xcsavwBGNwHxzUaij4MZQu1vrzcfGIJLcC1Q paZmSH9WqIYFQci+T4s4UfDrrS96wO/H0nJvFmavWVX/7p1Q6dv0Arwz XMXaHGrRVdEgK2MDS3dFRngx5JC5fwD7YnwH08EAoFRjdAoXe+etOAeG aOT9IGjVM5LKkN2k6fIRvZ2l9eu5/o+h5L+kpDRcapW2QiL21hCcmwpW 50Llfx9Ovk+M7TBjp4iT7Tc8gLzRZr24LmXEyABb54WW3aoF5k8DZPot 9ogUjxVN/dM="
 
        local-zone: local.zone static
        local-data: "www.local.zone A 192.0.2.1"

diff --git a/testdata/stat_values.tdir/stat_values.test b/testdata/stat_values.tdir/stat_values.test
index d538e4d60ec296fc95eebc1b74240893d5ddd6e1..7dd71edd6b3b2b1c9e57e51b8282d7e6cbba0bea 100644 (file)
--- a/testdata/stat_values.tdir/stat_values.test
+++ b/testdata/stat_values.tdir/stat_values.test
@@ -448,7 +448,8 @@ num.query.flags.RD=1
 num.query.opcode.QUERY=1
 num.query.type.A=1
 num.query.udpout=9
-rrset.cache.count=4
+num.valops=6
+rrset.cache.count=5
 total.num.cachemiss=1
 total.num.dns_error_reports=1
 total.num.queries=1

diff --git a/testdata/stat_values.tdir/stat_values.testns b/testdata/stat_values.tdir/stat_values.testns
index a5c0ae92b5997892d08ad5f56027caebbf664a34..8dd8e26ee04b49f45450b73735ce0ff8da85b1c0 100644 (file)
--- a/testdata/stat_values.tdir/stat_values.testns
+++ b/testdata/stat_values.tdir/stat_values.testns
@@ -43,6 +43,11 @@ ADJUST copy_id
 SECTION QUESTION
 @      IN      DNSKEY
 SECTION ANSWER
+;; random keys with bogus rrsig (originally from nlnetlabs.nl)
+;; These will result in 6 validation attempts (1 + 5 retries) when trying to prime the configured trust anchor
+@       IN      DNSKEY  256 3 8 AwEAAdR7XR95OaAN9Rz7TbtPalQ9guQk7zfxTHYNKhsiwTZA9z+F16nD 0VeBlk7dNik3ETpT2GLAwr9sntG898JwurCDe353wHPvjZtMCdiTVp3c RCrjuCEvoFpmZNN82H0gaH/4v8mkv/QBDAkDSncYjz/FqHKAeYy3cMcj Y6RyVweh
+@       IN      DNSKEY  257 3 8 AwEAAbwL6LuXTLXtb23CsXhpkxxyGbEFUROh/L8BWA1EEF8LdQ4Rmsj4 D5D8uAnRFDkNhM6XiII9xcsavwBGNwHxzUaij4MZQu1vrzcfGIJLcC1Q paZmSH9WqIYFQci+T4s4UfDrrS96wO/H0nJvFmavWVX/7p1Q6dv0Arwz XMXaHGrRVdEgK2MDS3dFRngx5JC5fwD7YnwH08EAoFRjdAoXe+etOAeG aOT9IGjVM5LKkN2k6fIRvZ2l9eu5/o+h5L+kpDRcapW2QiL21hCcmwpW 50Llfx9Ovk+M7TBjp4iT7Tc8gLzRZr24LmXEyABb54WW3aoF5k8DZPot 9ogUjxVN/dM=
+@       IN      RRSIG   DNSKEY 8 1 3600 20250806005014 20250709005014 50602 bogusdnssec. WIv6Qe9RAALyMK04dnDfOHtudHzIyk2DcwBLupbPdmSu+0NcAjcQBo2x rWNrdvNHVCAi5OvRwIz/ac81TptsnsSd6zcOtbeSijWpQj21vnSHhlWv zvJW+/WAm3h/XbOPFSE08FNaig9CeRE2GmKemKAdUeDbWoNrku8klCG+ GHJCCyqdmgS6249oUvIgV/m6OwRSCEeUxHlDqbM+OF+Up3dj0iQ61n9l 2nrQR9WNFn9YGTNHiA9bhdFfiCmrAb6X01IrlmSe+ENiQPeRnOWv24ls V5Re9zAOz+X26vjev/wMTEhlrAvl6FIRg7hIgnd3UxQ/UCQ5gxSriaWi YoiH6g==
 ENTRY_END
 
 ENTRY_BEGIN