- --disable-sha1 disables SHA1 support in RRSIG, so from DNSKEY and

  DS records.  NSEC3 is not disabled.
- fake-sha1 test option; print warning if used.  To make unit tests.

git-svn-id: file:///svn/unbound/trunk@4043 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/config.h.in b/config.h.in
index 4cb48f827dac423afb61aa62bc20e38ce3793c76..ada2b69a2c3dcdbe6f425f9b97eec77974f92afa 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -684,6 +684,9 @@
 /* Define this to enable client TCP Fast Open. */
 #undef USE_OSX_MSG_FASTOPEN
 
+/* Define this to enable SHA1 support. */
+#undef USE_SHA1
+
 /* Define this to enable SHA256 and SHA512 support. */
 #undef USE_SHA2
 

diff --git a/configure b/configure
index 563db6d0ab1ed7938e7b2b0508d8220aab5044b3..aaafecc64f8d8798379a1c3d5004722b02baece9 100755 (executable)
--- a/configure
+++ b/configure
@@ -840,6 +840,7 @@ with_pythonmodule
 with_nss
 with_nettle
 with_ssl
+enable_sha1
 enable_sha2
 enable_gost
 enable_ecdsa
@@ -1515,6 +1516,8 @@ Optional Features:
                           enable nonregional allocs, slow but exposes regional
                           allocations to other memory purifiers, for debug
                           purposes
+  --disable-sha1          Disable SHA1 RRSIG support, does not disable nsec3
+                          support
   --disable-sha2          Disable SHA256 and SHA512 RRSIG support
   --disable-gost          Disable GOST support
   --disable-ecdsa         Disable ECDSA support
@@ -17709,6 +17712,22 @@ fi
 
 
 
+# Check whether --enable-sha1 was given.
+if test "${enable_sha1+set}" = set; then :
+  enableval=$enable_sha1;
+fi
+
+case "$enable_sha1" in
+       no)
+       ;;
+       yes|*)
+
+$as_echo "#define USE_SHA1 1" >>confdefs.h
+
+       ;;
+esac
+
+
 # Check whether --enable-sha2 was given.
 if test "${enable_sha2+set}" = set; then :
   enableval=$enable_sha2;

diff --git a/configure.ac b/configure.ac
index b8e01d7ec6b49ffcdeacd221e3f943b822664afa..7f7ab6fa5f6b5f51154a9ca3e902e462a768a3d8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -710,6 +710,16 @@ fi
 AC_SUBST(SSLLIB)
 
 
+AC_ARG_ENABLE(sha1, AC_HELP_STRING([--disable-sha1], [Disable SHA1 RRSIG support, does not disable nsec3 support]))
+case "$enable_sha1" in
+       no)
+       ;;
+       yes|*)
+       AC_DEFINE([USE_SHA1], [1], [Define this to enable SHA1 support.])
+       ;;
+esac
+
+
 AC_ARG_ENABLE(sha2, AC_HELP_STRING([--disable-sha2], [Disable SHA256 and SHA512 RRSIG support]))
 case "$enable_sha2" in
        no)

diff --git a/doc/Changelog b/doc/Changelog
index 2b55255ef86ee7d9c6fb7586d86f9da8c6da94f2..0fdc51f333c4f9be1d50bb059ad0f97caa24de6c 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,8 @@
+9 March 2017: Wouter
+       - --disable-sha1 disables SHA1 support in RRSIG, so from DNSKEY and
+         DS records.  NSEC3 is not disabled.
+       - fake-sha1 test option; print warning if used.  To make unit tests.
+
 8 March 2017: Wouter
        - make depend for build dependencies.
        - swig version 2.0.1 required.

diff --git a/testcode/testbound.c b/testcode/testbound.c
index 00502eea884979b0f0ba3a3213a1017aa3ca7858..c7af2e9e1349d22a33de1e1640b7fa5f69af60bf 100644 (file)
--- a/testcode/testbound.c
+++ b/testcode/testbound.c
@@ -73,6 +73,7 @@ testbound_usage(void)
        printf("\ttest the unbound daemon.\n");
        printf("-h      this help\n");
        printf("-p file playback text file\n");
+       printf("-1      detect SHA1 support (exit code 0 or 1)\n");
        printf("-2      detect SHA256 support (exit code 0 or 1)\n");
        printf("-g      detect GOST support (exit code 0 or 1)\n");
        printf("-e      detect ECDSA support (exit code 0 or 1)\n");
@@ -285,6 +286,15 @@ main(int argc, char* argv[])
                        free(pass_argv[1]);
                        testbound_selftest();
                        exit(0);
+               case '1':
+#ifdef USE_SHA1
+                       printf("SHA1 supported\n");
+                       exit(0);
+#else
+                       printf("SHA1 not supported\n");
+                       exit(1);
+#endif
+                       break;
                case '2':
 #if (defined(HAVE_EVP_SHA256) || defined(HAVE_NSS) || defined(HAVE_NETTLE)) && defined(USE_SHA2)
                        printf("SHA256 supported\n");

diff --git a/testcode/unitverify.c b/testcode/unitverify.c
index b74ea5131b90a4fc78e9b7318452ab04dd8c3781..37994a377c28e9d6a53d8f09814b6130cb9d2551 100644 (file)
--- a/testcode/unitverify.c
+++ b/testcode/unitverify.c
@@ -496,8 +496,10 @@ void
 verify_test(void)
 {
        unit_show_feature("signature verify");
+#ifdef USE_SHA1
        verifytest_file("testdata/test_signatures.1", "20070818005004");
-#ifdef USE_DSA
+#endif
+#if defined(USE_DSA) && defined(USE_SHA1)
        verifytest_file("testdata/test_signatures.2", "20080414005004");
        verifytest_file("testdata/test_signatures.3", "20080416005004");
        verifytest_file("testdata/test_signatures.4", "20080416005004");
@@ -505,17 +507,23 @@ verify_test(void)
        verifytest_file("testdata/test_signatures.6", "20080416005004");
        verifytest_file("testdata/test_signatures.7", "20070829144150");
 #endif /* USE_DSA */
+#ifdef USE_SHA1
        verifytest_file("testdata/test_signatures.8", "20070829144150");
+#endif
 #if (defined(HAVE_EVP_SHA256) || defined(HAVE_NSS) || defined(HAVE_NETTLE)) && defined(USE_SHA2)
        verifytest_file("testdata/test_sigs.rsasha256", "20070829144150");
+#  ifdef USE_SHA1
        verifytest_file("testdata/test_sigs.sha1_and_256", "20070829144150");
+#  endif
        verifytest_file("testdata/test_sigs.rsasha256_draft", "20090101000000");
 #endif
 #if (defined(HAVE_EVP_SHA512) || defined(HAVE_NSS) || defined(HAVE_NETTLE)) && defined(USE_SHA2)
        verifytest_file("testdata/test_sigs.rsasha512_draft", "20070829144150");
 #endif
+#ifdef USE_SHA1
        verifytest_file("testdata/test_sigs.hinfo", "20090107100022");
        verifytest_file("testdata/test_sigs.revoked", "20080414005004");
+#endif
 #ifdef USE_GOST
        if(sldns_key_EVP_load_gost_id())
          verifytest_file("testdata/test_sigs.gost", "20090807060504");
@@ -529,7 +537,9 @@ verify_test(void)
        }
        dstest_file("testdata/test_ds.sha384");
 #endif
+#ifdef USE_SHA1
        dstest_file("testdata/test_ds.sha1");
+#endif
        nsectest();
        nsec3_hash_test("testdata/test_nsec3_hash.1");
 }

diff --git a/testdata/autotrust_10key.rpl b/testdata/autotrust_10key.rpl
index 89f2102a3419de49a78d28f77ee0198a6c65b6da..1f2998f778906c3055cd8fd4947bee82947481d6 100644 (file)
--- a/testdata/autotrust_10key.rpl
+++ b/testdata/autotrust_10key.rpl
@@ -2,6 +2,7 @@
 server:
        target-fetch-policy: "0 0 0 0 0"
        log-time-ascii: yes
+       fake-sha1: yes
 stub-zone:
        name: "."
        stub-addr: 193.0.14.129         # K.ROOT-SERVERS.NET.

diff --git a/testdata/autotrust_addpend_2exceed.rpl b/testdata/autotrust_addpend_2exceed.rpl
index 5a15f8a1321454d8baae1d5eae529000739ca583..6a79a6436b07a00e695c0f650e718fcbde7ce76d 100644 (file)
--- a/testdata/autotrust_addpend_2exceed.rpl
+++ b/testdata/autotrust_addpend_2exceed.rpl
@@ -2,6 +2,7 @@
 server:
        target-fetch-policy: "0 0 0 0 0"
        log-time-ascii: yes
+       fake-sha1: yes
 stub-zone:
        name: "."
        stub-addr: 193.0.14.129         # K.ROOT-SERVERS.NET.

diff --git a/testdata/autotrust_addpend_early.rpl b/testdata/autotrust_addpend_early.rpl
index 8ff3299e7ffa2a1d514efe23eda6810b9c1dddd9..3df5ff2d47f2b45cbc598bacdad55ce873e35b69 100644 (file)
--- a/testdata/autotrust_addpend_early.rpl
+++ b/testdata/autotrust_addpend_early.rpl
@@ -2,6 +2,7 @@
 server:
        target-fetch-policy: "0 0 0 0 0"
        log-time-ascii: yes
+       fake-sha1: yes
 stub-zone:
        name: "."
        stub-addr: 193.0.14.129         # K.ROOT-SERVERS.NET.

diff --git a/testdata/autotrust_addpend_nosign.rpl b/testdata/autotrust_addpend_nosign.rpl
index 689063309615c8d6d93e6ea90d797a711ee5a456..32fb1beab2011214ba73885daaf805f366798057 100644 (file)
--- a/testdata/autotrust_addpend_nosign.rpl
+++ b/testdata/autotrust_addpend_nosign.rpl
@@ -2,6 +2,7 @@
 server:
        target-fetch-policy: "0 0 0 0 0"
        log-time-ascii: yes
+       fake-sha1: yes
 stub-zone:
        name: "."
        stub-addr: 193.0.14.129         # K.ROOT-SERVERS.NET.

diff --git a/testdata/autotrust_addpend_nosignnew.rpl b/testdata/autotrust_addpend_nosignnew.rpl
index d3b46d86bedf77f72248abdcf406c22b2dd4ab8a..32910e9c78d5cde31ae85233a1c9a085995f22b3 100644 (file)
--- a/testdata/autotrust_addpend_nosignnew.rpl
+++ b/testdata/autotrust_addpend_nosignnew.rpl
@@ -2,6 +2,7 @@
 server:
        target-fetch-policy: "0 0 0 0 0"
        log-time-ascii: yes
+       fake-sha1: yes
 stub-zone:
        name: "."
        stub-addr: 193.0.14.129         # K.ROOT-SERVERS.NET.

diff --git a/testdata/autotrust_addpend_once.rpl b/testdata/autotrust_addpend_once.rpl
index 3c7b46804b12d2ade51a106e43d86adb67a2c79d..2dcd7372725a98ef35bffc76e7bf82809d4963f7 100644 (file)
--- a/testdata/autotrust_addpend_once.rpl
+++ b/testdata/autotrust_addpend_once.rpl
@@ -2,6 +2,7 @@
 server:
        target-fetch-policy: "0 0 0 0 0"
        log-time-ascii: yes
+       fake-sha1: yes
 stub-zone:
        name: "."
        stub-addr: 193.0.14.129         # K.ROOT-SERVERS.NET.

diff --git a/testdata/autotrust_addpend_twice.rpl b/testdata/autotrust_addpend_twice.rpl
index 9bb788093fb57625bbbdd275025aa4b5893406ba..2e14b0470e8bf74461244516a7d3854cac1be1ff 100644 (file)
--- a/testdata/autotrust_addpend_twice.rpl
+++ b/testdata/autotrust_addpend_twice.rpl
@@ -2,6 +2,7 @@
 server:
        target-fetch-policy: "0 0 0 0 0"
        log-time-ascii: yes
+       fake-sha1: yes
 stub-zone:
        name: "."
        stub-addr: 193.0.14.129         # K.ROOT-SERVERS.NET.

diff --git a/testdata/autotrust_init.rpl b/testdata/autotrust_init.rpl
index f7208c264280d81a84b6fe7dd4d1d1ee649f29b9..35a693be9a1220d1677e6a98dedda96d239bae4d 100644 (file)
--- a/testdata/autotrust_init.rpl
+++ b/testdata/autotrust_init.rpl
@@ -2,6 +2,7 @@
 server:
        target-fetch-policy: "0 0 0 0 0"
        log-time-ascii: yes
+       fake-sha1: yes
 stub-zone:
        name: "."
        stub-addr: 193.0.14.129         # K.ROOT-SERVERS.NET.

diff --git a/testdata/autotrust_init_ds.rpl b/testdata/autotrust_init_ds.rpl
index 6245a4addab78cf824370790cf06042605dc5fbe..765d58919453dd69ad6996b594abd5f73785ac7f 100644 (file)
--- a/testdata/autotrust_init_ds.rpl
+++ b/testdata/autotrust_init_ds.rpl
@@ -2,6 +2,7 @@
 server:
        target-fetch-policy: "0 0 0 0 0"
        log-time-ascii: yes
+       fake-sha1: yes
 stub-zone:
        name: "."
        stub-addr: 193.0.14.129         # K.ROOT-SERVERS.NET.

diff --git a/testdata/autotrust_init_fail.rpl b/testdata/autotrust_init_fail.rpl
index bd7098ea7d1505bb4cba59b25838ec6736287489..bf8f5d342555bb252798ae54e9ca1ced8af52766 100644 (file)
--- a/testdata/autotrust_init_fail.rpl
+++ b/testdata/autotrust_init_fail.rpl
@@ -2,6 +2,7 @@
 server:
        target-fetch-policy: "0 0 0 0 0"
        log-time-ascii: yes
+       fake-sha1: yes
 stub-zone:
        name: "."
        stub-addr: 193.0.14.129         # K.ROOT-SERVERS.NET.

diff --git a/testdata/autotrust_init_failsig.rpl b/testdata/autotrust_init_failsig.rpl
index 792ac9ead69eb6b061e13acc880c2253fcb1256f..4348878aad372a6a7df0dc3eb8be076eb89f9899 100644 (file)
--- a/testdata/autotrust_init_failsig.rpl
+++ b/testdata/autotrust_init_failsig.rpl
@@ -2,6 +2,7 @@
 server:
        target-fetch-policy: "0 0 0 0 0"
        log-time-ascii: yes
+       fake-sha1: yes
 stub-zone:
        name: "."
        stub-addr: 193.0.14.129         # K.ROOT-SERVERS.NET.

diff --git a/testdata/autotrust_init_legacy.rpl b/testdata/autotrust_init_legacy.rpl
index f188d0aed7842b2ba6cdef2fcddc7ba86dc52aa7..91c3e7b1a9240dbac8fbcf5fb51ebccdabdc60f5 100644 (file)
--- a/testdata/autotrust_init_legacy.rpl
+++ b/testdata/autotrust_init_legacy.rpl
@@ -2,6 +2,7 @@
 server:
        target-fetch-policy: "0 0 0 0 0"
        log-time-ascii: yes
+       fake-sha1: yes
 stub-zone:
        name: "."
        stub-addr: 193.0.14.129         # K.ROOT-SERVERS.NET.

diff --git a/testdata/autotrust_init_sigs.rpl b/testdata/autotrust_init_sigs.rpl
index 050edf2a95f0b62ecef6e4750c3d0c0449bc87b9..8ee65585d6daa280ac923a6e2eb95b2570a2572e 100644 (file)
--- a/testdata/autotrust_init_sigs.rpl
+++ b/testdata/autotrust_init_sigs.rpl
@@ -2,6 +2,7 @@
 server:
        target-fetch-policy: "0 0 0 0 0"
        log-time-ascii: yes
+       fake-sha1: yes
 stub-zone:
        name: "."
        stub-addr: 193.0.14.129         # K.ROOT-SERVERS.NET.

diff --git a/testdata/autotrust_init_zsk.rpl b/testdata/autotrust_init_zsk.rpl
index 7ef09e45c5cbaa7779843dd177015b244fcecbad..08c60f9e1407e826b30a03b5fa8c4d2847fc7960 100644 (file)
--- a/testdata/autotrust_init_zsk.rpl
+++ b/testdata/autotrust_init_zsk.rpl
@@ -2,6 +2,7 @@
 server:
        target-fetch-policy: "0 0 0 0 0"
        log-time-ascii: yes
+       fake-sha1: yes
 stub-zone:
        name: "."
        stub-addr: 193.0.14.129         # K.ROOT-SERVERS.NET.

diff --git a/testdata/autotrust_missing.rpl b/testdata/autotrust_missing.rpl
index aab99911c7eab8229b774ea2e2ede334802638ef..ed183a3182a7cc26d735ab4f11bfa9ef8bdacca5 100644 (file)
--- a/testdata/autotrust_missing.rpl
+++ b/testdata/autotrust_missing.rpl
@@ -2,6 +2,7 @@
 server:
        target-fetch-policy: "0 0 0 0 0"
        log-time-ascii: yes
+       fake-sha1: yes
 stub-zone:
        name: "."
        stub-addr: 193.0.14.129         # K.ROOT-SERVERS.NET.

diff --git a/testdata/autotrust_missing_all.rpl b/testdata/autotrust_missing_all.rpl
index 0c78aa6b109a326262fd7f1145e0b75a730abfc1..0813ef68ffb5317205649f93adf2a39fd79afc04 100644 (file)
--- a/testdata/autotrust_missing_all.rpl
+++ b/testdata/autotrust_missing_all.rpl
@@ -2,6 +2,7 @@
 server:
        target-fetch-policy: "0 0 0 0 0"
        log-time-ascii: yes
+       fake-sha1: yes
 stub-zone:
        name: "."
        stub-addr: 193.0.14.129         # K.ROOT-SERVERS.NET.

diff --git a/testdata/autotrust_missing_returns.rpl b/testdata/autotrust_missing_returns.rpl
index d44e0b049859cf5bd64fac70eeeeb6c06bc411e3..93735f1b97455bd91a1f5039a33ae3b79e013198 100644 (file)
--- a/testdata/autotrust_missing_returns.rpl
+++ b/testdata/autotrust_missing_returns.rpl
@@ -2,6 +2,7 @@
 server:
        target-fetch-policy: "0 0 0 0 0"
        log-time-ascii: yes
+       fake-sha1: yes
 stub-zone:
        name: "."
        stub-addr: 193.0.14.129         # K.ROOT-SERVERS.NET.

diff --git a/testdata/autotrust_probefail.rpl b/testdata/autotrust_probefail.rpl
index 7b8429d8bdf703b19fc341bfd21e14f627dcf67a..7e5a4da82bed57736422d0a06e86d9f17db24c18 100644 (file)
--- a/testdata/autotrust_probefail.rpl
+++ b/testdata/autotrust_probefail.rpl
@@ -2,6 +2,7 @@
 server:
        target-fetch-policy: "0 0 0 0 0"
        log-time-ascii: yes
+       fake-sha1: yes
 stub-zone:
        name: "."
        stub-addr: 193.0.14.129         # K.ROOT-SERVERS.NET.

diff --git a/testdata/autotrust_probefailsig.rpl b/testdata/autotrust_probefailsig.rpl
index 1b6e288a19d2f2608f1d4c719120ac48380db94b..7abf373dd4a54102fe38e77ae1e7909a45e3919e 100644 (file)
--- a/testdata/autotrust_probefailsig.rpl
+++ b/testdata/autotrust_probefailsig.rpl
@@ -2,6 +2,7 @@
 server:
        target-fetch-policy: "0 0 0 0 0"
        log-time-ascii: yes
+       fake-sha1: yes
 stub-zone:
        name: "."
        stub-addr: 193.0.14.129         # K.ROOT-SERVERS.NET.

diff --git a/testdata/autotrust_revoked_use.rpl b/testdata/autotrust_revoked_use.rpl
index ae72c42f6ba5573834bf5269768d983bffcf1ebf..c87da44e7221b5941f4d7c210f4a2a8d2723908b 100644 (file)
--- a/testdata/autotrust_revoked_use.rpl
+++ b/testdata/autotrust_revoked_use.rpl
@@ -2,6 +2,7 @@
 server:
        target-fetch-policy: "0 0 0 0 0"
        log-time-ascii: yes
+       fake-sha1: yes
 stub-zone:
        name: "."
        stub-addr: 193.0.14.129         # K.ROOT-SERVERS.NET.

diff --git a/testdata/autotrust_revoked_with_invalid.rpl b/testdata/autotrust_revoked_with_invalid.rpl
index 144bf4918b47045bce73373e33c26fed6665160d..0c717f1adfac6bdd52caf316f006bb2439b7076e 100644 (file)
--- a/testdata/autotrust_revoked_with_invalid.rpl
+++ b/testdata/autotrust_revoked_with_invalid.rpl
@@ -2,6 +2,7 @@
 server:
        target-fetch-policy: "0 0 0 0 0"
        log-time-ascii: yes
+       fake-sha1: yes
 stub-zone:
        name: "."
        stub-addr: 193.0.14.129         # K.ROOT-SERVERS.NET.

diff --git a/testdata/autotrust_revtp.rpl b/testdata/autotrust_revtp.rpl
index 40075e731a4b617af8e4b73b009f8ddea06e712f..275c8c6e18f78c69783b4dc427b09fdf38aa7b50 100644 (file)
--- a/testdata/autotrust_revtp.rpl
+++ b/testdata/autotrust_revtp.rpl
@@ -2,6 +2,7 @@
 server:
        target-fetch-policy: "0 0 0 0 0"
        log-time-ascii: yes
+       fake-sha1: yes
 stub-zone:
        name: "."
        stub-addr: 193.0.14.129         # K.ROOT-SERVERS.NET.

diff --git a/testdata/autotrust_revtp_read.rpl b/testdata/autotrust_revtp_read.rpl
index 80d505028322098d5c30fda81ea2abf4d0eeda9f..cd48a6339888c5251f499a9b2822f6da68910d5b 100644 (file)
--- a/testdata/autotrust_revtp_read.rpl
+++ b/testdata/autotrust_revtp_read.rpl
@@ -3,6 +3,7 @@ server:
        target-fetch-policy: "0 0 0 0 0"
        log-time-ascii: yes
        val-override-date: '20091018111500'
+       fake-sha1: yes
 stub-zone:
        name: "."
        stub-addr: 193.0.14.129         # K.ROOT-SERVERS.NET.

diff --git a/testdata/autotrust_revtp_use.rpl b/testdata/autotrust_revtp_use.rpl
index 37a097dcabb3a2dda76f24c1d86d94acda72855f..40223d334123c8aeeea6b2cda4b153e32fa72357 100644 (file)
--- a/testdata/autotrust_revtp_use.rpl
+++ b/testdata/autotrust_revtp_use.rpl
@@ -3,6 +3,7 @@ server:
        target-fetch-policy: "0 0 0 0 0"
        log-time-ascii: yes
        val-override-date: '20091018111500'
+       fake-sha1: yes
 stub-zone:
        name: "."
        stub-addr: 193.0.14.129         # K.ROOT-SERVERS.NET.

diff --git a/testdata/autotrust_rollalgo.rpl b/testdata/autotrust_rollalgo.rpl
index 4deec32a8348b964abab9d23bed18a3522b5b975..2381d399e99dfd8a657d5f03eb5b75d2b54b49ba 100644 (file)
--- a/testdata/autotrust_rollalgo.rpl
+++ b/testdata/autotrust_rollalgo.rpl
@@ -2,6 +2,7 @@
 server:
        target-fetch-policy: "0 0 0 0 0"
        log-time-ascii: yes
+       fake-sha1: yes
 stub-zone:
        name: "."
        stub-addr: 193.0.14.129         # K.ROOT-SERVERS.NET.

diff --git a/testdata/autotrust_rollalgo_unknown.rpl b/testdata/autotrust_rollalgo_unknown.rpl
index 621e5d13cc6fe3acabbbc43b9b32a8d05f06936b..9fedab2b80de16ee98150844a08cfcacbaedce07 100644 (file)
--- a/testdata/autotrust_rollalgo_unknown.rpl
+++ b/testdata/autotrust_rollalgo_unknown.rpl
@@ -2,6 +2,7 @@
 server:
        target-fetch-policy: "0 0 0 0 0"
        log-time-ascii: yes
+       fake-sha1: yes
 stub-zone:
        name: "."
        stub-addr: 193.0.14.129         # K.ROOT-SERVERS.NET.

diff --git a/testdata/autotrust_rollover.rpl b/testdata/autotrust_rollover.rpl
index 0b94418fe306c12c5c1145cb1958d76dda9c1b34..f45ae53c4534c40c9743f088aa97eb22fe68554c 100644 (file)
--- a/testdata/autotrust_rollover.rpl
+++ b/testdata/autotrust_rollover.rpl
@@ -2,6 +2,7 @@
 server:
        target-fetch-policy: "0 0 0 0 0"
        log-time-ascii: yes
+       fake-sha1: yes
 stub-zone:
        name: "."
        stub-addr: 193.0.14.129         # K.ROOT-SERVERS.NET.

diff --git a/testdata/autotrust_valid_use.rpl b/testdata/autotrust_valid_use.rpl
index d461da78a863976d1ad84adfd6386b73a62770a6..43d550026d613762641964019df5bb9c209fac16 100644 (file)
--- a/testdata/autotrust_valid_use.rpl
+++ b/testdata/autotrust_valid_use.rpl
@@ -2,6 +2,7 @@
 server:
        target-fetch-policy: "0 0 0 0 0"
        log-time-ascii: yes
+       fake-sha1: yes
 stub-zone:
        name: "."
        stub-addr: 193.0.14.129         # K.ROOT-SERVERS.NET.

diff --git a/testdata/black_data.rpl b/testdata/black_data.rpl
index dd703f62b1889b7c3030db2c267e1fcc6ceac9ac..945e8110732fbcd90175957c5c46002983ed0f92 100644 (file)
--- a/testdata/black_data.rpl
+++ b/testdata/black_data.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/black_dnskey.rpl b/testdata/black_dnskey.rpl
index 0537757c0de4814f2be4a0c45585b6f47bd14e77..a8662bb728e9242db6da374ac8d17152d25b8f34 100644 (file)
--- a/testdata/black_dnskey.rpl
+++ b/testdata/black_dnskey.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/black_ds.rpl b/testdata/black_ds.rpl
index 7638c1b3f67bab811f18cd3dee8a74bc03fae95d..be605e011127dfda9e0b246c60b6f5ee27d9844e 100644 (file)
--- a/testdata/black_ds.rpl
+++ b/testdata/black_ds.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/black_ds_entry.rpl b/testdata/black_ds_entry.rpl
index f77eecba423e59937d36444183f201c1e1e89129..42e56a50fa86bc67b06050fd0b4912ee9185c7f7 100644 (file)
--- a/testdata/black_ds_entry.rpl
+++ b/testdata/black_ds_entry.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/black_ent.rpl b/testdata/black_ent.rpl
index 5aa3d3b04916af26d17c552c877c9466eb8f4fee..2d84cd22d01c016128b2a460c8606f34baf9ae78 100644 (file)
--- a/testdata/black_ent.rpl
+++ b/testdata/black_ent.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/black_key_entry.rpl b/testdata/black_key_entry.rpl
index 6a644da1843b6763f5a4fa640a2350aabe99ca37..167c91b5e4b37efd01438e8ae44021a2e88b763e 100644 (file)
--- a/testdata/black_key_entry.rpl
+++ b/testdata/black_key_entry.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/black_prime.rpl b/testdata/black_prime.rpl
index bb89c39ac61793a1444c8121f4bedbfd379377e3..8e2ba492b670a622f55fe712f462444685e94778 100644 (file)
--- a/testdata/black_prime.rpl
+++ b/testdata/black_prime.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/black_prime_entry.rpl b/testdata/black_prime_entry.rpl
index 9bcb1857d65b2197b50d62a268e18f7760269ddd..0e092cb601037d582e7789c5e15f32ddc09f4ecf 100644 (file)
--- a/testdata/black_prime_entry.rpl
+++ b/testdata/black_prime_entry.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/dlv_anchor.rpl b/testdata/dlv_anchor.rpl
index d9388862ee4b1853eef542bfe774a3ee6603c078..e00ea99bd2a877160f656a225021608004982890 100644 (file)
--- a/testdata/dlv_anchor.rpl
+++ b/testdata/dlv_anchor.rpl
@@ -4,6 +4,7 @@ server:
        dlv-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/dlv_ask_higher.rpl b/testdata/dlv_ask_higher.rpl
index 365d3611f0a4bda623048236352177e9caf62343..1e108b7b6f5b27ea42ab72351c3bfc718568facb 100644 (file)
--- a/testdata/dlv_ask_higher.rpl
+++ b/testdata/dlv_ask_higher.rpl
@@ -4,6 +4,7 @@ server:
        dlv-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/dlv_below_ta.rpl b/testdata/dlv_below_ta.rpl
index 78d17f81b50296d70f1adf02624bb8216bd0d87a..2aa1ee107fbb530b7b17527f8783b5111d4ee0b8 100644 (file)
--- a/testdata/dlv_below_ta.rpl
+++ b/testdata/dlv_below_ta.rpl
@@ -5,6 +5,7 @@ server:
        trust-anchor: "example.net.     3600    IN      DS      30899 5 1 14188c885f20623ad1d3bec42798f3f951793e4c ; xehac-mofum-malyd-bomaf-pegit-fuzes-ganin-misiz-nigel-nozog-soxix"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/dlv_delegation.rpl b/testdata/dlv_delegation.rpl
index a921dc9fb2297eb9b49b00e1a720096f9eec6fc2..24e3af2e52991ab0ba44e72ecd9b332d3305009a 100644 (file)
--- a/testdata/dlv_delegation.rpl
+++ b/testdata/dlv_delegation.rpl
@@ -4,6 +4,7 @@ server:
        dlv-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/dlv_ds_lookup.rpl b/testdata/dlv_ds_lookup.rpl
index 3b2d79ad5fbeb6b7902502ecefe4c8b12a50f837..70c89d66781da8ce2427c9765a882a640c27c66f 100644 (file)
--- a/testdata/dlv_ds_lookup.rpl
+++ b/testdata/dlv_ds_lookup.rpl
@@ -4,6 +4,7 @@ server:
        dlv-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/dlv_insecure.rpl b/testdata/dlv_insecure.rpl
index d8e6aba20a60f0fe545684fcfa9b4ec5c87db106..b37d5f61e74513b6309314efb59b2ef7654f7c9c 100644 (file)
--- a/testdata/dlv_insecure.rpl
+++ b/testdata/dlv_insecure.rpl
@@ -5,6 +5,7 @@ server:
        val-override-date: "20070916134226"
        harden-referral-path: no
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/dlv_insecure_negcache.rpl b/testdata/dlv_insecure_negcache.rpl
index a0437750e27fbd1cd4847b33f80cea8244df2b5e..bafd41efb8959adc37f615072f3eedf4c29c4637 100644 (file)
--- a/testdata/dlv_insecure_negcache.rpl
+++ b/testdata/dlv_insecure_negcache.rpl
@@ -5,6 +5,7 @@ server:
        val-override-date: "20070916134226"
        harden-referral-path: no
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/dlv_keyretry.rpl b/testdata/dlv_keyretry.rpl
index 474d1e9d2c99257078ad5513fe3bb8a2f7375648..e7dc6c7c8d737801fe5b8d42005cc2db18ba8ae0 100644 (file)
--- a/testdata/dlv_keyretry.rpl
+++ b/testdata/dlv_keyretry.rpl
@@ -4,6 +4,7 @@ server:
        dlv-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/dlv_negnx.rpl b/testdata/dlv_negnx.rpl
index 79bdea774b50ee31453bb924fb51d21c9c5e3a34..218a57d85e614dcd78a5d35f64dfdfa67963a168 100644 (file)
--- a/testdata/dlv_negnx.rpl
+++ b/testdata/dlv_negnx.rpl
@@ -4,6 +4,7 @@ server:
        dlv-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/dlv_optout.rpl b/testdata/dlv_optout.rpl
index b0f84db575c80545105620dfaf76697cc7ce5211..7fbb560bd6e4a00b9cd4dcae216437e1e6df7ec1 100644 (file)
--- a/testdata/dlv_optout.rpl
+++ b/testdata/dlv_optout.rpl
@@ -5,6 +5,7 @@ server:
        trust-anchor: "example.net.     3600    IN      DS      30899 5 1 14188c885f20623ad1d3bec42798f3f951793e4c ; xehac-mofum-malyd-bomaf-pegit-fuzes-ganin-misiz-nigel-nozog-soxix"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/dlv_remove.rpl b/testdata/dlv_remove.rpl
index 1b8b642d8a8a71457b93d6f7be116f6b89b2b9e2..d503148c7d762dfe3ba4cd598f60b5fad46df3eb 100644 (file)
--- a/testdata/dlv_remove.rpl
+++ b/testdata/dlv_remove.rpl
@@ -4,6 +4,7 @@ server:
        dlv-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/dlv_remove_empty.rpl b/testdata/dlv_remove_empty.rpl
index 30afceda0328c637eaa2a209c70735c52717dc19..2e9b4bcf6638e41c932ffaea9905eb37b8a42999 100644 (file)
--- a/testdata/dlv_remove_empty.rpl
+++ b/testdata/dlv_remove_empty.rpl
@@ -4,6 +4,7 @@ server:
        dlv-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/dlv_remove_nodel.rpl b/testdata/dlv_remove_nodel.rpl
index 799e841e8ea797d1edd03f7c65bc15bf4c927422..1f2d94721abd7f99dd0c7833e08efdc6b1d7288e 100644 (file)
--- a/testdata/dlv_remove_nodel.rpl
+++ b/testdata/dlv_remove_nodel.rpl
@@ -5,6 +5,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/dlv_remove_pos.rpl b/testdata/dlv_remove_pos.rpl
index de7da447315598d66338b8cb74093d298fafdc8d..6309acbf10f331b58b549d34a65f82c80d602ba6 100644 (file)
--- a/testdata/dlv_remove_pos.rpl
+++ b/testdata/dlv_remove_pos.rpl
@@ -5,6 +5,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/dlv_unused.rpl b/testdata/dlv_unused.rpl
index 47650a060fba908169e164a96bd56da1c85d1803..4d323328513702bc7ae1b63a577141a10c0f04b6 100644 (file)
--- a/testdata/dlv_unused.rpl
+++ b/testdata/dlv_unused.rpl
@@ -5,6 +5,7 @@ server:
        trust-anchor: "example.net.     3600    IN      DS      30899 5 1 14188c885f20623ad1d3bec42798f3f951793e4c ; xehac-mofum-malyd-bomaf-pegit-fuzes-ganin-misiz-nigel-nozog-soxix"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/fwddlv_parse.rpl b/testdata/fwddlv_parse.rpl
index dd68cf246b189a6ccf03aba3808a175689d2f641..d79d31f402517c1978767433e7d249dd966f1ea2 100644 (file)
--- a/testdata/fwddlv_parse.rpl
+++ b/testdata/fwddlv_parse.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "dlv.isc.org. 5072    IN      DNSKEY  256 3 5 BEAAAAOlYGw53D+f01yCL5JsP0SB6EjYrnd0JYRBooAaGPT+Q0kpiN+7GviFh+nIazoB8e2Yv7mupgqkmIjObdcbGstYpUltdECdNpNmBvASKB9SBdtGeRvXXpORi3Qyxb9kHGG7SpzyYbc+KDVKnzYHB94pvqu3ZZpPFPBFtCibp/mkhw=="
        val-override-date: "20090617133009"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/iter_class_any.rpl b/testdata/iter_class_any.rpl
index 2242cbb9cc705d8ca65e65107b5dc70488eff9a0..a1fac46c9bcce08681489a9d0f2202ed4bca8f8a 100644 (file)
--- a/testdata/iter_class_any.rpl
+++ b/testdata/iter_class_any.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/iter_dnsseclame_bug.rpl b/testdata/iter_dnsseclame_bug.rpl
index a22dc96bc55178172dfb98b2c21accc21eb47804..cb5c549216ba085fab56ac4ef3d85f026796150e 100644 (file)
--- a/testdata/iter_dnsseclame_bug.rpl
+++ b/testdata/iter_dnsseclame_bug.rpl
@@ -2,6 +2,7 @@
 server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/iter_dnsseclame_ds.rpl b/testdata/iter_dnsseclame_ds.rpl
index 0e8405db94e99b6aa52fc656b632f01ebe60c429..ca7e8f35aeb2842719ec13bbb3f69277c83a3acd 100644 (file)
--- a/testdata/iter_dnsseclame_ds.rpl
+++ b/testdata/iter_dnsseclame_ds.rpl
@@ -2,6 +2,7 @@
 server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/iter_dnsseclame_ds_ok.rpl b/testdata/iter_dnsseclame_ds_ok.rpl
index 0ff322cd42bcd8bdd122a9b5632fdd4bceca3f0d..eb0ad34d4922e89434ebd0b53c13b2349e318346 100644 (file)
--- a/testdata/iter_dnsseclame_ds_ok.rpl
+++ b/testdata/iter_dnsseclame_ds_ok.rpl
@@ -3,6 +3,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/iter_dnsseclame_ta.rpl b/testdata/iter_dnsseclame_ta.rpl
index 9472dcc1a1e6b18f8862b16e07621e88528fa9da..6569949b274f1e2132aef3da56d81f51251224c3 100644 (file)
--- a/testdata/iter_dnsseclame_ta.rpl
+++ b/testdata/iter_dnsseclame_ta.rpl
@@ -2,6 +2,7 @@
 server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/iter_dnsseclame_ta_ok.rpl b/testdata/iter_dnsseclame_ta_ok.rpl
index e794b54fdaa86dce6a52ecca222cd2dda74e786d..9c2e0a5d762e9401ca25fa4bfe5df84cef0fc187 100644 (file)
--- a/testdata/iter_dnsseclame_ta_ok.rpl
+++ b/testdata/iter_dnsseclame_ta_ok.rpl
@@ -3,6 +3,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/iter_emptydp.rpl b/testdata/iter_emptydp.rpl
index 260888c32e51512e9630071051b092458d039171..8e1e4a68d6a7700aa0020fa1d65da880f47de5aa 100644 (file)
--- a/testdata/iter_emptydp.rpl
+++ b/testdata/iter_emptydp.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "3 2 1 0 0" # make sure it fetches for test
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/iter_emptydp_for_glue.rpl b/testdata/iter_emptydp_for_glue.rpl
index 91e76711ee9542df021ed0164fabfd8ffbb5ccc4..ab19a6b91e6501980db8f641c4f2414aa448d69f 100644 (file)
--- a/testdata/iter_emptydp_for_glue.rpl
+++ b/testdata/iter_emptydp_for_glue.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "3 2 1 0 0" # make sure it fetches for test
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/iter_primenoglue.rpl b/testdata/iter_primenoglue.rpl
index c3709dcb1adb413d1e8fc1295c717e76c6104221..3963a989ddeef9825b03289376682c012d2e867f 100644 (file)
--- a/testdata/iter_primenoglue.rpl
+++ b/testdata/iter_primenoglue.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "3 2 1 0 0" # make sure it fetches for test
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/iter_scrub_dname_rev.rpl b/testdata/iter_scrub_dname_rev.rpl
index 44939de0a17f7c488edc88022257ab034d530df6..dc259bf63d45af43a42dd2e8b0d0101986caa75e 100644 (file)
--- a/testdata/iter_scrub_dname_rev.rpl
+++ b/testdata/iter_scrub_dname_rev.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.net.    3600    IN      DNSKEY  256 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3 ;{id = 30899 (zsk), size = 512b}"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
         name: "."

diff --git a/testdata/iter_scrub_dname_sec.rpl b/testdata/iter_scrub_dname_sec.rpl
index 1ce74ca17785a32d98ec124aa500ed98f34739e0..6cfa19455e8aa5ffe9bbd78a72b770a450908dac 100644 (file)
--- a/testdata/iter_scrub_dname_sec.rpl
+++ b/testdata/iter_scrub_dname_sec.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.net.    3600    IN      DNSKEY  256 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3 ;{id = 30899 (zsk), size = 512b}"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
         name: "."

diff --git a/testdata/net_signed_servfail.rpl b/testdata/net_signed_servfail.rpl
index 9fd50df972e93f2af3af1b97b4d2bc143069e46a..23669ec2fb8ab4db614b841285fc312917046658 100644 (file)
--- a/testdata/net_signed_servfail.rpl
+++ b/testdata/net_signed_servfail.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: ". IN DNSKEY 257 3 5 AwEAAc3Z5DQDJpH4oPdNtC4BUQHk50XMD+dHr4r8psHmivIa83hxR5CRgCtd9sENCW9Ae8OIO19xw9t/RPaEAqQa+OE= ;{id = 55582 (ksk)}"
        val-override-date: "20110207110823"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/nomem_cnametopos.rpl b/testdata/nomem_cnametopos.rpl
index 68a0b96cbccc293fc7038ed85312c62092198efc..3bc66f753de1e9a2d78fd954e7cce588f62a987b 100644 (file)
--- a/testdata/nomem_cnametopos.rpl
+++ b/testdata/nomem_cnametopos.rpl
@@ -7,6 +7,7 @@ server:
        msg-cache-size: 8
        rrset-cache-size: 8
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/stop_nxdomain.rpl b/testdata/stop_nxdomain.rpl
index 9c57ec71bd47a2ba69ed4049f8e0db9434b13365..a36138e9100d15fb9d8d7db6b6b3b7852d803dde 100644 (file)
--- a/testdata/stop_nxdomain.rpl
+++ b/testdata/stop_nxdomain.rpl
@@ -4,6 +4,7 @@ server:
        harden-below-nxdomain: yes
        trust-anchor: ". IN DNSKEY 257 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3"
        val-override-date: "20070916134226"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/stop_nxdomain_minimised.rpl b/testdata/stop_nxdomain_minimised.rpl
index 8882b7bd9080abf9427831d1ee4ba8424fdfc88a..6b9cbef0ce885d31b66d41dc85c87d4465e94b2c 100644 (file)
--- a/testdata/stop_nxdomain_minimised.rpl
+++ b/testdata/stop_nxdomain_minimised.rpl
@@ -5,6 +5,7 @@ server:
        qname-minimisation: yes
        trust-anchor: ". IN DNSKEY 257 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3"
        val-override-date: "20070916134226"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_adbit.rpl b/testdata/val_adbit.rpl
index bffc9b71370c5787bdd50c2e490ca6e69f42a3a6..8e9b76e6f7e40a40f44ebc87bdc62bf8b723b0d7 100644 (file)
--- a/testdata/val_adbit.rpl
+++ b/testdata/val_adbit.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_adcopy.rpl b/testdata/val_adcopy.rpl
index 6cd9ad6ecdff614a63e7ebc6b7de5309f9b04776..04d04880b915bb196bfa5b1d44aa264ce654d9b2 100644 (file)
--- a/testdata/val_adcopy.rpl
+++ b/testdata/val_adcopy.rpl
@@ -4,6 +4,7 @@ server:
        #trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_anchor_nx.rpl b/testdata/val_anchor_nx.rpl
index be347b11d65c36ec359ad04cddf89195136d3d7a..dbb384dc9145f703bc4ff2bdffffe715b70511ea 100644 (file)
--- a/testdata/val_anchor_nx.rpl
+++ b/testdata/val_anchor_nx.rpl
@@ -5,6 +5,7 @@ server:
        trust-anchor: "sub.example.com.    3600    IN      DS      30899 RSASHA1 1 f7ed618f24d5e5202927e1d27bc2e84a141cb4b3"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_anchor_nx_nosig.rpl b/testdata/val_anchor_nx_nosig.rpl
index de9be6c456ccd12c76a55336175f4ab5678157d9..e36180b082f23748a072fb3f761eee511f1db008 100644 (file)
--- a/testdata/val_anchor_nx_nosig.rpl
+++ b/testdata/val_anchor_nx_nosig.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "sub.example.com.    3600    IN      DS      30899 RSASHA1 1 f7ed618f24d5e5202927e1d27bc2e84a141cb4b3"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_ans_dsent.rpl b/testdata/val_ans_dsent.rpl
index 1eb7778c2d4baecc7689f4119d2d72e7d505e7e3..dfac62879f91f62e9c8595b06ebbc6efc4413c20 100644 (file)
--- a/testdata/val_ans_dsent.rpl
+++ b/testdata/val_ans_dsent.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_ans_nx.rpl b/testdata/val_ans_nx.rpl
index 257377202bd2ca8071235c298428e4e284f63203..1e4cc8a1f661bf7d3a18a1d752e421da6f3e1fdc 100644 (file)
--- a/testdata/val_ans_nx.rpl
+++ b/testdata/val_ans_nx.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_any.rpl b/testdata/val_any.rpl
index 4285f49c5c32fbb1e966873410b6743761d5891a..388d25f6c45837c9927cae0463491f616f0b37ef 100644 (file)
--- a/testdata/val_any.rpl
+++ b/testdata/val_any.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_any_cname.rpl b/testdata/val_any_cname.rpl
index e85c14c20b53df6526359b8020d31e81473601ee..1477299a49c690359ce20b41221a6b9b7001d7a3 100644 (file)
--- a/testdata/val_any_cname.rpl
+++ b/testdata/val_any_cname.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_any_dname.rpl b/testdata/val_any_dname.rpl
index 6e94f9a4ee8f2fe310833ceb7a79df1227470a66..cd9ede9a1bb03b40638e94dd198cb7f4e2278bf3 100644 (file)
--- a/testdata/val_any_dname.rpl
+++ b/testdata/val_any_dname.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_cname_loop1.rpl b/testdata/val_cname_loop1.rpl
index 11d094cdd921a60754f4c28cd8f2a2d5966a9754..61fcdb7036fd52dce48bb531a1c7c846c9b34582 100644 (file)
--- a/testdata/val_cname_loop1.rpl
+++ b/testdata/val_cname_loop1.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_cname_loop2.rpl b/testdata/val_cname_loop2.rpl
index af293401b9c7f717f3ad1eb516d80ad26adc574e..26644bc14755c5fb12aab4f1cabbbedf408849a6 100644 (file)
--- a/testdata/val_cname_loop2.rpl
+++ b/testdata/val_cname_loop2.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_cname_loop3.rpl b/testdata/val_cname_loop3.rpl
index e34b0108db2d55920bf952fa7044c8c5efa2d4ac..fbd0d8abcf3c26979d4427d564d77fb70989c620 100644 (file)
--- a/testdata/val_cname_loop3.rpl
+++ b/testdata/val_cname_loop3.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_cnameinsectopos.rpl b/testdata/val_cnameinsectopos.rpl
index 29d1565f3cddf5778ba9c9f74474a10eb3ce4f2f..d7ac6deadbaa8ad769c2515f1699572a58485648 100644 (file)
--- a/testdata/val_cnameinsectopos.rpl
+++ b/testdata/val_cnameinsectopos.rpl
@@ -5,6 +5,7 @@ server:
        trust-anchor: "example.net.    3600    IN      DNSKEY  256 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3 ;{id = 30899 (zsk), size = 512b}"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_cnamenx_dblnsec.rpl b/testdata/val_cnamenx_dblnsec.rpl
index 77c50f60b5c0a525f5444709de60c92065da5788..85a58b5ef0cf7ca4ef0c9eb5607e9b69f3719bd8 100644 (file)
--- a/testdata/val_cnamenx_dblnsec.rpl
+++ b/testdata/val_cnamenx_dblnsec.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_cnamenx_rcodenx.rpl b/testdata/val_cnamenx_rcodenx.rpl
index 8d9c2d4fea548c17a802bf0d756aeb536d67e4a5..f4485921739a2eb1f9fd5598577e72da994f1b93 100644 (file)
--- a/testdata/val_cnamenx_rcodenx.rpl
+++ b/testdata/val_cnamenx_rcodenx.rpl
@@ -5,6 +5,7 @@ server:
        trust-anchor: "example.net.    3600    IN      DNSKEY  256 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3 ;{id = 30899 (zsk), size = 512b}"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_cnameqtype.rpl b/testdata/val_cnameqtype.rpl
index 66a894f6c2e6518cca9ac1a7d0b0708a45664cdc..0bd5b62e2ba28ebb7e7bb6c5d92cd8f071ad6614 100644 (file)
--- a/testdata/val_cnameqtype.rpl
+++ b/testdata/val_cnameqtype.rpl
@@ -5,6 +5,7 @@ server:
        trust-anchor: "example.net.    3600    IN      DNSKEY  256 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3 ;{id = 30899 (zsk), size = 512b}"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_cnametocloser.rpl b/testdata/val_cnametocloser.rpl
index c3377c2395ca70e650d857320a18e8bfe1f7503a..ef20c5674ab7718c1b7e55ab776fef4d7758a41a 100644 (file)
--- a/testdata/val_cnametocloser.rpl
+++ b/testdata/val_cnametocloser.rpl
@@ -3,6 +3,7 @@ server:
        trust-anchor: "example.com.     3600    IN      DS      30899 5 1 d4bf9d2e10f6d76840d42ef5913022abcd0bf512"
        trust-anchor: "a.b.example.com. 3600    IN      DNSKEY  257 3 5 AwEAAas/cAhCFXvBUgTSNZCvQp0pLx1dY+7rXR0hH4/3EUgWmsmbYUpI1qD0xhwKD/oYGEwAm291fyWJ9c0oVxXDEK8="
        val-override-date: "20091113091234"
+       fake-sha1: yes
 
 forward-zone:
        name: "."

diff --git a/testdata/val_cnametocloser_nosig.rpl b/testdata/val_cnametocloser_nosig.rpl
index 80d1020037ebe5499afc31163c0a48a068415a43..53793aa3e3eb664fccab3f6f59c0372ef7af31a4 100644 (file)
--- a/testdata/val_cnametocloser_nosig.rpl
+++ b/testdata/val_cnametocloser_nosig.rpl
@@ -3,6 +3,7 @@ server:
        trust-anchor: "example.com.     3600    IN      DS      30899 5 1 d4bf9d2e10f6d76840d42ef5913022abcd0bf512"
        trust-anchor: "a.b.example.com. 3600    IN      DNSKEY  257 3 5 AwEAAas/cAhCFXvBUgTSNZCvQp0pLx1dY+7rXR0hH4/3EUgWmsmbYUpI1qD0xhwKD/oYGEwAm291fyWJ9c0oVxXDEK8="
        val-override-date: "20091113091234"
+       fake-sha1: yes
 
 forward-zone:
        name: "."

diff --git a/testdata/val_cnametocnamewctoposwc.rpl b/testdata/val_cnametocnamewctoposwc.rpl
index 56faf4130125282467b23fcdd0777e879c595261..e7d9d9460481d58469d0a4482fff43b09d8a6ed1 100644 (file)
--- a/testdata/val_cnametocnamewctoposwc.rpl
+++ b/testdata/val_cnametocnamewctoposwc.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    IN      DNSKEY  257 3 8 AwEAAdL6YJdvoKQJEt/SgB6MrbQ2RDwnrcQQb6bDE8FpGgLen6hvF31ntVsZ3RZzhCmwL6lvumOLFIRKaP9ZBEVutT9iMoF2dNRbT0TCUrv6uQNHcuCZ0BJhuDNBU42f3yOnfFv7PKxd0NP+yFHJkvDQAVLMB5GeUQuYnvgQGeZsf/3b"
        val-override-date: "-1"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_cnametodname.rpl b/testdata/val_cnametodname.rpl
index 43561d280777f95003979b0042c51e0ff5526f21..8f60f7e540bccf563a3e25e297d4b096df014564 100644 (file)
--- a/testdata/val_cnametodname.rpl
+++ b/testdata/val_cnametodname.rpl
@@ -5,6 +5,7 @@ server:
        trust-anchor: "example.net.    3600    IN      DNSKEY  256 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3 ;{id = 30899 (zsk), size = 512b}"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_cnametodnametocnametopos.rpl b/testdata/val_cnametodnametocnametopos.rpl
index 0a3a323605610aeedd9f0c1f028644d730324e8a..5c2d578edbfac8b283f6e688c8c38b71df40996f 100644 (file)
--- a/testdata/val_cnametodnametocnametopos.rpl
+++ b/testdata/val_cnametodnametocnametopos.rpl
@@ -6,6 +6,7 @@ server:
        trust-anchor: "example.org.    3600    IN      DNSKEY  256 3 3 ALXLUsWqUrY3JYER3T4TBJIIs70j+sDS/UT2QRp61SE7S3EEXopNXoFE73JLRmvpi/UrOO/Vz4Se6wXv/CYCKjGw06U4WRgRYXcpEhJROyNapmdIKSxhOzfLVE1gqA0PweZR8dtY3aNQSRn3sPpwJr6Mi/PqQKAMMrZ9ckJpf1+bQMOOvxgzz2U1GS18b3yZKcgTMEaJzd/GZYzi/BN2DzQ0MsrSwYXfsNLFOBbs8PJMW4LYIxeeOe6rUgkWOF7CC9Dh/dduQ1QrsJhmZAEFfd6ByYV+ ;{id = 2854 (zsk), size = 1688b}"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_cnametoinsecure.rpl b/testdata/val_cnametoinsecure.rpl
index 538e9fb88efcd4d5b2db7e2dbcdfe7f91f40d0f8..c39c5e70eb4c631b4641aa98233c0cce25b4a92c 100644 (file)
--- a/testdata/val_cnametoinsecure.rpl
+++ b/testdata/val_cnametoinsecure.rpl
@@ -3,6 +3,7 @@ server:
        trust-anchor: "example.com.     3600    IN      DNSKEY  256 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3 ;{id = 30899 (zsk), size = 512b}"
        trust-anchor: "example.org.     3600    IN      DNSKEY  256 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3 ;{id = 30899 (zsk), size = 512b}"
        val-override-date: "20091011000000"
+       fake-sha1: yes
 
 forward-zone:
        name: "."

diff --git a/testdata/val_cnametonodata.rpl b/testdata/val_cnametonodata.rpl
index b930b5607dd67939e521792b17769e723aebca9f..3e323ff7fc4245623748b7450318ed3d689f77b2 100644 (file)
--- a/testdata/val_cnametonodata.rpl
+++ b/testdata/val_cnametonodata.rpl
@@ -5,6 +5,7 @@ server:
        trust-anchor: "example.net.    3600    IN      DNSKEY  256 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3 ;{id = 30899 (zsk), size = 512b}"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_cnametonodata_nonsec.rpl b/testdata/val_cnametonodata_nonsec.rpl
index 588273fba008cbba656b49d6f45c07065c6f2d07..097fc683acb5a38a55f69d72d275c15724001272 100644 (file)
--- a/testdata/val_cnametonodata_nonsec.rpl
+++ b/testdata/val_cnametonodata_nonsec.rpl
@@ -5,6 +5,7 @@ server:
        trust-anchor: "example.net.    3600    IN      DNSKEY  256 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3 ;{id = 30899 (zsk), size = 512b}"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_cnametonsec.rpl b/testdata/val_cnametonsec.rpl
index 6b32b8da55d848c6ad263c3a0d4ce2de61ed59b3..493b40ccdb46e31533da24302a4530331708bf6f 100644 (file)
--- a/testdata/val_cnametonsec.rpl
+++ b/testdata/val_cnametonsec.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_cnametonx.rpl b/testdata/val_cnametonx.rpl
index cc3315608dbac2e556a36479f30e3b36d112aeec..c0b8a50da13a49151c97f514a03b9693dc60622d 100644 (file)
--- a/testdata/val_cnametonx.rpl
+++ b/testdata/val_cnametonx.rpl
@@ -5,6 +5,7 @@ server:
        trust-anchor: "example.net.    3600    IN      DNSKEY  256 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3 ;{id = 30899 (zsk), size = 512b}"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_cnametooptin.rpl b/testdata/val_cnametooptin.rpl
index aa58d07f01bdb73d09001fda951e370eafac1905..751d802cce16fbdc91b99bb47d43a138503830e6 100644 (file)
--- a/testdata/val_cnametooptin.rpl
+++ b/testdata/val_cnametooptin.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_cnametooptout.rpl b/testdata/val_cnametooptout.rpl
index 0150a7d87c98ec15ee5f30b414716b440f3bad20..c520383820e145cf81797e6d0240f3bc7e6803a5 100644 (file)
--- a/testdata/val_cnametooptout.rpl
+++ b/testdata/val_cnametooptout.rpl
@@ -2,6 +2,7 @@
 server:
        trust-anchor: "GOV. DS 26079 7 2 4ED5FFBC8A40262B56E1232135B929192804ACC006930D087AAB38A611C89041"
        val-override-date: "20091113091234"
+       fake-sha1: yes
 
 forward-zone:
        name: "."

diff --git a/testdata/val_cnametopos.rpl b/testdata/val_cnametopos.rpl
index 9ff4020a909a53982ea91997ee56ee1da3130414..822f55e5902cb1994fb77c7dc0046d542841ba0d 100644 (file)
--- a/testdata/val_cnametopos.rpl
+++ b/testdata/val_cnametopos.rpl
@@ -5,6 +5,7 @@ server:
        trust-anchor: "example.net.    3600    IN      DNSKEY  256 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3 ;{id = 30899 (zsk), size = 512b}"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_cnametoposnowc.rpl b/testdata/val_cnametoposnowc.rpl
index 6e8ff4f27d8127e8649f1764a35c56c52369f59a..7753a555390154b075553dabb685289fd5ce86b2 100644 (file)
--- a/testdata/val_cnametoposnowc.rpl
+++ b/testdata/val_cnametoposnowc.rpl
@@ -5,6 +5,7 @@ server:
        trust-anchor: "example.net.    3600    IN      DNSKEY  256 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3 ;{id = 30899 (zsk), size = 512b}"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_cnametoposwc.rpl b/testdata/val_cnametoposwc.rpl
index 114fa705acb814bb2bba8c666e5b5ad45675d8dd..1ceb297fba994a8cebb0890e085628f3ea20e7c7 100644 (file)
--- a/testdata/val_cnametoposwc.rpl
+++ b/testdata/val_cnametoposwc.rpl
@@ -5,6 +5,7 @@ server:
        trust-anchor: "example.net.    3600    IN      DNSKEY  256 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3 ;{id = 30899 (zsk), size = 512b}"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_cnamewctonodata.rpl b/testdata/val_cnamewctonodata.rpl
index 83aec7a025e8d9b7bda14098afc04b133dabedc3..e2095f979636923cb4f9531e82008e609622e2a1 100644 (file)
--- a/testdata/val_cnamewctonodata.rpl
+++ b/testdata/val_cnamewctonodata.rpl
@@ -5,6 +5,7 @@ server:
        trust-anchor: "example.net.    3600    IN      DNSKEY  256 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3 ;{id = 30899 (zsk), size = 512b}"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_cnamewctonx.rpl b/testdata/val_cnamewctonx.rpl
index 7da96e259f39de76ca901db0444a8d1581049d0e..638b665587c471372f8c921ac3540d054f88e6a5 100644 (file)
--- a/testdata/val_cnamewctonx.rpl
+++ b/testdata/val_cnamewctonx.rpl
@@ -5,6 +5,7 @@ server:
        trust-anchor: "example.net.    3600    IN      DNSKEY  256 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3 ;{id = 30899 (zsk), size = 512b}"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_cnamewctoposwc.rpl b/testdata/val_cnamewctoposwc.rpl
index 33fbc45511f8d9e8bdb54b624cca7f9e753676b5..731336aa46d52c0a90434b02c6befa588daaab34 100644 (file)
--- a/testdata/val_cnamewctoposwc.rpl
+++ b/testdata/val_cnamewctoposwc.rpl
@@ -5,6 +5,7 @@ server:
        trust-anchor: "example.net.    3600    IN      DNSKEY  256 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3 ;{id = 30899 (zsk), size = 512b}"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_deleg_nons.rpl b/testdata/val_deleg_nons.rpl
index 83cf6923292463d12fe3cf9452bf3623d959a748..bdc68c465f34e9382344f50654639a0bcfb09388 100644 (file)
--- a/testdata/val_deleg_nons.rpl
+++ b/testdata/val_deleg_nons.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_dnametoolong.rpl b/testdata/val_dnametoolong.rpl
index b5eea56c6b3ee5560814a8c7ce677bf350db7161..638e2ef18215e25f0e03139aad5f3342dd73da27 100644 (file)
--- a/testdata/val_dnametoolong.rpl
+++ b/testdata/val_dnametoolong.rpl
@@ -5,6 +5,7 @@ server:
        trust-anchor: "example.net.    3600    IN      DNSKEY  256 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3 ;{id = 30899 (zsk), size = 512b}"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_dnametopos.rpl b/testdata/val_dnametopos.rpl
index faeb40f9dac40a5abb1dd486b4e7dec69ade4d02..ed2948a9b8ec944cbc3fd6b5a2f522a14bd29e08 100644 (file)
--- a/testdata/val_dnametopos.rpl
+++ b/testdata/val_dnametopos.rpl
@@ -5,6 +5,7 @@ server:
        trust-anchor: "example.net.    3600    IN      DNSKEY  256 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3 ;{id = 30899 (zsk), size = 512b}"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_dnametoposwc.rpl b/testdata/val_dnametoposwc.rpl
index e1e91d4947174c2896e4c62e9af1b2e0c36e0e86..c5856150e8816cd3d8bd3475e1b20e0defb31337 100644 (file)
--- a/testdata/val_dnametoposwc.rpl
+++ b/testdata/val_dnametoposwc.rpl
@@ -5,6 +5,7 @@ server:
        trust-anchor: "example.net.    3600    IN      DNSKEY  256 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3 ;{id = 30899 (zsk), size = 512b}"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_dnamewc.rpl b/testdata/val_dnamewc.rpl
index c34b9e0f9d2d4e263e50617ab121d01457fdd088..9d74ee7ce14dbcb743c780336ec38932c6c6159b 100644 (file)
--- a/testdata/val_dnamewc.rpl
+++ b/testdata/val_dnamewc.rpl
@@ -5,6 +5,7 @@ server:
        trust-anchor: "example.net.    3600    IN      DNSKEY  256 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3 ;{id = 30899 (zsk), size = 512b}"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_ds_afterprime.rpl b/testdata/val_ds_afterprime.rpl
index 0b203d2676f23a8b06b14a74d30030600c9e4cbb..deac3e550f2cf8c08f5ffedfeeea773bfc320568 100644 (file)
--- a/testdata/val_ds_afterprime.rpl
+++ b/testdata/val_ds_afterprime.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_ds_cname.rpl b/testdata/val_ds_cname.rpl
index 95fcf5be7e978c0d722d1ddc0a281c30381fb87e..85631e53a320eb420a284500fa8e1c578c197d05 100644 (file)
--- a/testdata/val_ds_cname.rpl
+++ b/testdata/val_ds_cname.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_ds_cnamesub.rpl b/testdata/val_ds_cnamesub.rpl
index d70e2ae29000000fc5031ce39e4d8fb5d865f1dc..618c3caba1cdf1536e33e2fbaf41d7c2d4e2e26b 100644 (file)
--- a/testdata/val_ds_cnamesub.rpl
+++ b/testdata/val_ds_cnamesub.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_ds_gost.crpl b/testdata/val_ds_gost.crpl
index 10bb7fbd4c3ed926bee8846d0eebc73abb017c1e..ec54cd94857c4b1c74539754c621d26843a89b69 100644 (file)
--- a/testdata/val_ds_gost.crpl
+++ b/testdata/val_ds_gost.crpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_ds_gost_downgrade.crpl b/testdata/val_ds_gost_downgrade.crpl
index b8caae2fafaa3656cc2670a15eb1bb7d91cb8443..8f10a36e1062dce92fbde3ca23361bf0fc5a304e 100644 (file)
--- a/testdata/val_ds_gost_downgrade.crpl
+++ b/testdata/val_ds_gost_downgrade.crpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_ds_sha2.crpl b/testdata/val_ds_sha2.crpl
index 6b92e230f48659c16fd29f71e513b8f17b85f269..9ecba61bc61820937abce92d4f5be314d24fae43 100644 (file)
--- a/testdata/val_ds_sha2.crpl
+++ b/testdata/val_ds_sha2.crpl
@@ -5,6 +5,7 @@ server:
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
        fake-dsa: yes
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_ds_sha2_downgrade.crpl b/testdata/val_ds_sha2_downgrade.crpl
index ea4a48105cd4892980ff7201ba217934a430af16..191a2b9cbd93bd8de37e80565dbfad3ad50dcb41 100644 (file)
--- a/testdata/val_ds_sha2_downgrade.crpl
+++ b/testdata/val_ds_sha2_downgrade.crpl
@@ -5,6 +5,7 @@ server:
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
        fake-dsa: yes
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_dsnsec.rpl b/testdata/val_dsnsec.rpl
index 5e55b2ba03eb15a9e151589dcb66c9e83ac39ae2..f0facea9770c65905812d0b7465cec01812559f2 100644 (file)
--- a/testdata/val_dsnsec.rpl
+++ b/testdata/val_dsnsec.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_entds.rpl b/testdata/val_entds.rpl
index 6ad86271a2a15bdbaabe0a586b7b3857c9522635..9a0b539bb74888ac489f98670d4bc800ccaeb3dd 100644 (file)
--- a/testdata/val_entds.rpl
+++ b/testdata/val_entds.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_faildnskey.rpl b/testdata/val_faildnskey.rpl
index 7d0350f1a1a38ca285959a783b7900812d3c6eb4..4fb7d70c20028973b168f3527334e9a73c84b5a9 100644 (file)
--- a/testdata/val_faildnskey.rpl
+++ b/testdata/val_faildnskey.rpl
@@ -5,6 +5,7 @@ server:
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
        # test that default value of harden-dnssec-stripped is still yes.
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_faildnskey_ok.rpl b/testdata/val_faildnskey_ok.rpl
index 3764000f10d8038639db0bffa1fca9bc3c663902..5a50b0fb5e43f97906da1e16dc31ed3d5d19a314 100644 (file)
--- a/testdata/val_faildnskey_ok.rpl
+++ b/testdata/val_faildnskey_ok.rpl
@@ -5,6 +5,7 @@ server:
        val-override-date: "20070916134226"
        harden-dnssec-stripped: no
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_fwdds.rpl b/testdata/val_fwdds.rpl
index 26e30f44c957d2de01005c1ac318e206b1525740..f6c23c6cd5e5dc6d24a42f472c8ea3deb0be1025 100644 (file)
--- a/testdata/val_fwdds.rpl
+++ b/testdata/val_fwdds.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_keyprefetch.rpl b/testdata/val_keyprefetch.rpl
index 9b927b20ef4cd018976b6823acda8cbfab3867e0..4920375b7ee19896f1221b75bb3f28a213a551d8 100644 (file)
--- a/testdata/val_keyprefetch.rpl
+++ b/testdata/val_keyprefetch.rpl
@@ -5,6 +5,7 @@ server:
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
        prefetch-key: yes
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_keyprefetch_verify.rpl b/testdata/val_keyprefetch_verify.rpl
index 5f044cc2f28bdabd9049d6061e756153f121312d..3c3ea4d551652aaca6654105a8385cb7212fa2af 100644 (file)
--- a/testdata/val_keyprefetch_verify.rpl
+++ b/testdata/val_keyprefetch_verify.rpl
@@ -6,6 +6,7 @@ server:
        target-fetch-policy: "0 0 0 0 0"
        prefetch-key: yes
        prefetch: yes
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_mal_wc.rpl b/testdata/val_mal_wc.rpl
index d834fe64804801e8301fbca544ee39b5469f8582..3bd7794488ee95f4be573dd524e0558d1601ea50 100644 (file)
--- a/testdata/val_mal_wc.rpl
+++ b/testdata/val_mal_wc.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_negcache_ds.rpl b/testdata/val_negcache_ds.rpl
index c7739e34cba5c02ca7998ea3ac567243c4e72924..78d823793395c77705dcc2ae6cced7eed709f29f 100644 (file)
--- a/testdata/val_negcache_ds.rpl
+++ b/testdata/val_negcache_ds.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_negcache_dssoa.rpl b/testdata/val_negcache_dssoa.rpl
index 3f35bbf3b5e73a010e62ee1a50e42d9b64a65293..a74e80969b2aced744a2cebdaca9d25cb4ff2285 100644 (file)
--- a/testdata/val_negcache_dssoa.rpl
+++ b/testdata/val_negcache_dssoa.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_noadwhennodo.rpl b/testdata/val_noadwhennodo.rpl
index 13015dbdbd60e715ce9909f47b2e0155e3fd0d70..8f80b8b9f540f7ef608771f9a49485807fc76021 100644 (file)
--- a/testdata/val_noadwhennodo.rpl
+++ b/testdata/val_noadwhennodo.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_nodata.rpl b/testdata/val_nodata.rpl
index 1dbbb77842df2ea3f1991550ac6d9f033e2de9fc..73987685ba887197d342865b8e353403e3df49aa 100644 (file)
--- a/testdata/val_nodata.rpl
+++ b/testdata/val_nodata.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_nodata_ent.rpl b/testdata/val_nodata_ent.rpl
index 467bdf5f353a9df47a2162ff48da7ce694808216..c67c4016ca480dd8a6a53c208ee480b9547b2222 100644 (file)
--- a/testdata/val_nodata_ent.rpl
+++ b/testdata/val_nodata_ent.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_nodata_entnx.rpl b/testdata/val_nodata_entnx.rpl
index 935cf7ce7ce76c69fa64c515b4f4b0d2df900746..298f8a2aea00f7117c0b96a2ae3bc2099d197edb 100644 (file)
--- a/testdata/val_nodata_entnx.rpl
+++ b/testdata/val_nodata_entnx.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    IN      DS      29332 8 2 751f8b755718a7b4ef8920a4b42407520889c3d2142a64f6ffad9e12fa9fc262"
        val-override-date: "20140301134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_nodata_entwc.rpl b/testdata/val_nodata_entwc.rpl
index 03c09a207dcb0982942e1381c929ae0d3cdf1d54..82e8258eaf1e294cd6a6f06e3f54aa55ef451328 100644 (file)
--- a/testdata/val_nodata_entwc.rpl
+++ b/testdata/val_nodata_entwc.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_nodata_failsig.rpl b/testdata/val_nodata_failsig.rpl
index 27d5d30c83146b23f5a641e0c182c60cee51261c..44f7b4160d22259d51885f48a6629d403e98a7b9 100644 (file)
--- a/testdata/val_nodata_failsig.rpl
+++ b/testdata/val_nodata_failsig.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_nodata_hasdata.rpl b/testdata/val_nodata_hasdata.rpl
index f5321182a5edd22bbc03046fe6bd0262eb82d896..47992da3a837a3219a921d4c239992eaed037cc9 100644 (file)
--- a/testdata/val_nodata_hasdata.rpl
+++ b/testdata/val_nodata_hasdata.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_nodata_zonecut.rpl b/testdata/val_nodata_zonecut.rpl
index e9e50a7ce603a733aa25ed36996a53c789c53a65..9f610654615cfce896846cd19a35f38c76fcec11 100644 (file)
--- a/testdata/val_nodata_zonecut.rpl
+++ b/testdata/val_nodata_zonecut.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_nodatawc.rpl b/testdata/val_nodatawc.rpl
index 30e38b605144d4aa8ae3cfbea542192491b40be2..6ac40b79ae3a69a4eb6596013ec84c09a172ab27 100644 (file)
--- a/testdata/val_nodatawc.rpl
+++ b/testdata/val_nodatawc.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_nodatawc_badce.rpl b/testdata/val_nodatawc_badce.rpl
index dcf8697db0cb58981da6f87d11f3f19e472958fa..2811ff8468102abe21363b1f37677ab3603fbe5e 100644 (file)
--- a/testdata/val_nodatawc_badce.rpl
+++ b/testdata/val_nodatawc_badce.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_nodatawc_nodeny.rpl b/testdata/val_nodatawc_nodeny.rpl
index 52dcb0f7842fe19249eb48b2b4685a723ab29fa0..1c1adbd251dc1929464de577f69fb77fda4f36c5 100644 (file)
--- a/testdata/val_nodatawc_nodeny.rpl
+++ b/testdata/val_nodatawc_nodeny.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_nodatawc_one.rpl b/testdata/val_nodatawc_one.rpl
index 88d66effb4303dc8d7d9964856578c42d4ad579d..54f915cd8a1b8f37b491cc8b0f3d0663835d9780 100644 (file)
--- a/testdata/val_nodatawc_one.rpl
+++ b/testdata/val_nodatawc_one.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_nokeyprime.rpl b/testdata/val_nokeyprime.rpl
index 5eae44f8198ef34525bf517916865b7d2e15a22e..22653ad1a983768344491649aa70aedd2789390d 100644 (file)
--- a/testdata/val_nokeyprime.rpl
+++ b/testdata/val_nokeyprime.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_nsec3_b1_nameerror.rpl b/testdata/val_nsec3_b1_nameerror.rpl
index dbe1f9aa3cf1dfa945c65552bd6f6c7e50dbc51d..3e4c9f72adc58f403e094ffbcd434db2d9cad93c 100644 (file)
--- a/testdata/val_nsec3_b1_nameerror.rpl
+++ b/testdata/val_nsec3_b1_nameerror.rpl
@@ -3,6 +3,7 @@ server:
         trust-anchor: "example. DNSKEY  257 3 7 AwEAAcUlFV1vhmqx6NSOUOq2R/dsR7Xm3upJ ( j7IommWSpJABVfW8Q0rOvXdM6kzt+TAu92L9 AbsUdblMFin8CVF3n4s= )"
        val-override-date: "20120420235959"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_nsec3_b1_nameerror_noce.rpl b/testdata/val_nsec3_b1_nameerror_noce.rpl
index 6dca24cc50ece46dce414f727e8e8a380837b858..f3262752048e6f8c6e4bc7b1e788691239010db4 100644 (file)
--- a/testdata/val_nsec3_b1_nameerror_noce.rpl
+++ b/testdata/val_nsec3_b1_nameerror_noce.rpl
@@ -3,6 +3,7 @@ server:
        trust-anchor: "example. DNSKEY  257 3 7 AwEAAcUlFV1vhmqx6NSOUOq2R/dsR7Xm3upJ ( j7IommWSpJABVfW8Q0rOvXdM6kzt+TAu92L9 AbsUdblMFin8CVF3n4s= )"
        val-override-date: "20120420235959"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_nsec3_b1_nameerror_nonc.rpl b/testdata/val_nsec3_b1_nameerror_nonc.rpl
index b9d32d32e0de0c3ee91bf39a74f6c4e32f74d56a..993e943b0d6aa34744a0b9dc1bcdcdd7242e8f64 100644 (file)
--- a/testdata/val_nsec3_b1_nameerror_nonc.rpl
+++ b/testdata/val_nsec3_b1_nameerror_nonc.rpl
@@ -3,6 +3,7 @@ server:
         trust-anchor: "example. DNSKEY  257 3 7 AwEAAcUlFV1vhmqx6NSOUOq2R/dsR7Xm 3upJ ( j7IommWSpJABVfW8Q0rOvXdM6kzt+TAu92L9 AbsUdblMFin8CVF3n4s= )"
        val-override-date: "20120420235959"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_nsec3_b1_nameerror_nowc.rpl b/testdata/val_nsec3_b1_nameerror_nowc.rpl
index 1293aa919d1419eff7f4c4ced3fad38d16f91f2b..db208bbe17cc616200a24bf2039946c53cf06f19 100644 (file)
--- a/testdata/val_nsec3_b1_nameerror_nowc.rpl
+++ b/testdata/val_nsec3_b1_nameerror_nowc.rpl
@@ -3,6 +3,7 @@ server:
         trust-anchor: "example. DNSKEY  257 3 7 AwEAAcUlFV1vhmqx6NSOUOq2R/dsR7Xm3upJ ( j7IommWSpJABVfW8Q0rOvXdM6kzt+TAu92L9 AbsUdblMFin8CVF3n4s= )"
        val-override-date: "20120420235959"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_nsec3_b21_nodataent.rpl b/testdata/val_nsec3_b21_nodataent.rpl
index 10f51f83ab8f727db478d0bec9b1c80ca4dc361c..0f41f1e9cfcf01c7a8c26b583e7f29e9d3d2a938 100644 (file)
--- a/testdata/val_nsec3_b21_nodataent.rpl
+++ b/testdata/val_nsec3_b21_nodataent.rpl
@@ -3,6 +3,7 @@ server:
        trust-anchor: "example. DNSKEY  257 3 7 AwEAAcUlFV1vhmqx6NSOUOq2R/dsR7Xm3upJ ( j7IommWSpJABVfW8Q0rOvXdM6kzt+TAu92L9 AbsUdblMFin8CVF3n4s= )"
        val-override-date: "20120420235959"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_nsec3_b21_nodataent_wr.rpl b/testdata/val_nsec3_b21_nodataent_wr.rpl
index 6c2f44ef57488600df3a924e86b37f0ce1b5720e..7060fb9b798614e713bae92a4a8cef5566bb946a 100644 (file)
--- a/testdata/val_nsec3_b21_nodataent_wr.rpl
+++ b/testdata/val_nsec3_b21_nodataent_wr.rpl
@@ -3,6 +3,7 @@ server:
        trust-anchor: "example. DNSKEY  257 3 7 AwEAAcUlFV1vhmqx6NSOUOq2R/dsR7Xm3upJ ( j7IommWSpJABVfW8Q0rOvXdM6kzt+TAu92L9 AbsUdblMFin8CVF3n4s= )"
        val-override-date: "20120420235959"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_nsec3_b2_nodata.rpl b/testdata/val_nsec3_b2_nodata.rpl
index 11af269672628ca70e0828c04f27bda8cf965ab4..8ea653f6b3d35f93e455897bfabfe32710250be7 100644 (file)
--- a/testdata/val_nsec3_b2_nodata.rpl
+++ b/testdata/val_nsec3_b2_nodata.rpl
@@ -3,6 +3,7 @@ server:
         trust-anchor: "example. DNSKEY  257 3 7 AwEAAcUlFV1vhmqx6NSOUOq2R/dsR7Xm3upJ ( j7IommWSpJABVfW8Q0rOvXdM6kzt+TAu92L9 AbsUdblMFin8CVF3n4s= )"
        val-override-date: "20120420235959"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_nsec3_b2_nodata_nons.rpl b/testdata/val_nsec3_b2_nodata_nons.rpl
index 8311fffc07ba8ee46c2a14f980a04a3f70944a05..85669401b134f9af735c44bafdde08537249b3b8 100644 (file)
--- a/testdata/val_nsec3_b2_nodata_nons.rpl
+++ b/testdata/val_nsec3_b2_nodata_nons.rpl
@@ -3,6 +3,7 @@ server:
         trust-anchor: "example. DNSKEY  257 3 7 AwEAAcUlFV1vhmqx6NSOUOq2R/dsR7Xm3upJ ( j7IommWSpJABVfW8Q0rOvXdM6kzt+TAu92L9 AbsUdblMFin8CVF3n4s= )"
        val-override-date: "20120420235959"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_nsec3_b3_optout.rpl b/testdata/val_nsec3_b3_optout.rpl
index 5cde1a9bcf6230a22e9d04c9fe45ecc7b12d242e..ea89e82bf64a019c211283a105c1a2becb32ef46 100644 (file)
--- a/testdata/val_nsec3_b3_optout.rpl
+++ b/testdata/val_nsec3_b3_optout.rpl
@@ -3,6 +3,7 @@ server:
         trust-anchor: "example. DNSKEY  257 3 7 AwEAAcUlFV1vhmqx6NSOUOq2R/dsR7Xm3upJ ( j7IommWSpJABVfW8Q0rOvXdM6kzt+TAu92L9 AbsUdblMFin8CVF3n4s= )"
        val-override-date: "20120420235959"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_nsec3_b3_optout_negcache.rpl b/testdata/val_nsec3_b3_optout_negcache.rpl
index c2468bab82a78690b8e9e0941dc2d2e706c17a51..06bcdb18cbcce855b836575d73ef943ed7d209a1 100644 (file)
--- a/testdata/val_nsec3_b3_optout_negcache.rpl
+++ b/testdata/val_nsec3_b3_optout_negcache.rpl
@@ -3,6 +3,7 @@ server:
         trust-anchor: "example. DNSKEY  257 3 7 AwEAAcUlFV1vhmqx6NSOUOq2R/dsR7Xm3upJ ( j7IommWSpJABVfW8Q0rOvXdM6kzt+TAu92L9 AbsUdblMFin8CVF3n4s= )"
        val-override-date: "20120420235959"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_nsec3_b3_optout_noce.rpl b/testdata/val_nsec3_b3_optout_noce.rpl
index e61aba83e24969f26dfa212ec7f2893743e8e4ba..ce476b62c4b941170d531ea0f9ec75950c650750 100644 (file)
--- a/testdata/val_nsec3_b3_optout_noce.rpl
+++ b/testdata/val_nsec3_b3_optout_noce.rpl
@@ -3,6 +3,7 @@ server:
         trust-anchor: "example. DNSKEY  257 3 7 AwEAAcUlFV1vhmqx6NSOUOq2R/dsR7Xm3upJ ( j7IommWSpJABVfW8Q0rOvXdM6kzt+TAu92L9 AbsUdblMFin8CVF3n4s= )"
        val-override-date: "20120420235959"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_nsec3_b3_optout_nonc.rpl b/testdata/val_nsec3_b3_optout_nonc.rpl
index 7c8f19fd5b9ef4dd3401a7823f62036accb5b9a1..f4804e40c21cedbf58267801703de34f751a68e8 100644 (file)
--- a/testdata/val_nsec3_b3_optout_nonc.rpl
+++ b/testdata/val_nsec3_b3_optout_nonc.rpl
@@ -3,6 +3,7 @@ server:
         trust-anchor: "example. DNSKEY  257 3 7 AwEAAcUlFV1vhmqx6NSOUOq2R/dsR7Xm3upJ ( j7IommWSpJABVfW8Q0rOvXdM6kzt+TAu92L9 AbsUdblMFin8CVF3n4s= )"
        val-override-date: "20120420235959"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_nsec3_b4_wild.rpl b/testdata/val_nsec3_b4_wild.rpl
index e3041ecd8ea48672b46ad404f879441b79910664..5dcd308c95d6b44cb31639adcb45f6f2adf2e104 100644 (file)
--- a/testdata/val_nsec3_b4_wild.rpl
+++ b/testdata/val_nsec3_b4_wild.rpl
@@ -3,6 +3,7 @@ server:
         trust-anchor: "example. DNSKEY  257 3 7 AwEAAcUlFV1vhmqx6NSOUOq2R/dsR7Xm3upJ ( j7IommWSpJABVfW8Q0rOvXdM6kzt+TAu92L9 AbsUdblMFin8CVF3n4s= )"
        val-override-date: "20120420235959"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_nsec3_b4_wild_wr.rpl b/testdata/val_nsec3_b4_wild_wr.rpl
index bff6b4457530eee5f8bdf18ca03581e6ca13ec68..b9a1cda665b04e6aa855135da76e4c0526eb0fab 100644 (file)
--- a/testdata/val_nsec3_b4_wild_wr.rpl
+++ b/testdata/val_nsec3_b4_wild_wr.rpl
@@ -3,6 +3,7 @@ server:
        trust-anchor: "example. DNSKEY  257 3 7 AwEAAcUlFV1vhmqx6NSOUOq2R/dsR7Xm3upJ ( j7IommWSpJABVfW8Q0rOvXdM6kzt+TAu92L9 AbsUdblMFin8CVF3n4s= )"
        val-override-date: "20120420235959"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_nsec3_b5_wcnodata.rpl b/testdata/val_nsec3_b5_wcnodata.rpl
index c8014ed6931e7e4cab9242813bc0cb3e69f13d56..717125e8626df0e64f8ec2a61b4fe5d982bf87b9 100644 (file)
--- a/testdata/val_nsec3_b5_wcnodata.rpl
+++ b/testdata/val_nsec3_b5_wcnodata.rpl
@@ -3,6 +3,7 @@ server:
         trust-anchor: "example. DNSKEY  257 3 7 AwEAAcUlFV1vhmqx6NSOUOq2R/dsR7Xm3upJ ( j7IommWSpJABVfW8Q0rOvXdM6kzt+TAu92L9 AbsUdblMFin8CVF3n4s= )"
        val-override-date: "20120420235959"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_nsec3_b5_wcnodata_noce.rpl b/testdata/val_nsec3_b5_wcnodata_noce.rpl
index a933b50c94f74c2fa32581e55a48273e3854da88..0506a4780dca51b0ceaddfccb6a5652dbb30fa95 100644 (file)
--- a/testdata/val_nsec3_b5_wcnodata_noce.rpl
+++ b/testdata/val_nsec3_b5_wcnodata_noce.rpl
@@ -3,6 +3,7 @@ server:
         trust-anchor: "example. DNSKEY  257 3 7 AwEAAcUlFV1vhmqx6NSOUOq2R/dsR7Xm3upJ ( j7IommWSpJABVfW8Q0rOvXdM6kzt+TAu92L9 AbsUdblMFin8CVF3n4s= )"
        val-override-date: "20120420235959"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_nsec3_b5_wcnodata_nonc.rpl b/testdata/val_nsec3_b5_wcnodata_nonc.rpl
index 8ff0e76bc860d956eefc77c53f2cd95ffa603314..440386ee5cc706f1678b17342b535ea2a3dd474b 100644 (file)
--- a/testdata/val_nsec3_b5_wcnodata_nonc.rpl
+++ b/testdata/val_nsec3_b5_wcnodata_nonc.rpl
@@ -3,6 +3,7 @@ server:
         trust-anchor: "example. DNSKEY  257 3 7 AwEAAcUlFV1vhmqx6NSOUOq2R/dsR7Xm3upJ ( j7IommWSpJABVfW8Q0rOvXdM6kzt+TAu92L9 AbsUdblMFin8CVF3n4s= )"
        val-override-date: "20120420235959"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_nsec3_b5_wcnodata_nowc.rpl b/testdata/val_nsec3_b5_wcnodata_nowc.rpl
index 4460e5faee22221073cde50bd74718db56f0aef8..e6619cf81b3e1185e53a0eb7c7fb448c8432ff14 100644 (file)
--- a/testdata/val_nsec3_b5_wcnodata_nowc.rpl
+++ b/testdata/val_nsec3_b5_wcnodata_nowc.rpl
@@ -3,6 +3,7 @@ server:
         trust-anchor: "example. DNSKEY  257 3 7 AwEAAcUlFV1vhmqx6NSOUOq2R/dsR7Xm3upJ ( j7IommWSpJABVfW8Q0rOvXdM6kzt+TAu92L9 AbsUdblMFin8CVF3n4s= )"
        val-override-date: "20120420235959"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_nsec3_cname_ds.rpl b/testdata/val_nsec3_cname_ds.rpl
index 299400569598ad92e76d75c6f30186434f8413e9..bf4dc5903fa7c09e9a514d2e8bbfaaceef20197d 100644 (file)
--- a/testdata/val_nsec3_cname_ds.rpl
+++ b/testdata/val_nsec3_cname_ds.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_nsec3_cname_par.rpl b/testdata/val_nsec3_cname_par.rpl
index 20ea0619d654bc1c076ea5ab9076cb2ed25ba05a..20ae3b2911a219ba9f6a875f8198efe37a2f5a94 100644 (file)
--- a/testdata/val_nsec3_cname_par.rpl
+++ b/testdata/val_nsec3_cname_par.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_nsec3_cname_sub.rpl b/testdata/val_nsec3_cname_sub.rpl
index 7b38b1a1bdfd8bed06fa2c99c88a0d6a4b8cde09..beb910c5f43d0f0fe8bb82860fc0a15fccaec2fc 100644 (file)
--- a/testdata/val_nsec3_cname_sub.rpl
+++ b/testdata/val_nsec3_cname_sub.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_nsec3_cnametocnamewctoposwc.rpl b/testdata/val_nsec3_cnametocnamewctoposwc.rpl
index d8f2c411e482572d0a936109b6e4d2c412c94437..a7c45efcf09916384f3316956e066784e591974e 100644 (file)
--- a/testdata/val_nsec3_cnametocnamewctoposwc.rpl
+++ b/testdata/val_nsec3_cnametocnamewctoposwc.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    IN      DNSKEY  257 3 8 AwEAAdL6YJdvoKQJEt/SgB6MrbQ2RDwnrcQQb6bDE8FpGgLen6hvF31ntVsZ3RZzhCmwL6lvumOLFIRKaP9ZBEVutT9iMoF2dNRbT0TCUrv6uQNHcuCZ0BJhuDNBU42f3yOnfFv7PKxd0NP+yFHJkvDQAVLMB5GeUQuYnvgQGeZsf/3b"
        val-override-date: "-1"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_nsec3_entnodata_optout.rpl b/testdata/val_nsec3_entnodata_optout.rpl
index 56ed195fc3f55de2ded36e74b5faefd8d6687c75..5d868def0ac1c42d56ea2dd236ce3ed4ffa0d446 100644 (file)
--- a/testdata/val_nsec3_entnodata_optout.rpl
+++ b/testdata/val_nsec3_entnodata_optout.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_nsec3_entnodata_optout_badopt.rpl b/testdata/val_nsec3_entnodata_optout_badopt.rpl
index d1548f522f366fb3c454115c622711c26265f312..928814bfb3bc6c00f3f400c1f6d06354be8615b7 100644 (file)
--- a/testdata/val_nsec3_entnodata_optout_badopt.rpl
+++ b/testdata/val_nsec3_entnodata_optout_badopt.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_nsec3_entnodata_optout_match.rpl b/testdata/val_nsec3_entnodata_optout_match.rpl
index 329db5f53d57418c3ffd373d8cc8ed83dbba733d..2919ff76707bbf83298973a5aeb6a47b39f4f46f 100644 (file)
--- a/testdata/val_nsec3_entnodata_optout_match.rpl
+++ b/testdata/val_nsec3_entnodata_optout_match.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_nsec3_iter_high.rpl b/testdata/val_nsec3_iter_high.rpl
index 451bec540a7f28e70cf66015ba347c60feba379e..461b5503c59ea0b8c0271942e6661881684359b8 100644 (file)
--- a/testdata/val_nsec3_iter_high.rpl
+++ b/testdata/val_nsec3_iter_high.rpl
@@ -5,6 +5,7 @@ server:
        val-override-date: "20070916134226"
        val-nsec3-keysize-iterations: "1024 100 2048 200 4096 500"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_nsec3_nodatawccname.rpl b/testdata/val_nsec3_nodatawccname.rpl
index 4f01cdf8a41af1412b6ecaa2be237b7c5bb66a00..ef5cadf89e4c2a92ffba99e1675aba8eefc7995a 100644 (file)
--- a/testdata/val_nsec3_nodatawccname.rpl
+++ b/testdata/val_nsec3_nodatawccname.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_nsec3_nods.rpl b/testdata/val_nsec3_nods.rpl
index 60f20817f80547ebec35631421a27d84707a2ad3..592adf7617f99e6552d4930dd89511d6504dae2d 100644 (file)
--- a/testdata/val_nsec3_nods.rpl
+++ b/testdata/val_nsec3_nods.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_nsec3_nods_badopt.rpl b/testdata/val_nsec3_nods_badopt.rpl
index c2f71ca76ac7640ea108767a12828ae6fca1d2d9..723bc767b237ac28ddedf270e0e554793d810152 100644 (file)
--- a/testdata/val_nsec3_nods_badopt.rpl
+++ b/testdata/val_nsec3_nods_badopt.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_nsec3_nods_badsig.rpl b/testdata/val_nsec3_nods_badsig.rpl
index 5e265326449e2240eff86a88a8976ea15ca3ba76..b0a4ebe56c1646d40894222213696b65d02aa632 100644 (file)
--- a/testdata/val_nsec3_nods_badsig.rpl
+++ b/testdata/val_nsec3_nods_badsig.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_nsec3_nods_negcache.rpl b/testdata/val_nsec3_nods_negcache.rpl
index 0c4d20ec2040449c3f1a8eb5377f1df3835e70c7..053e003597ef4f3352119eeb7c4fc326721a0187 100644 (file)
--- a/testdata/val_nsec3_nods_negcache.rpl
+++ b/testdata/val_nsec3_nods_negcache.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_nsec3_nods_soa.rpl b/testdata/val_nsec3_nods_soa.rpl
index a967c5037e3091a89eee988c9136b3c65cd53f2c..5b6877ebe13e24c7f146029a9beeb02fee3c896f 100644 (file)
--- a/testdata/val_nsec3_nods_soa.rpl
+++ b/testdata/val_nsec3_nods_soa.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_nsec3_optout_ad.rpl b/testdata/val_nsec3_optout_ad.rpl
index 1c484eab02fc0e4456ba3394756f29027e2b9b26..67675b830b2c8d7e4c2c9e5af866bfd08a7bfda1 100644 (file)
--- a/testdata/val_nsec3_optout_ad.rpl
+++ b/testdata/val_nsec3_optout_ad.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com. DS 57024 7 1 46d134be319b2cc910b9938f1cb25dc41abb27bf"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_nsec3_optout_cache.rpl b/testdata/val_nsec3_optout_cache.rpl
index 3ec7ccbdd5cf5b1d4950e5fbfaf98787b6708e5e..f047d3571ed1a66246b989de64ba902a83e5f82d 100644 (file)
--- a/testdata/val_nsec3_optout_cache.rpl
+++ b/testdata/val_nsec3_optout_cache.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_nsec3_wcany.rpl b/testdata/val_nsec3_wcany.rpl
index 37074a6a6e0f087e642643ab7264d39a41a3f1f0..f2b68a81bfc25b45341e9e9b958fab463fe16b21 100644 (file)
--- a/testdata/val_nsec3_wcany.rpl
+++ b/testdata/val_nsec3_wcany.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_nsec3_wcany_nodeny.rpl b/testdata/val_nsec3_wcany_nodeny.rpl
index 080f086c8ea5fce16d9c89388772818bfc852205..d2c91e0e07c6b2c61e1109f3bab3e38648b674e5 100644 (file)
--- a/testdata/val_nsec3_wcany_nodeny.rpl
+++ b/testdata/val_nsec3_wcany_nodeny.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_nx.rpl b/testdata/val_nx.rpl
index 434354fb487db90ba2395e7ae67cec578e6f4c38..9dee57dd43783e3583f1d870c6271021b6d8002e 100644 (file)
--- a/testdata/val_nx.rpl
+++ b/testdata/val_nx.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_nx_nodeny.rpl b/testdata/val_nx_nodeny.rpl
index 9c1e0bb3d7661c590970b5cf4deee74bc008a04f..f98248e12be2ddd8d265d9bcdfbe00c15e0850e6 100644 (file)
--- a/testdata/val_nx_nodeny.rpl
+++ b/testdata/val_nx_nodeny.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_nx_nowc.rpl b/testdata/val_nx_nowc.rpl
index 9b8880d77b6671e49f7bd688f9546a3eb7b22c6a..dc04c65f6058e560e09458f596d18387ceb07aff 100644 (file)
--- a/testdata/val_nx_nowc.rpl
+++ b/testdata/val_nx_nowc.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_nx_nsec3_collision.rpl b/testdata/val_nx_nsec3_collision.rpl
index 85236e46eb97054d7b0f8e1388a7f70ad523ee13..5cba2e109af2628a29d8eb4b398215e2634ae834 100644 (file)
--- a/testdata/val_nx_nsec3_collision.rpl
+++ b/testdata/val_nx_nsec3_collision.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_nx_nsec3_params.rpl b/testdata/val_nx_nsec3_params.rpl
index 926712637f968ab66dd4ef543a7f56fc19d64077..c24714d51acfee903e4f1636ffc4a57fe2561fc1 100644 (file)
--- a/testdata/val_nx_nsec3_params.rpl
+++ b/testdata/val_nx_nsec3_params.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_nx_overreach.rpl b/testdata/val_nx_overreach.rpl
index 4494c30f5a58766d56e3e6904e728863af562334..11c3a4a191c91f0811897999666864402a2af0d0 100644 (file)
--- a/testdata/val_nx_overreach.rpl
+++ b/testdata/val_nx_overreach.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_pos_truncns.rpl b/testdata/val_pos_truncns.rpl
index 12d3a54819587f61bccc5ec7f10183c4cb4c8292..76563a50b89a8f9c19bf5af664de9f8a78c10581 100644 (file)
--- a/testdata/val_pos_truncns.rpl
+++ b/testdata/val_pos_truncns.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_positive.rpl b/testdata/val_positive.rpl
index c6f8d797a555a48955c9a2db0e3b9d9905e16183..9c70fcbc92c6098cffd1faa41569d5a5fbc42d2b 100644 (file)
--- a/testdata/val_positive.rpl
+++ b/testdata/val_positive.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_positive_nosigs.rpl b/testdata/val_positive_nosigs.rpl
index 4ab6e54f0d036b054c15a6c567e94156f93b0614..e1c04d6c1311147006a7be199cd0e773e70a6cd2 100644 (file)
--- a/testdata/val_positive_nosigs.rpl
+++ b/testdata/val_positive_nosigs.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_positive_wc.rpl b/testdata/val_positive_wc.rpl
index f6a04e71ec931371e53b75a6952bebe354f864b3..2fb737deb51e40db4864c2c990a48bf5f43c6924 100644 (file)
--- a/testdata/val_positive_wc.rpl
+++ b/testdata/val_positive_wc.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_positive_wc_nodeny.rpl b/testdata/val_positive_wc_nodeny.rpl
index b0c1a54285011caa90a6986ef412189bb60ff48d..4c5f31083878f33c81a802d1355398b3353ead54 100644 (file)
--- a/testdata/val_positive_wc_nodeny.rpl
+++ b/testdata/val_positive_wc_nodeny.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_qds_badanc.rpl b/testdata/val_qds_badanc.rpl
index b451135ffe98126ee347cb20f78b2376db252b89..dce22a897e55891dff19099264b4c85b707e86a2 100644 (file)
--- a/testdata/val_qds_badanc.rpl
+++ b/testdata/val_qds_badanc.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "sub.example.com.        3600    IN      DS      30899 RSASHA1 1 f7ed618f24d5e5202927e1d27bc2e84a141cb4b3"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_qds_oneanc.rpl b/testdata/val_qds_oneanc.rpl
index 657b4856ea77031b22d26084130429843624e1ad..541dfeae8ecb3f9d45a1a0ca83dbe592c24e9048 100644 (file)
--- a/testdata/val_qds_oneanc.rpl
+++ b/testdata/val_qds_oneanc.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_qds_twoanc.rpl b/testdata/val_qds_twoanc.rpl
index 61e7458b0f0f3333eaad5697bf5f8f9534defe65..1b2cae15a558e4bda24292cf868fb66dcabf05a8 100644 (file)
--- a/testdata/val_qds_twoanc.rpl
+++ b/testdata/val_qds_twoanc.rpl
@@ -5,6 +5,7 @@ server:
        trust-anchor: "sub.example.com.        3600    IN      DS      30899 RSASHA1 1 f7ed618f24d5e5202927e1d27bc2e84a141cb4b3"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_refer_unsignadd.rpl b/testdata/val_refer_unsignadd.rpl
index eb74817ddbbfeb1658bc31dc9d30a513d0ba3858..d55332687ec9771d38072c4ea09707c18e56bd5d 100644 (file)
--- a/testdata/val_refer_unsignadd.rpl
+++ b/testdata/val_refer_unsignadd.rpl
@@ -6,6 +6,7 @@ server:
        val-override-date: "20070916134226"
        access-control: 127.0.0.1 allow_snoop
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_referd.rpl b/testdata/val_referd.rpl
index 67e44ea75bffe5ecb3630b7d36599ee49fa3ea18..d532c9a00cf0c171b2f9ee5e703fb0f57be8618d 100644 (file)
--- a/testdata/val_referd.rpl
+++ b/testdata/val_referd.rpl
@@ -6,6 +6,7 @@ server:
        harden-referral-path: no
        access-control: 127.0.0.1 allow_snoop
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_referglue.rpl b/testdata/val_referglue.rpl
index bd829bff44df3c08dcec5267ce05c5786405d000..891e89393fe908d7b15edf0667aed0700d205366 100644 (file)
--- a/testdata/val_referglue.rpl
+++ b/testdata/val_referglue.rpl
@@ -6,6 +6,7 @@ server:
        directory: ""
        access-control: 127.0.0.1 allow_snoop
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_rrsig.rpl b/testdata/val_rrsig.rpl
index 6ea8c1bc3ee77667dae6bb441b57fc22d7208968..e8c39f0fc904c2a1b07771ff399091ac88884eb1 100644 (file)
--- a/testdata/val_rrsig.rpl
+++ b/testdata/val_rrsig.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_secds.rpl b/testdata/val_secds.rpl
index d1a5f64b5c5a92415e66069b05bf10340943e4c0..4c40409b7203d6d82ba40c9b1d90c427b984aa8c 100644 (file)
--- a/testdata/val_secds.rpl
+++ b/testdata/val_secds.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_secds_nosig.rpl b/testdata/val_secds_nosig.rpl
index 310c9bb8875d114e7d22a05831983e0278870dce..c12f934ce6834131c644c120f6a03880ba1a65ef 100644 (file)
--- a/testdata/val_secds_nosig.rpl
+++ b/testdata/val_secds_nosig.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_spurious_ns.rpl b/testdata/val_spurious_ns.rpl
index 741fd1affc3cf6845094b714d7fb46608e71f0d2..3aef40341ef669c9e9254a78de6413b7ec6970e2 100644 (file)
--- a/testdata/val_spurious_ns.rpl
+++ b/testdata/val_spurious_ns.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_stub_noroot.rpl b/testdata/val_stub_noroot.rpl
index 369bc66e428f68c4270ae1c9ed2bbec752d3b64c..f50041c568f6d2e0cdcb626c3abec57df1cbe986 100644 (file)
--- a/testdata/val_stub_noroot.rpl
+++ b/testdata/val_stub_noroot.rpl
@@ -5,6 +5,7 @@ server:
        val-override-date: "20100913111500"
        ; the dlv anchor is completely ignored, but here to test that.
        dlv-anchor: "dlv.isc.org. IN DNSKEY 257 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_stubds.rpl b/testdata/val_stubds.rpl
index 565c596333dea97ebd564887c361739af2ae5d58..bf5f5d651b8b3a34fc8cc19012183f73289734f4 100644 (file)
--- a/testdata/val_stubds.rpl
+++ b/testdata/val_stubds.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_ta_algo_dnskey.rpl b/testdata/val_ta_algo_dnskey.rpl
index d5dd26040cbdd2335aa991f2baccaf0f82ab9ec5..dfe608ef3bb14f8c242e92c168b2b04eff51c143 100644 (file)
--- a/testdata/val_ta_algo_dnskey.rpl
+++ b/testdata/val_ta_algo_dnskey.rpl
@@ -5,6 +5,7 @@ server:
        trust-anchor: "example.com.     3600    IN      DS      30899 5 1 d4bf9d2e10f6d76840d42ef5913022abcd0bf512"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_ta_algo_dnskey_dp.rpl b/testdata/val_ta_algo_dnskey_dp.rpl
index b23c0f1b04d746dff796ef05aa54cc5ec4838d2c..1ef14adf87a976e1e425bd6396145bf4f23dfb49 100644 (file)
--- a/testdata/val_ta_algo_dnskey_dp.rpl
+++ b/testdata/val_ta_algo_dnskey_dp.rpl
@@ -6,6 +6,7 @@ server:
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
        harden-algo-downgrade: no
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_ta_algo_missing.rpl b/testdata/val_ta_algo_missing.rpl
index d8c89807b2b058ce3e5366e5b19c4335ba6840bf..51dddce2b2f12144ef614d6d7d495291b4eab89e 100644 (file)
--- a/testdata/val_ta_algo_missing.rpl
+++ b/testdata/val_ta_algo_missing.rpl
@@ -7,6 +7,7 @@ server:
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
        harden-algo-downgrade: yes
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_ta_algo_missing_dp.rpl b/testdata/val_ta_algo_missing_dp.rpl
index 2cf0556f5bff515c622bac888cbe7dbb934b40a6..fb4a1382562b9b87de9262a4b2cc69b88c817c51 100644 (file)
--- a/testdata/val_ta_algo_missing_dp.rpl
+++ b/testdata/val_ta_algo_missing_dp.rpl
@@ -7,6 +7,7 @@ server:
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
        harden-algo-downgrade: no
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_twocname.rpl b/testdata/val_twocname.rpl
index 9495c28536fef41a29805e1c1ce5f008a53c5bba..2736d917a0178eb846c38d2b2d0b2a04978adc78 100644 (file)
--- a/testdata/val_twocname.rpl
+++ b/testdata/val_twocname.rpl
@@ -2,6 +2,7 @@
 server:
        trust-anchor: "ORG. DS 21366 7 1 E6C1716CFB6BDC84E84CE1AB5510DAC69173B5B2"
        val-override-date: "20091116100204"
+       fake-sha1: yes
 
 forward-zone:
        name: "."

diff --git a/testdata/val_unalgo_anchor.rpl b/testdata/val_unalgo_anchor.rpl
index 1a653186a5d41dfce5b6f7c00a30f63cb2fa0894..0848b706300372d68e2a298d8f852307fa4ef76d 100644 (file)
--- a/testdata/val_unalgo_anchor.rpl
+++ b/testdata/val_unalgo_anchor.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 208 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_unalgo_dlv.rpl b/testdata/val_unalgo_dlv.rpl
index 7e1d8c9d50f0c1031bac52c5d6f7c70a502049c1..9320ca67feda64ef455a406e5d640ce92b861dbf 100644 (file)
--- a/testdata/val_unalgo_dlv.rpl
+++ b/testdata/val_unalgo_dlv.rpl
@@ -4,6 +4,7 @@ server:
        dlv-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_unalgo_ds.rpl b/testdata/val_unalgo_ds.rpl
index adf1ff123442042cbba3cc63f18cc6dd73411340..8adc049884a097ff4e0fd4bd781516db731890ee 100644 (file)
--- a/testdata/val_unalgo_ds.rpl
+++ b/testdata/val_unalgo_ds.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_unsec_cname.rpl b/testdata/val_unsec_cname.rpl
index c532da5ee000b9802d148cc4e529ace68ee2d5aa..6d4e52f8fa8b58b85f97c9e518dd993ab975a0c4 100644 (file)
--- a/testdata/val_unsec_cname.rpl
+++ b/testdata/val_unsec_cname.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_unsecds.rpl b/testdata/val_unsecds.rpl
index ff2bc7633dd4fbf94c7a20446bd06676c4386ec3..e8a85eb1760a00d7db66002d6e08aeee41e9f3b1 100644 (file)
--- a/testdata/val_unsecds.rpl
+++ b/testdata/val_unsecds.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_unsecds_negcache.rpl b/testdata/val_unsecds_negcache.rpl
index de318397839182bd86ce54c164606ca51bad6174..7de1775b49015b7864cebeb37ca4075455f9c83e 100644 (file)
--- a/testdata/val_unsecds_negcache.rpl
+++ b/testdata/val_unsecds_negcache.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_unsecds_qtypeds.rpl b/testdata/val_unsecds_qtypeds.rpl
index 4d82a1b7e156e0b4443b84eef157514e1272a8ea..5101300053a42f81125e93d8ee39c529650446a2 100644 (file)
--- a/testdata/val_unsecds_qtypeds.rpl
+++ b/testdata/val_unsecds_qtypeds.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/testdata/val_wild_pos.rpl b/testdata/val_wild_pos.rpl
index d47f03f59a890405b8035c8a4ce4994fa6d77a9f..9c0c5df0f0c611b5d3a855cf244fca6a9a098277 100644 (file)
--- a/testdata/val_wild_pos.rpl
+++ b/testdata/val_wild_pos.rpl
@@ -4,6 +4,7 @@ server:
        trust-anchor: "example.com.    3600    IN      DS      2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b"
        val-override-date: "20070916134226"
        target-fetch-policy: "0 0 0 0 0"
+       fake-sha1: yes
 
 stub-zone:
        name: "."

diff --git a/util/config_file.h b/util/config_file.h
index 5560326a36bcfe7f949e60f0160fd13eb02fe45f..c184748a3af78390f428251197539efad0da7e23 100644 (file)
--- a/util/config_file.h
+++ b/util/config_file.h
@@ -978,6 +978,6 @@ void w_config_adjust_directory(struct config_file* cfg);
 #endif /* UB_ON_WINDOWS */
 
 /** debug option for unit tests. */
-extern int fake_dsa;
+extern int fake_dsa, fake_sha1;
 
 #endif /* UTIL_CONFIG_FILE_H */

diff --git a/util/configlexer.c b/util/configlexer.c
index 8e91534218a4acfde347dd2882718c7c580fffe2..a5ea389139e27c1b79544b69016eea12c7b7feba 100644 (file)
--- a/util/configlexer.c
+++ b/util/configlexer.c
@@ -378,8 +378,8 @@ static void yy_fatal_error (yyconst char msg[]  );
        *yy_cp = '\0'; \
        (yy_c_buf_p) = yy_cp;
 
-#define YY_NUM_RULES 208
-#define YY_END_OF_BUFFER 209
+#define YY_NUM_RULES 209
+#define YY_END_OF_BUFFER 210
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -387,231 +387,232 @@ struct yy_trans_info
        flex_int32_t yy_verify;
        flex_int32_t yy_nxt;
        };
-static yyconst flex_int16_t yy_accept[2031] =
+static yyconst flex_int16_t yy_accept[2036] =
     {   0,
-        1,    1,  190,  190,  194,  194,  198,  198,  202,  202,
-        1,    1,  209,  206,    1,  188,  188,  207,    2,  207,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      190,  191,  191,  192,  207,  194,  195,  195,  196,  207,
-      201,  198,  199,  199,  200,  207,  202,  203,  203,  204,
-      207,  205,  189,    2,  193,  207,  205,  206,    0,    1,
-        2,    2,    2,    2,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  190,
-        0,  194,    0,  201,    0,  198,  202,    0,  205,    0,
-        2,    2,  205,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  205,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  205,  206,  206,  206,  206,  206,
-
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,   77,  206,  206,
-      206,  206,  206,  206,    8,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,   88,  205,  206,  206,  206,  206,
-
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-
-      206,  206,  206,  205,  206,  206,  206,  206,  206,   37,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      161,  206,   14,   15,  206,   18,   17,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  147,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,    3,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  205,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  197,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,   40,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,   41,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-
-      206,  206,  206,  206,  206,  136,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-       20,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,   96,  206,
-      197,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  112,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,   95,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-       75,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,   25,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,   38,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,   39,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,   28,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  176,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,   32,  206,   33,  206,  206,  206,
-       78,  206,   79,  206,  206,   76,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,    7,  206,  206,  206,  206,  206,  206,  206,
-
-      206,  206,  206,  206,  206,  206,  206,  154,  206,  206,
-      206,  206,   98,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,   29,  206,  206,
-      206,  206,  206,  206,  206,  128,  206,  127,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,   16,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,   42,  206,  206,
-      206,  206,  206,  135,  206,  206,  206,  206,   81,   80,
-
-      206,  206,  206,  206,  206,  206,  206,  206,  122,  206,
-      206,  206,  206,  206,  206,  206,  206,   89,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,   60,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,   64,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,   36,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  125,  126,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,    6,  206,  206,  206,  206,  206,  206,
-
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  186,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,   26,  206,  206,  206,  206,  206,  206,  206,  206,
-      118,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      140,  206,  119,  206,  206,  152,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,   27,  206,  206,  206,
-      206,   84,  206,   85,  206,   83,  206,  206,  206,  206,
-      206,  206,  206,   94,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  175,  206,  206,  120,  206,
-
-      206,  206,  206,  206,  123,  206,  151,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-       74,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,   34,  206,
-      206,   22,  206,  206,  206,  206,   19,  206,  103,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,   49,   51,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  162,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,   86,  206,
-      206,  206,  206,  206,  206,  206,   93,  206,  206,  206,
-
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,   97,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  146,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  111,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  107,
-      206,  113,  206,  206,  206,  206,  206,   92,  206,  206,
-       70,  206,  138,  206,  206,  206,  206,  206,  153,  206,
-      206,  206,  206,  206,  206,  206,  167,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  110,
-
-      206,  206,  206,  206,  206,   52,   53,  206,  206,  206,
-      206,  206,   35,   59,  114,  206,  129,  206,  155,  124,
-      206,  206,   45,  206,  116,  206,  206,  206,  206,  206,
-        9,  206,  206,  206,   73,  206,  206,  206,  206,  180,
-      206,  137,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,   99,  166,  206,  206,  206,
-      206,  206,  206,  206,  206,  148,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-
-      206,  206,  206,  206,  206,  115,  206,  206,   44,   46,
-      206,  206,  206,  206,  206,  206,  206,   72,  206,  206,
-      206,  206,  178,  206,  185,  206,  206,  206,  206,  142,
-       23,   24,  206,  206,  206,  206,  206,  206,  206,  206,
-       69,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  144,  141,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,   43,  206,  206,  206,  206,  206,
-      206,  206,  206,   13,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,   12,  206,  206,
-       21,  206,  206,  206,  184,  206,  187,   47,  206,  150,
-
-      143,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  106,  105,  206,  206,  206,  206,  145,
-      139,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,   54,  206,  206,  206,  179,  206,  206,  149,  206,
-      206,  206,  206,  206,  206,  206,  206,   48,  206,  206,
-       82,  206,  100,  102,  130,  206,  206,  206,  104,  206,
-      206,  156,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  163,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  131,  206,  206,  177,
-
-      206,  206,   30,  206,  206,  206,  206,    4,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  159,
-      206,  206,  206,  206,  206,  206,  206,  206,  165,  206,
-      206,  134,  206,  206,  206,  206,  206,  206,  206,  206,
-       57,  206,   31,  183,  160,  206,   11,  206,  206,  206,
-      206,  206,  206,  132,   61,  206,  206,  206,  109,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  164,
-       90,  206,   87,  206,  206,  206,   63,   67,   62,  206,
-       55,  206,   10,  206,  206,  206,  181,  206,  206,  108,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-
-      206,  206,  206,   68,   66,  206,   56,  206,  121,  206,
-      206,  133,  206,  206,  206,  206,  101,   50,  206,  206,
-      206,  206,  206,  206,  206,   91,   65,   58,  206,  182,
-      206,  206,  206,  158,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,   71,  206,  157,  174,  206,  206,  206,
-      206,  206,  206,    5,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  117,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-
-      206,  206,  206,  206,  170,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  206,  206,  206,  206,  168,  206,
-      171,  172,  206,  206,  206,  206,  206,  169,  173,    0
+        1,    1,  191,  191,  195,  195,  199,  199,  203,  203,
+        1,    1,  210,  207,    1,  189,  189,  208,    2,  208,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      191,  192,  192,  193,  208,  195,  196,  196,  197,  208,
+      202,  199,  200,  200,  201,  208,  203,  204,  204,  205,
+      208,  206,  190,    2,  194,  208,  206,  207,    0,    1,
+        2,    2,    2,    2,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  191,
+        0,  195,    0,  202,    0,  199,  203,    0,  206,    0,
+        2,    2,  206,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  206,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  206,  207,  207,  207,  207,  207,
+
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,   77,  207,  207,
+      207,  207,  207,  207,    8,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,   88,  206,  207,  207,  207,  207,
+
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+
+      207,  207,  207,  207,  206,  207,  207,  207,  207,  207,
+       37,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  162,  207,   14,   15,  207,   18,   17,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  148,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,    3,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  206,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  198,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,   40,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,   41,  207,  207,  207,  207,  207,  207,  207,
+
+      207,  207,  207,  207,  207,  207,  207,  207,  137,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,   20,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,   96,  207,  198,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  112,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,   95,  207,  207,  207,  207,  207,  207,  207,  207,
+
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,   75,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,   25,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,   38,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,   39,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+
+      207,  207,  113,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,   28,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  177,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,   32,
+      207,   33,  207,  207,  207,   78,  207,   79,  207,  207,
+       76,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,    7,  207,  207,
+
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  155,  207,  207,  207,  207,   98,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,   29,  207,  207,  207,  207,  207,  207,  207,
+      129,  207,  128,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,   16,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,   42,  207,  207,  207,  207,  207,  136,  207,
+
+      207,  207,  207,   81,   80,  207,  207,  207,  207,  207,
+      207,  207,  207,  123,  207,  207,  207,  207,  207,  207,
+      207,  207,   89,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,   60,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,   64,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,   36,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  126,  127,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,    6,  207,
+
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  187,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,   26,  207,  207,  207,
+      207,  207,  207,  207,  207,  119,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  141,  207,  120,  207,  207,
+      153,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,   27,  207,  207,  207,  207,   84,  207,   85,  207,
+       83,  207,  207,  207,  207,  207,  207,  207,   94,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+
+      176,  207,  207,  121,  207,  207,  207,  207,  207,  124,
+      207,  152,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,   74,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,   34,  207,  207,   22,  207,  207,  207,
+      207,   19,  207,  103,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,   49,   51,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  163,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,   86,  207,  207,  207,  207,  207,  207,
+
+      207,   93,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,   97,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  147,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      111,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  107,  207,  114,  207,  207,  207,
+      207,  207,   92,  207,  207,   70,  207,  139,  207,  207,
+      207,  207,  207,  154,  207,  207,  207,  207,  207,  207,
+      207,  168,  207,  207,  207,  207,  207,  207,  207,  207,
+
+      207,  207,  207,  207,  110,  207,  207,  207,  207,  207,
+       52,   53,  207,  207,  207,  207,  207,   35,   59,  115,
+      207,  130,  207,  156,  125,  207,  207,   45,  207,  117,
+      207,  207,  207,  207,  207,    9,  207,  207,  207,   73,
+      207,  207,  207,  207,  181,  207,  138,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+       99,  167,  207,  207,  207,  207,  207,  207,  207,  207,
+      149,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      116,  207,  207,   44,   46,  207,  207,  207,  207,  207,
+      207,  207,   72,  207,  207,  207,  207,  179,  207,  186,
+      207,  207,  207,  207,  143,   23,   24,  207,  207,  207,
+      207,  207,  207,  207,  207,   69,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  145,  142,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,   43,
+      207,  207,  207,  207,  207,  207,  207,  207,   13,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,   12,  207,  207,   21,  207,  207,  207,  185,
+
+      207,  188,   47,  207,  151,  144,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  106,  105,
+      207,  207,  207,  207,  146,  140,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,   54,  207,  207,  207,
+      180,  207,  207,  150,  207,  207,  207,  207,  207,  207,
+      207,  207,   48,  207,  207,   82,  207,  100,  102,  131,
+      207,  207,  207,  104,  207,  207,  157,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  164,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+
+      207,  132,  207,  207,  178,  207,  207,   30,  207,  207,
+      207,  207,    4,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  160,  207,  207,  207,  207,  207,
+      207,  207,  207,  166,  207,  207,  135,  207,  207,  207,
+      207,  207,  207,  207,  207,   57,  207,   31,  184,  161,
+      207,   11,  207,  207,  207,  207,  207,  207,  133,   61,
+      207,  207,  207,  109,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  165,   90,  207,   87,  207,  207,
+      207,   63,   67,   62,  207,   55,  207,   10,  207,  207,
+      207,  182,  207,  207,  108,  207,  207,  207,  207,  207,
+
+      207,  207,  207,  207,  207,  207,  207,  207,   68,   66,
+      207,   56,  207,  122,  207,  207,  134,  207,  207,  207,
+      207,  101,   50,  207,  207,  207,  207,  207,  207,  207,
+       91,   65,   58,  207,  183,  207,  207,  207,  159,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,   71,  207,
+      158,  175,  207,  207,  207,  207,  207,  207,    5,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      118,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  171,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  169,  207,  172,  173,  207,  207,  207,
+      207,  207,  170,  174,    0
     } ;
 
 static yyconst YY_CHAR yy_ec[256] =
@@ -620,16 +621,16 @@ static yyconst YY_CHAR yy_ec[256] =
         1,    1,    4,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    2,    1,    5,    6,    1,    1,    1,    7,    1,
-        1,    1,    1,    1,    8,    1,    1,    1,    1,    1,
-        9,   10,    1,   11,    1,    1,    1,   12,    1,    1,
+        1,    1,    1,    1,    8,    1,    1,    1,    9,    1,
+       10,   11,    1,   12,    1,    1,    1,   13,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,   13,    1,    1,    1,    1,   14,   15,   16,   17,
+        1,   14,    1,    1,    1,    1,   15,   16,   17,   18,
 
-       18,   19,   20,   21,   22,   23,   24,   25,   26,   27,
-       28,   29,   30,   31,   32,   33,   34,   35,   36,   37,
-       38,   39,    1,    1,    1,    1,    1,    1,    1,    1,
+       19,   20,   21,   22,   23,   24,   25,   26,   27,   28,
+       29,   30,   31,   32,   33,   34,   35,   36,   37,   38,
+       39,   40,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -646,1368 +647,1366 @@ static yyconst YY_CHAR yy_ec[256] =
         1,    1,    1,    1,    1
     } ;
 
-static yyconst YY_CHAR yy_meta[40] =
+static yyconst YY_CHAR yy_meta[41] =
     {   0,
         1,    2,    3,    4,    5,    1,    6,    1,    1,    1,
-        1,    7,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    7,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1
     } ;
 
-static yyconst flex_uint16_t yy_base[2045] =
+static yyconst flex_uint16_t yy_base[2050] =
     {   0,
-        0,    0,   37,   40,   44,   51,   63,   75,   56,   68,
-       87,  108, 1880, 1760,   50, 4002, 4002, 4002,  129,   94,
-       70,  104,  130,   90,  109,  106,  127,  111,   84,  122,
-      146,  148,   50,  170,  136,  158,  196,  171,  138,  177,
-     1595, 4002, 4002, 4002,   70, 1555, 4002, 4002, 4002,   42,
-     1167, 1027, 4002, 4002, 4002,  208,  899, 4002, 4002, 4002,
-      141,  857, 4002,  214, 4002,  218,  140,  633,  228,  167,
-        0,  239,    0,    0,   92,  162,  164,  218,  180,  167,
-      223,  224,  103,  168,  237,  226,  193,  183,  236,  241,
-      244,  246,  247,  249,  258,  245,  257,  260,  256,  265,
-
-      266,  271,  272,  274,  273,  275,  276,  283,  284,  288,
-      289,  190,  290,  292,  291,  277,  298,  299,  308,  301,
-      314,  300,  304,  307,  317,  321,  322,  323,  324,  515,
-      339,  432,  122,  401,  353,  348,  225,  341,  192,  357,
-      361,    0,  336,  338,  359,  356,  357,  358,  360,  362,
-      363,  369,  368,  366,  379,  378,  399,  380,  383,  384,
-      385,   49,  387,  388,  386,  392,  394,  396,  405,  411,
-      417,  395,  412,  426,  424,  427,  434,  430,  431,  441,
-      438,  445,  447,  397,  444,  448,  446,  449,  450,  451,
-      456,  453,  460,  461,  462,  463,  464,  470,  471,  478,
-
-      467,  325,  474,  484,  476,  480,  493,  488,  496,  497,
-      485,  498,  500,  501,  507,  512,  518,  505,  503,  511,
-      514,  504,  523,  528,  531,  527,  533,  535,  537,  539,
-      538,  540,  542,  548,  545,  552,  549,  555,  561,  546,
-      557,  558,  563,  564,  567,  562,  568,  569,  573,  571,
-      578,  582,  581,  583,  585,  588,  586,  591,  596,  598,
-      593,  606,  599,  610,  611,  612,  614,  617,  623,  615,
-      626,  627,  618,  628,  634,  632,  635,  636,  645,  637,
-      642,  644,  654,  655,  646,  656,  657,  664,  662,  666,
-      682,  668,  670,  674,  671,  686,  675,  687,  693,  677,
-
-      689,  691,  699,  695,  708,  702,  711,  712,  718,  714,
-      715,  719,  721,  724,  727,  725,  729,  728,  733,  734,
-      735,  736,  738,  746,  744,  750,  760,  742,  756,  753,
-      761,  754,  764,  767,  768,  769,  776,  773,  775,  778,
-      779,  780,  782,  784,  789,  787,  790, 4002,  797,  793,
-      795,  800,  799,  801, 4002,  802,  804,  807,  810,  806,
-      811,  812,  817,  823,  832,  828,  829,  830,  833,  831,
-      836,  838,  837,  839,  859,  841,  844,  840,  869,  845,
-      846,  870,  847,  876,  868,  879,  873,  862,  880,  882,
-      884,  886,  889,  849, 4002,  890,  897,  895,  896,  898,
-
-      900,  910,  901,  917,  903,  916,  906,  918,  922,  920,
-      929,  927,  931,  933,  942,  935,  944,  946,  926,  945,
-      938,  948,  954,  951,  953,  956,  964,  960,  961,  966,
-      962,  967,  963,  972,  979,  971,  987,  983,  970,  986,
-      988,  989,  991,  995,  996,  997,  998, 1004, 1000, 1002,
-     1011, 1015, 1003, 1009, 1022, 1019, 1030, 1026, 1027, 1036,
-     1028, 1033, 1039, 1018, 1038, 1040, 1044, 1053, 1050, 1042,
-     1054, 1045, 1055, 1059, 1060, 1061, 1062, 1065, 1063, 1066,
-     1068, 1070, 1073, 1076, 1074, 1075, 1083, 1087, 1079, 1092,
-     1085, 1095, 1096, 1098, 1099, 1100, 1103, 1106, 1102, 1110,
-
-     1112, 1113, 1115, 1118, 1116, 1122, 1125, 1128, 1130, 4002,
-     1136, 1132, 1134, 1133, 1135, 1147, 1140, 1141, 1143, 1169,
-     4002, 1149, 4002, 4002, 1144, 4002, 4002, 1151, 1150, 1154,
-     1162, 1170, 1192, 1166, 1155, 1157, 1172, 1177, 1179, 1183,
-     1180, 1189, 1197, 1198, 1200, 1185, 1203, 1206, 1207, 1209,
-     1208, 1212, 1214, 1217, 1218, 1220, 1219, 1222, 1235, 1238,
-     1223, 1234, 1237, 1239, 1241, 1243, 1242, 1244, 1251, 1246,
-     1252, 1258, 1254, 4002, 1256, 1257, 1261, 1262, 1268, 1269,
-     1271, 1272, 1274, 4002, 1276, 1280, 1281, 1283, 1284, 1275,
-     1287, 1290, 1289, 1293, 1294, 1292, 1291, 1301, 1303, 1308,
-
-     1307, 1299, 1304, 1320, 1321, 1322, 1323, 1324, 1325, 1327,
-     1328, 1337, 1331, 1333, 1339, 1340, 1338, 1346, 1341, 1350,
-     1347, 1353, 1354, 1343, 1355, 1356, 1377, 1360, 1364, 1363,
-     1365, 1366, 1372, 1374, 1371, 1375, 1391, 1381, 1392, 1394,
-     1400, 1383, 1401, 1402, 1410, 1412, 1416, 1406, 1420, 1409,
-     1419, 1426, 1428, 1413, 1429, 1384, 1437, 1430, 4002, 1444,
-     1438, 1432, 1440, 1450, 1447, 1446, 1448, 1449, 1454, 1455,
-     1456, 1461, 1459, 1460, 1462, 1463, 1467, 1473, 4002, 1469,
-     1471, 1477, 1478, 1480, 1481, 1484, 1490, 1499, 1487, 4002,
-     1495, 1502, 1503, 1505, 1496, 1498, 1506, 1514, 1512, 1513,
-
-     1515, 1517, 1519, 1520, 1522, 4002, 1523, 1526, 1531, 1528,
-     1530, 1535, 1538, 1540, 1543, 1544, 1546, 1550, 1547, 1549,
-     4002, 1548, 1557, 1556, 1551, 1570, 1573, 1561, 1569, 1572,
-     1575, 1577, 1578, 1583, 1580, 1584, 1581, 1582, 4002, 1585,
-      151, 1587, 1588, 1586, 1597, 1610, 1608, 1609, 1602, 1611,
-     1612, 1615, 1599, 1589, 1619, 1620, 1622, 1623, 1624, 1626,
-     1627, 1628, 1631, 1633, 1635, 1638, 1643, 1644, 1645, 1646,
-     1651, 1648, 4002, 1654, 1655, 1657, 1652, 1659, 1662, 1663,
-     1660, 1666, 1668, 1670, 1673, 1677, 1680, 4002, 1683, 1681,
-     1682, 1684, 1691, 1693, 1699, 1692, 1700, 1702, 1706, 1703,
-
-     1701, 1713, 1717, 1719, 1712, 1720, 1722, 1728, 1723, 1726,
-     1730, 1733, 1739, 1740, 1736, 1738, 1752, 1745, 1749, 1737,
-     4002, 1750, 1743, 1753, 1755, 1774, 1762, 1756, 1759, 1767,
-     1763, 1779, 1780, 1757, 1781, 1784, 1785, 1790, 4002, 1791,
-     1787, 1793, 1796, 1797, 1802, 1799, 1803, 1806, 1807, 1808,
-     1810, 1809, 1815, 1811, 1819, 1821, 1820, 4002, 1831, 1835,
-     1832, 1839, 1836, 1822, 1838, 1843, 1840, 1844, 1823, 1852,
-     1848, 1850, 1851, 1853, 1854, 1856, 1857, 1859, 1861, 1873,
-     1858, 1869, 4002, 1865, 1880, 1878, 1883, 1886, 1885, 1894,
-     1892, 1890, 1893, 1895, 1897, 1898, 1900, 1902, 1904, 1905,
-
-     1906, 1907, 1910, 1911, 1913, 1914, 1927, 1909, 1929, 1917,
-     1930, 1931, 1936, 1920, 1938, 1945, 1949, 1947, 1950, 4002,
-     1953, 1954, 1955, 1956, 1957, 1959, 1960, 1966, 1968, 1969,
-     1971, 1972, 1975, 1970, 1976, 1977, 1985, 1978, 1981, 1982,
-     1984, 1988, 1986, 1993, 1998, 2006, 1992, 2011, 2012, 2014,
-     2013, 2015, 2016, 2019, 4002, 2020, 2023, 2028, 2030, 2032,
-     1987, 2022, 2046, 2034, 4002, 2031, 4002, 2043, 2044, 2052,
-     4002, 2051, 4002, 2054, 2055, 4002, 2056, 2057, 2060, 2037,
-     2063, 2061, 2064, 2068, 2065, 2070, 2072, 2074, 2076, 2078,
-     2080, 2081, 4002, 2084, 2085, 2088, 2091, 2089, 2093, 2095,
-
-     2097, 2098, 2105, 2104, 2116, 2100, 2117, 4002, 2108, 2124,
-     2110, 2119, 4002, 1685, 2126, 2121, 2114, 2132, 2136, 2137,
-     2130, 2140, 2128, 2141, 2148, 2146, 2149, 2151, 2152, 2159,
-     2155, 2161, 2157, 2158, 2165, 2166, 2168, 2162, 2169, 2173,
-     2176, 2177, 2179, 2175, 2178, 2183, 2181, 4002, 2185, 2191,
-     2194, 2192, 2193, 2196, 2201, 4002, 2203, 4002, 2204, 2210,
-     2213, 2216, 2215, 2206, 2221, 2214, 2225, 2226, 2232, 2239,
-     2224, 2228, 2231, 2236, 2240, 2242, 4002, 2243, 2245, 2246,
-     2248, 2251, 2252, 2258, 2253, 2261, 2271, 4002, 2272, 2269,
-     2275, 2281, 2277, 4002, 2274, 2289, 2278, 2290, 4002, 4002,
-
-     2282, 2288, 2285, 2286, 2292, 2300, 2297, 2302, 4002, 2306,
-     2303, 2308, 2309, 2310, 2316, 2317, 2307, 4002, 2318, 2325,
-     2322, 2327, 2319, 2328, 2329, 2337, 2335, 2338, 2339, 2342,
-     2343, 2350, 4002, 2352, 2344, 2355, 2351, 2359, 2358, 2360,
-     2361, 2365, 2362, 2366, 2368, 2374, 2380, 2369, 2377, 2378,
-     2382, 2379, 2388, 2385, 2392, 2389, 2400, 2394, 4002, 2407,
-     2401, 2408, 2404, 2410, 2411, 2418, 2414, 2405, 2415, 2421,
-     2417, 4002, 2439, 2422, 2420, 2424, 2430, 2431, 2440, 2442,
-     2443, 2446, 4002, 4002, 2448, 2450, 2447, 2451, 2452, 2453,
-     2454, 2459, 2465, 4002, 2463, 2471, 2467, 2469, 2475, 2477,
-
-     2474, 2478, 2480, 2482, 2484, 2486, 2488, 2490, 2492, 2493,
-     2495, 2496, 4002, 2501, 2497, 2505, 2507, 2506, 2522, 2514,
-     2524, 2511, 2517, 2499, 2533, 2527, 2539, 2540, 2529, 2536,
-     2542, 4002, 2541, 2543, 2544, 2545, 2551, 2549, 2557, 2550,
-     4002, 2558, 2559, 2564, 2566, 2554, 2567, 2572, 2569, 2576,
-     4002, 2578, 4002, 2579, 2568, 4002, 2581, 2587, 2584, 2588,
-     2589, 2590, 2591, 2594, 2601, 2592, 4002, 2602, 2598, 2608,
-     2610, 4002, 2612, 4002, 2605, 4002, 2600, 2613, 2623, 2620,
-     2624, 2626, 2630, 4002, 2631, 2622, 2632, 2634, 2635, 2636,
-     2639, 2640, 2641, 2644, 2647, 4002, 2645, 2649, 4002, 2650,
-
-     2658, 2646, 2657, 2654, 4002, 2663, 4002, 2668, 2671, 2673,
-     2674, 2675, 2676, 2678, 2680, 2684, 2690, 2686, 2687, 2688,
-     4002, 2689, 2692, 2694, 2701, 2695, 2697, 2712, 2709, 2703,
-     2711, 2715, 2718, 2713, 2724, 2721, 2727, 2728, 4002, 2729,
-     2730, 4002, 2731, 2732, 2733, 2737, 4002, 2739, 4002, 2741,
-     2742, 2738, 2746, 2749, 2750, 2761, 2743, 2754, 2764, 2765,
-     2771, 2767, 2756, 4002, 4002, 2773, 2768, 2780, 2781, 2774,
-     2783, 2789, 2785, 2788, 4002, 2791, 2792, 2794, 2793, 2795,
-     2796, 2799, 2803, 2805, 2798, 2806, 2804, 2807, 4002, 2810,
-     2812, 2818, 2819, 2820, 2821, 2822, 4002, 2824, 2825, 2827,
-
-     2831, 2834, 2836, 2849, 2851, 2839, 2844, 2852, 2846, 2860,
-     2862, 2864, 2856, 2866, 2867, 2869, 2871, 2872, 4002, 2873,
-     2877, 2874, 2880, 2881, 2882, 2883, 2889, 2895, 2884, 2887,
-     2892, 2897, 4002, 2898, 2900, 2901, 2904, 2907, 2909, 2913,
-     2910, 2914, 2915, 2919, 2917, 4002, 2922, 2924, 2925, 2927,
-     2931, 2932, 2933, 2936, 2935, 2939, 2942, 2954, 2943, 4002,
-     2945, 4002, 2946, 2957, 2964, 2960, 2953, 4002, 2962, 2963,
-     4002, 2966, 4002, 2967, 2971, 2968, 2974, 2980, 4002, 2982,
-     2983, 2984, 2987, 2989, 2990, 2991, 4002, 2994, 2993, 3001,
-     3002, 2995, 3004, 3005, 3006, 3008, 3011, 3017, 3014, 4002,
-
-     3013, 3018, 3026, 3022, 3025, 4002, 4002, 3031, 3032, 3034,
-     3035, 3038, 4002, 4002, 4002, 3041, 4002, 3036, 4002, 4002,
-     3042, 3044, 4002, 3049, 4002, 3051, 3052, 3050, 3055, 3057,
-     4002, 3056, 3058, 3060, 4002, 3063, 3069, 3065, 3067, 4002,
-     3074, 4002, 3078, 3081, 3071, 3084, 3085, 3087, 3089, 3091,
-     3094, 3095, 3096, 3097, 3100, 3101, 3103, 3104, 3102, 3106,
-     3108, 3110, 3111, 3116, 3118, 3119, 3120, 3123, 3125, 3124,
-     3130, 3134, 3127, 3138, 3140, 4002, 4002, 3128, 3144, 3145,
-     3149, 3147, 3150, 3153, 3151, 4002, 3155, 3157, 3158, 3161,
-     3159, 3160, 3163, 3164, 3165, 3173, 3182, 3175, 3179, 3183,
-
-     3185, 3186, 3187, 3191, 3195, 4002, 3189, 3192, 4002, 4002,
-     3188, 3200, 3205, 3199, 3201, 3210, 3212, 4002, 3213, 3217,
-     3223, 3218, 4002, 3225, 4002, 3227, 3215, 3230, 3233, 4002,
-     4002, 4002, 3235, 3220, 3237, 3238, 3239, 3240, 3241, 3243,
-     4002, 3246, 3248, 3249, 3252, 3256, 3258, 3259, 3263, 3269,
-     3265, 3272, 3274, 4002, 4002, 3262, 3281, 3278, 3279, 3277,
-     3280, 3283, 3285, 3287, 4002, 3289, 3288, 3294, 3296, 3297,
-     3298, 3300, 3302, 4002, 3303, 3304, 3308, 3314, 3310, 3316,
-     3305, 3318, 3315, 3319, 3331, 3328, 3321, 4002, 3332, 3333,
-     4002, 3335, 3337, 3338, 4002, 3342, 4002, 4002, 3345, 4002,
-
-     4002, 3340, 3347, 3350, 3352, 3357, 3359, 3362, 3354, 3363,
-     3369, 3366, 3367, 4002, 4002, 3375, 3368, 3373, 3381, 4002,
-     4002, 3378, 3380, 3382, 3384, 3385, 3386, 3389, 3390, 3393,
-     3392, 3394, 3403, 3406, 3396, 3408, 3399, 3410, 3414, 3415,
-     3417, 4002, 3421, 3422, 3416, 4002, 3427, 3424, 4002, 3428,
-     3431, 3438, 3432, 3418, 3444, 3440, 3445, 4002, 3447, 3448,
-     4002, 3449, 4002, 4002, 4002, 3450, 3451, 3457, 4002, 3458,
-     3461, 4002, 3468, 3464, 3459, 3475, 3469, 3471, 3477, 3483,
-     3472, 3481, 4002, 3482, 3484, 3486, 3487, 3488, 3489, 3491,
-     3493, 3494, 3503, 3496, 3505, 3506, 4002, 3510, 3514, 4002,
-
-     3516, 3518, 4002, 3520, 3511, 3517, 3524, 4002, 3526, 3521,
-     3528, 3530, 3533, 3534, 3536, 3537, 3539, 3541, 3545, 4002,
-     3542, 3547, 3549, 3551, 3555, 3563, 3559, 3561, 4002, 3565,
-     3562, 4002, 3569, 3566, 3570, 3573, 3580, 3583, 3586, 3587,
-     4002, 3589, 4002, 4002, 4002, 3590, 4002, 3594, 3595, 3596,
-     3597, 3599, 3600, 4002, 4002, 3602, 3604, 3607, 4002, 3601,
-     3608, 3613, 3611, 3614, 3615, 3619, 3620, 3624, 3625, 4002,
-     4002, 3626, 4002, 3632, 3640, 3643, 4002, 4002, 4002, 3642,
-     4002, 3644, 4002, 3650, 3634, 3651, 4002, 3654, 3655, 4002,
-     3656, 3627, 3657, 3660, 3662, 3663, 3664, 3666, 3667, 3671,
-
-     3672, 3673, 3679, 4002, 4002, 3683, 4002, 3685, 4002, 3686,
-     3691, 4002, 3617, 3693, 3687, 3697, 4002, 4002, 3572, 3680,
-     3698, 3699, 3700, 3703, 3701, 4002, 4002, 4002, 3705, 4002,
-     3706, 3707, 3709, 4002, 3711, 3713, 3714, 3716, 3715, 3718,
-     3720, 3724, 3729, 3730, 3737, 3741, 3742, 3745, 3732, 3738,
-     3751, 3748, 3755, 4002, 3749, 4002, 4002, 3752, 3761, 3763,
-     3759, 3765, 3760, 4002, 3766, 3767, 3768, 3769, 3770, 3772,
-     3783, 3774, 3775, 3785, 3787, 3791, 3784, 3799, 3798, 3795,
-     3800, 3801, 3809, 3805, 3808, 4002, 3806, 3807, 3810, 3812,
-     3813, 3817, 3815, 3827, 3830, 3818, 3832, 3816, 3837, 3833,
-
-     3838, 3841, 3842, 3843, 4002, 3844, 3846, 3848, 3850, 3852,
-     3854, 3855, 3856, 3859, 3861, 3864, 3866, 3870, 4002, 3871,
-     4002, 4002, 3875, 3872, 3878, 3882, 3884, 4002, 4002, 4002,
-     3910, 3917, 3924, 3931, 3938,   94, 3945, 3952, 3959, 3966,
-     3973, 3980, 3987, 3994
+        0,    0,   38,   41,   44,   46,   59,   65,   71,   77,
+       90,  112, 3367, 3270,   81, 3997, 3997, 3997,   96,   52,
+       72,  107,  111,   70,   91,  109,  124,   98,  114,  117,
+      133,  136,   64,  144,  129,  145,  156,  165,  158,  173,
+     3017, 3997, 3997, 3997,  164, 2646, 3997, 3997, 3997,  137,
+     2462, 2408, 3997, 3997, 3997,  196, 1874, 3997, 3997, 3997,
+      189, 1815, 3997,  200, 3997,  204,  167, 1401,  208,  147,
+        0,  215,    0,    0,  209,  147,  202,  210,  211,  204,
+      219,  216,  217,  221,  230,  223,  227,  233,  220,  228,
+      232,  245,  241,  248,   63,  242,  252,  253,  249,  258,
+
+      259,  262,  265,  264,  266,  270,  274,  276,  275,  282,
+      281,  283,  285,  289,  170,  288,  286,  296,  300,  298,
+      311,  295,  299,  297,  314,  317,  319,  303,  320, 1373,
+      333, 1291,  336, 1222,  345,  884,  716,  337,  628,  351,
+      355,    0,  347,  349,  340,  351,  352,  353,  356,  357,
+       88,  364,  362,  368,  376,  361,  374,  379,  363,  384,
+      385,  373,  387,  392,  386,  393,  398,  399,  401,  402,
+      403,  405,  411,  418,  414,  422,  426,  424,  419,  435,
+      431,  438,  443,  434,  439,  442,  430,  445,  444,  446,
+      447,  453,  449,  455,  456,  457,  459,  467,  465,  469,
+
+      468,  470,  473,  485,  474,  475,  477,  492,  495,  494,
+      482,  490,  497,  491,  504,  501,  509,  500,  507,  508,
+      511,  512,  514,  518,  523,  529,  527,  530,  532,  521,
+      535,  539,  533,  540,  541,  550,  545,  547,  557,  549,
+      553,  554,  559,  560,  562,  556,  563,  558,  577,  564,
+      568,  579,  581,  583,  585,  587,  570,  586,  588,  590,
+      598,  601,  589,  607,  608,  610,  612,  613,  614,  616,
+      620,  621,  623,  624,  632,  627,  629,  630,  637,  636,
+      638,  644,  651,  655,  648,  646,  649,  656,  662,  658,
+      682,  652,  668,  679,  671,  674,  675,  663,  686,  676,
+
+      687,  688,  695,  689,  708,  691,  705,  706,  715,  710,
+      713,  724,  712,  714,  719,  723,  725,  729,  734,  728,
+      731,  739,  740,  736,  743,  742,  750,  752,  754,  755,
+      757,  756,  763,  765,  758,  766,  774,  775,  769,  772,
+      778,  780,  781,  782,  784,  786,  793, 3997,  795,  788,
+      791,  797,  798,  800, 3997,  801,  802,  803,  810,  805,
+      808,  811,  815,  826,  830,  827,  828,  816,  829,  831,
+      832,  834,  836,  837,  857,  840,  842,  843,  870,  846,
+      851,  844,  853,  854,  862,  867,  866,  868,  869,  880,
+      884,  882,  874,  886, 3997,  890,  902,  888,  895,  897,
+
+      898,  904,  899,  914,  905,  909,  907,  915,  916,  918,
+      927,  923,  925,  929,  938,  931,  940,  941,  933,  942,
+      943,  944,  945,  956,  951,  948,  946,  963,  959,  958,
+      965,  960,  969,  961,  971,  975,  967,  988,  974,  984,
+      985,  986,  990,  992,  993,  994,  996,  997, 1004, 1001,
+     1000, 1002, 1010, 1013, 1014, 1022, 1018, 1025, 1017, 1021,
+     1030, 1027, 1032, 1039, 1034, 1035, 1038, 1037, 1049, 1046,
+     1036, 1050, 1051, 1055, 1054, 1058, 1059, 1060, 1062, 1064,
+     1067, 1063, 1065, 1068, 1075, 1071, 1074, 1085, 1087, 1077,
+     1089, 1079, 1092, 1096, 1097, 1098, 1099, 1100, 1102, 1101,
+
+     1108, 1112, 1110, 1113, 1118, 1114, 1116, 1125, 1126, 1128,
+     3997, 1136, 1129, 1134, 1131, 1132, 1139, 1140, 1141, 1142,
+     1151, 3997, 1147, 3997, 3997, 1144, 3997, 3997, 1145, 1152,
+     1153, 1164, 1168, 1172, 1174, 1177, 1171, 1155, 1184, 1191,
+     1188, 1196, 1179, 1198, 1200, 1201, 1202, 1183, 1203, 1206,
+     1208, 1210, 1209, 1211, 1216, 1213, 1214, 1218, 1219, 1221,
+     1239, 1240, 1223, 1235, 1236, 1237, 1238, 1242, 1243, 1246,
+     1249, 1251, 1253, 1258, 1254, 3997, 1255, 1257, 1259, 1263,
+     1267, 1269, 1271,  306, 1272, 3997, 1274, 1278, 1279, 1280,
+     1282, 1284, 1287, 1288, 1289, 1290, 1292, 1293, 1296, 1295,
+
+     1297, 1313, 1302, 1306, 1314, 1321, 1322, 1320, 1299, 1317,
+     1325, 1323, 1331, 1333, 1335, 1334, 1336, 1345, 1340, 1342,
+     1343, 1347, 1348, 1350, 1351, 1353, 1355, 1356, 1378, 1357,
+     1362, 1359, 1365, 1364, 1367, 1375, 1371, 1372, 1384, 1391,
+     1392, 1393, 1395, 1379, 1396, 1402, 1411, 1404, 1417, 1413,
+     1415, 1418, 1416, 1422, 1424, 1426, 1420, 1429, 1433, 1436,
+     1437, 3997, 1444, 1442, 1440, 1447, 1454, 1446, 1449, 1453,
+     1455, 1450, 1456, 1457, 1458, 1461, 1469, 1467, 1470, 1471,
+     1478, 3997, 1473, 1475, 1474, 1477, 1485, 1486, 1488, 1494,
+     1502, 1498, 3997, 1484, 1505, 1506, 1509, 1501, 1503, 1513,
+
+     1514, 1516, 1517, 1518, 1519, 1521, 1522, 1525, 3997, 1524,
+     1529, 1532, 1534, 1531, 1541, 1543, 1542, 1544, 1547, 1548,
+     1555, 1551, 1552, 3997, 1550, 1562, 1553, 1554, 1575, 1576,
+     1558, 1572, 1579, 1571, 1574, 1580, 1585, 1582, 1584, 1583,
+     1586, 3997, 1587,  566, 1589, 1594, 1595, 1597, 1604, 1596,
+     1605, 1599, 1607, 1612, 1608, 1614, 1618, 1616, 1619, 1627,
+     1620, 1622, 1624, 1628, 1635, 1632, 1639, 1629, 1641, 1642,
+     1645, 1647, 1649, 1650, 1651, 3997, 1657, 1658, 1663, 1659,
+     1661, 1664, 1666, 1653, 1667, 1669, 1671, 1675, 1676, 1677,
+     1678, 3997, 1688, 1684, 1685, 1683, 1694, 1692, 1701, 1696,
+
+     1702, 1705, 1706, 1708, 1710, 1717, 1712, 1709, 1720, 1722,
+     1723, 1724, 1726, 1731, 1730, 1732, 1739, 1740, 1737, 1741,
+     1738, 1748, 1753, 1746, 3997, 1755, 1760, 1743, 1762, 1769,
+     1764, 1765, 1766, 1772, 1767, 1770, 1773, 1776, 1777, 1784,
+     1787, 1789, 3997, 1790, 1792, 1786, 1795, 1796, 1799, 1803,
+     1800, 1807, 1804, 1809, 1810, 1812, 1819, 1811, 1822, 1823,
+     1813, 3997, 1831, 1833, 1832, 1840, 1835, 1836, 1838, 1842,
+     1839, 1843, 1845, 1852, 1847, 1850, 1848, 1851, 1853, 1856,
+     1857, 1862, 1866, 1865, 1858, 1872, 3997, 1873, 1884, 1879,
+     1885, 1887, 1886, 1896, 1891, 1894, 1897, 1875, 1899, 1898,
+
+     1902, 1904, 3997, 1906, 1907, 1908, 1909, 1912, 1913, 1914,
+     1911, 1918, 1915, 1931, 1919, 1932, 1933, 1934, 1935, 1938,
+     1945, 1950, 1946, 1951, 3997, 1954, 1955, 1949, 1942, 1957,
+     1961, 1963, 1970, 1972, 1965, 1967, 1968, 1973, 1974, 1976,
+     1977, 1984, 1979, 1980, 1988, 1989, 1990, 1981, 1991, 1993,
+     2009, 2001, 1997, 2005, 2011, 2003, 2014, 2017, 2018, 3997,
+     2019, 2022, 2026, 2027, 2029, 2028, 2021, 2040, 2036, 3997,
+     2031, 3997, 2042, 2043, 2051, 3997, 2053, 3997, 2055, 2048,
+     3997, 2056, 2057, 2050, 2060, 2061, 2062, 2063, 2069, 2066,
+     2071, 2072, 2074, 2076, 2077, 2079, 2083, 3997, 2090, 2082,
+
+     2080, 2092, 2097, 2084, 2086, 2099, 2095, 2101, 2105, 2113,
+     2109, 2117, 3997, 2112, 2119, 2114, 2116, 3997, 2120, 2123,
+     2125, 2121, 2128, 2136, 2127, 2138, 2135, 2139, 2142, 2149,
+     2150, 2148, 2152, 2153, 2160, 2156, 2163, 2155, 2162, 2159,
+     2165, 2168, 2169, 2172, 2174, 2175, 2177, 2182, 2179, 2180,
+     2181, 2183, 3997, 2185, 2191, 2193, 2194, 2196, 2201, 2202,
+     3997, 2197, 3997, 2205, 2207, 2215, 2216, 2220, 2208, 2222,
+     2221, 2223, 2227, 2234, 2238, 2226, 2229, 2233, 2239, 2241,
+     2243, 3997, 2244, 2245, 2247, 2249, 2250, 2256, 2266, 2262,
+     2252, 2278, 3997, 2260, 2258, 2268, 2285, 2280, 3997, 2264,
+
+     2288, 2283, 2289, 3997, 3997, 2275, 2287, 2290, 2291, 2293,
+     2305, 2297, 2300, 3997, 2302, 2304, 2306, 2311, 2314, 2315,
+     2308, 2307, 3997, 2321, 2323, 2325, 2326, 2328, 2329, 2327,
+     2337, 2332, 2334, 2342, 2350, 2335, 2354, 3997, 2351, 2355,
+     2358, 2347, 2360, 2361, 2362, 2363, 2366, 2367, 2368, 2369,
+     2373, 2381, 2377, 2380, 2382, 2386, 2383, 2391, 2379, 2393,
+     2397, 2410, 2405, 3997, 2412, 2395, 2415, 2394, 2417, 2420,
+     2424, 2414, 2387, 2411, 2429, 2422, 3997, 2436, 2425, 2432,
+     2438, 2434, 2440, 2443, 2444, 2445, 2448, 3997, 3997, 2449,
+     2451, 2452, 2454, 2455, 2456, 2468, 2457, 2459, 3997, 2465,
+
+     2477, 2472, 2473, 2484, 2485, 2487, 2476, 2488, 2474, 2489,
+     2490, 2493, 2491, 2495, 2498, 2500, 2503, 3997, 2501, 2504,
+     2506, 2505, 2513, 2517, 2514, 2527, 2512, 2518, 2524, 2534,
+     2536, 2543, 2545, 2529, 2538, 2546, 3997, 2541, 2547, 2548,
+     2531, 2558, 2549, 2563, 2554, 3997, 2559, 2564, 2568, 2570,
+     2561, 2572, 2574, 2576, 2575, 3997, 2580, 3997, 2583, 2577,
+     3997, 2587, 2591, 2573, 2588, 2592, 2594, 2596, 2598, 2601,
+     2602, 3997, 2605, 2604, 2609, 2611, 3997, 2608, 3997, 2612,
+     3997, 2614, 2619, 2621, 2623, 2624, 2343, 2627, 3997, 2630,
+     2631, 2634, 2632, 2636, 2638, 2642, 2643, 2639, 2644, 2647,
+
+     3997, 2648, 2649, 3997, 2656, 2658, 2645, 2662, 2664, 3997,
+     2670, 3997, 2672, 2674, 2652, 2675, 2681, 2677, 2684, 2676,
+     2685, 2693, 2690, 2688, 2691, 3997, 2692, 2696, 2698, 2702,
+     2700, 2704, 2712, 2708, 2707, 2714, 2716, 2718, 2720, 2721,
+     2728, 2722, 2725, 3997, 2730, 2733, 3997, 2734, 2736, 2739,
+     2742, 3997, 2740, 3997, 2743, 2744, 2741, 2745, 2751, 2752,
+     2763, 2748, 2760, 2765, 2755, 2775, 2771, 2753, 3997, 3997,
+     2777, 2772, 2783, 2784, 2778, 2780, 2792, 2788, 2795, 3997,
+     2787, 2791, 2797, 2789, 2800, 2799, 2802, 2807, 2809, 2801,
+     2803, 2810, 2811, 3997, 2814, 2815, 2819, 2821, 2823, 2822,
+
+     2824, 3997, 2826, 2828, 2829, 2827, 2835, 2846, 2850, 2852,
+     2839, 2853, 2855, 2858, 2860, 2862, 2864, 2857, 2869, 2865,
+     2872, 2874, 2875, 3997, 2832, 2878, 2879, 2881, 2882, 2884,
+     2885, 2886, 2892, 2889, 2895, 2893, 2897, 3997, 2899, 2901,
+     2903, 2905, 2907, 2904, 2914, 2911, 2915, 2916, 2920, 2917,
+     3997, 2925, 2927, 2928, 2930, 2929, 2933, 2934, 2936, 2935,
+     2940, 2941, 2952, 2954, 3997, 2945, 3997, 2947, 2959, 2963,
+     2961, 2964, 3997, 2966, 2967, 3997, 2968, 3997, 2969, 2973,
+     2971, 2975, 2983, 3997, 2989, 2979, 2994, 2985, 2990, 2977,
+     2998, 3997, 3001, 3000, 3007, 3008, 2992, 3002, 3009, 3010,
+
+     3011, 3015, 3024, 3019, 3997, 3016, 3021, 3033, 3028, 3035,
+     3997, 3997, 3029, 3038, 3041, 2948, 3045, 3997, 3997, 3997,
+     3048, 3997, 3034, 3997, 3997, 3049, 3051, 3997, 3056, 3997,
+     3059, 3057, 3060, 3040, 3061, 3997, 3063, 3030, 3065, 3997,
+     3068, 3073, 3069, 3070, 3997, 3072, 3997, 3074, 3079, 3081,
+     3088, 3080, 3084, 3092, 3096, 3098, 3093, 3083, 3099, 3102,
+     3103, 3104, 3106, 3107, 3109, 3110, 3112, 3113, 3117, 3118,
+     3120, 3121, 3123, 3125, 3124, 3126, 3135, 3129, 3137, 3144,
+     3997, 3997, 3139, 3147, 3141, 3148, 3149, 3150, 3151, 3152,
+     3997, 3155, 3157, 3156, 3160, 3161, 3162, 3164, 3171, 3172,
+
+     3178, 3179, 3175, 3181, 3183, 3184, 3185, 3186, 3190, 3192,
+     3997, 3188, 3198, 3997, 3997, 3199, 3200, 3208, 3201, 3204,
+     3210, 3211, 3997, 3212, 3214, 3221, 3213, 3997, 3224, 3997,
+     3229, 3225, 3231, 3233, 3997, 3997, 3997, 3234, 3236, 3237,
+     3238, 3240, 3241, 3242, 3243, 3997, 3239, 3248, 3252, 3249,
+     3256, 3260, 3262, 3263, 3271, 3267, 3274, 3276, 3997, 3997,
+     3266, 3283, 3278, 3280, 3281, 3284, 3286, 3287, 3288, 3997,
+     3293, 3297, 3289, 3291, 3301, 3303, 3305, 3308, 3997, 3295,
+     3298, 3309, 3316, 3311, 3313, 3319, 3321, 3323, 3325, 3327,
+     3324, 3331, 3997, 3335, 3333, 3997, 3337, 3338, 3339, 3997,
+
+     3347, 3997, 3997, 3350, 3997, 3997, 3340, 3355, 3358, 3359,
+     3364, 3366, 3368, 3343, 3369, 3351, 3371, 3372, 3997, 3997,
+     3379, 3374, 3375, 3386, 3997, 3997, 3377, 3384, 3385, 3387,
+     3388, 3389, 3392, 3393, 3396, 3394, 3398, 3406, 3409, 3395,
+     3414, 3400, 3415, 3416, 3417, 3418, 3997, 3422, 3423, 3424,
+     3997, 3428, 3429, 3997, 3430, 3432, 3435, 3436, 3440, 3450,
+     3433, 3443, 3997, 3447, 3451, 3997, 3453, 3997, 3997, 3997,
+     3454, 3457, 3460, 3997, 3461, 3464, 3997, 3471, 3467, 3462,
+     3479, 3472, 3475, 3474, 3483, 3481, 3485, 3997, 3486, 3487,
+     3489, 3490, 3491, 3498, 3494, 3496, 3500, 3499, 3497, 3512,
+
+     3501, 3997, 3514, 3517, 3997, 3519, 3521, 3997, 3525, 3509,
+     3522, 3527, 3997, 3530, 3528, 3532, 3534, 3536, 3537, 3538,
+     3539, 3541, 3544, 3548, 3997, 3543, 3551, 3557, 3553, 3561,
+     3568, 3552, 3564, 3997, 3566, 3567, 3997, 3573, 3574, 3575,
+     3576, 3578, 3583, 3585, 3587, 3997, 3591, 3997, 3997, 3997,
+     3593, 3997, 3596, 3588, 3597, 3598, 3600, 3601, 3997, 3997,
+     3603, 3605, 3608, 3997, 3609, 3610, 3614, 3612, 3615, 3616,
+     3620, 3621, 3622, 3626, 3997, 3997, 3625, 3997, 3628, 3633,
+     3637, 3997, 3997, 3997, 3647, 3997, 3640, 3997, 3649, 3635,
+     3642, 3997, 3651, 3652, 3997, 3654, 3655, 3657, 3660, 3662,
+
+     3663, 3665, 3666, 3670, 3669, 3671, 3673, 3678, 3997, 3997,
+     3680, 3997, 3683, 3997, 3675, 3686, 3997, 3687, 3688, 3693,
+     3695, 3997, 3997, 3697, 3702, 3698, 3701, 3703, 3705, 3704,
+     3997, 3997, 3997, 3707, 3997, 3709, 3711, 3714, 3997, 3715,
+     3716, 3717, 3719, 3718, 3721, 3724, 3725, 3733, 3735, 3741,
+     3743, 3747, 3748, 3730, 3749, 3756, 3751, 3758, 3997, 3754,
+     3997, 3997, 3759, 3766, 3767, 3762, 3768, 3763, 3997, 3770,
+     3771, 3772, 3773, 3774, 3775, 3783, 3777, 3791, 3789, 3795,
+     3797, 3779, 3805, 3804, 3801, 3787, 3807, 3815, 3810, 3811,
+     3997, 3812, 3813, 3814, 3818, 3819, 3816, 3822, 3827, 3834,
+
+     3825, 3836, 3823, 3838, 3839, 3840, 3844, 3845, 3848, 3997,
+     3849, 3851, 3852, 3853, 3857, 3855, 3859, 3860, 3865, 3862,
+     3876, 3880, 3866, 3997, 3877, 3997, 3997, 3881, 3868, 3870,
+     3884, 3891, 3997, 3997, 3997, 3905, 3912, 3919, 3926, 3933,
+      388, 3940, 3947, 3954, 3961, 3968, 3975, 3982, 3989
     } ;
 
-static yyconst flex_int16_t yy_def[2045] =
+static yyconst flex_int16_t yy_def[2050] =
     {   0,
-     2030,    1, 2031, 2031, 2032, 2032, 2033, 2033, 2034, 2034,
-     2035, 2035, 2030, 2036, 2030, 2030, 2030, 2030, 2037, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2038, 2030, 2030, 2030, 2038, 2039, 2030, 2030, 2030, 2039,
-     2040, 2030, 2030, 2030, 2030, 2040, 2041, 2030, 2030, 2030,
-     2041, 2042, 2030, 2043, 2030, 2042, 2042, 2036, 2036, 2030,
-     2044, 2037, 2044, 2037, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2038,
-     2038, 2039, 2039, 2040, 2040, 2030, 2041, 2041, 2042, 2042,
-     2043, 2043, 2042, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2042, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2042, 2036, 2036, 2036, 2036, 2036,
-
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2030, 2036, 2036,
-     2036, 2036, 2036, 2036, 2030, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2030, 2042, 2036, 2036, 2036, 2036,
-
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-
-     2036, 2036, 2036, 2042, 2036, 2036, 2036, 2036, 2036, 2030,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2030, 2036, 2030, 2030, 2036, 2030, 2030, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2030, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2030, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2042,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2030, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2030, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2030,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-
-     2036, 2036, 2036, 2036, 2036, 2030, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2030, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2030, 2036,
-     2042, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2030, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2030, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2030, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2030, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2030, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2030, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2030,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2030, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2030, 2036, 2030, 2036, 2036, 2036,
-     2030, 2036, 2030, 2036, 2036, 2030, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2030, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2030, 2036, 2036,
-     2036, 2036, 2030, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2030, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2030, 2036, 2030, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2030, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2030, 2036, 2036,
-     2036, 2036, 2036, 2030, 2036, 2036, 2036, 2036, 2030, 2030,
-
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2030, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2030, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2030, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2030, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2030, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2030, 2030, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2030, 2036, 2036, 2036, 2036, 2036, 2036,
-
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2030, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2030, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2030, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2030, 2036, 2030, 2036, 2036, 2030, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2030, 2036, 2036, 2036,
-     2036, 2030, 2036, 2030, 2036, 2030, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2030, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2030, 2036, 2036, 2030, 2036,
-
-     2036, 2036, 2036, 2036, 2030, 2036, 2030, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2030, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2030, 2036,
-     2036, 2030, 2036, 2036, 2036, 2036, 2030, 2036, 2030, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2030, 2030, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2030, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2030, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2030, 2036, 2036, 2036,
-
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2030, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2030, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2030, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2030,
-     2036, 2030, 2036, 2036, 2036, 2036, 2036, 2030, 2036, 2036,
-     2030, 2036, 2030, 2036, 2036, 2036, 2036, 2036, 2030, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2030, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2030,
-
-     2036, 2036, 2036, 2036, 2036, 2030, 2030, 2036, 2036, 2036,
-     2036, 2036, 2030, 2030, 2030, 2036, 2030, 2036, 2030, 2030,
-     2036, 2036, 2030, 2036, 2030, 2036, 2036, 2036, 2036, 2036,
-     2030, 2036, 2036, 2036, 2030, 2036, 2036, 2036, 2036, 2030,
-     2036, 2030, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2030, 2030, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2030, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-
-     2036, 2036, 2036, 2036, 2036, 2030, 2036, 2036, 2030, 2030,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2030, 2036, 2036,
-     2036, 2036, 2030, 2036, 2030, 2036, 2036, 2036, 2036, 2030,
-     2030, 2030, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2030, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2030, 2030, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2030, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2030, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2030, 2036, 2036,
-     2030, 2036, 2036, 2036, 2030, 2036, 2030, 2030, 2036, 2030,
-
-     2030, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2030, 2030, 2036, 2036, 2036, 2036, 2030,
-     2030, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2030, 2036, 2036, 2036, 2030, 2036, 2036, 2030, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2030, 2036, 2036,
-     2030, 2036, 2030, 2030, 2030, 2036, 2036, 2036, 2030, 2036,
-     2036, 2030, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2030, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2030, 2036, 2036, 2030,
-
-     2036, 2036, 2030, 2036, 2036, 2036, 2036, 2030, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2030,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2030, 2036,
-     2036, 2030, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2030, 2036, 2030, 2030, 2030, 2036, 2030, 2036, 2036, 2036,
-     2036, 2036, 2036, 2030, 2030, 2036, 2036, 2036, 2030, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2030,
-     2030, 2036, 2030, 2036, 2036, 2036, 2030, 2030, 2030, 2036,
-     2030, 2036, 2030, 2036, 2036, 2036, 2030, 2036, 2036, 2030,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-
-     2036, 2036, 2036, 2030, 2030, 2036, 2030, 2036, 2030, 2036,
-     2036, 2030, 2036, 2036, 2036, 2036, 2030, 2030, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2030, 2030, 2030, 2036, 2030,
-     2036, 2036, 2036, 2030, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2030, 2036, 2030, 2030, 2036, 2036, 2036,
-     2036, 2036, 2036, 2030, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2030, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036,
-
-     2036, 2036, 2036, 2036, 2030, 2036, 2036, 2036, 2036, 2036,
-     2036, 2036, 2036, 2036, 2036, 2036, 2036, 2036, 2030, 2036,
-     2030, 2030, 2036, 2036, 2036, 2036, 2036, 2030, 2030,    0,
-     2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030,
-     2030, 2030, 2030, 2030
+     2035,    1, 2036, 2036, 2037, 2037, 2038, 2038, 2039, 2039,
+     2040, 2040, 2035, 2041, 2035, 2035, 2035, 2035, 2042, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2043, 2035, 2035, 2035, 2043, 2044, 2035, 2035, 2035, 2044,
+     2045, 2035, 2035, 2035, 2035, 2045, 2046, 2035, 2035, 2035,
+     2046, 2047, 2035, 2048, 2035, 2047, 2047, 2041, 2041, 2035,
+     2049, 2042, 2049, 2042, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2043,
+     2043, 2044, 2044, 2045, 2045, 2035, 2046, 2046, 2047, 2047,
+     2048, 2048, 2047, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2047, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2047, 2041, 2041, 2041, 2041, 2041,
+
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2035, 2041, 2041,
+     2041, 2041, 2041, 2041, 2035, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2035, 2047, 2041, 2041, 2041, 2041,
+
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+
+     2041, 2041, 2041, 2041, 2047, 2041, 2041, 2041, 2041, 2041,
+     2035, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2035, 2041, 2035, 2035, 2041, 2035, 2035, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2035, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2035, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2047, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2035, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2035, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2035, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2035, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2035, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2035, 2041, 2047, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2035, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2035, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2035, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2035, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2035, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2035, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+
+     2041, 2041, 2035, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2035, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2035,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2035,
+     2041, 2035, 2041, 2041, 2041, 2035, 2041, 2035, 2041, 2041,
+     2035, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2035, 2041, 2041,
+
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2035, 2041, 2041, 2041, 2041, 2035, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2035, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2035, 2041, 2035, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2035, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2035, 2041, 2041, 2041, 2041, 2041, 2035, 2041,
+
+     2041, 2041, 2041, 2035, 2035, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2035, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2035, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2035, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2035, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2035, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2035, 2035, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2035, 2041,
+
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2035, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2035, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2035, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2035, 2041, 2035, 2041, 2041,
+     2035, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2035, 2041, 2041, 2041, 2041, 2035, 2041, 2035, 2041,
+     2035, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2035, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+
+     2035, 2041, 2041, 2035, 2041, 2041, 2041, 2041, 2041, 2035,
+     2041, 2035, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2035, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2035, 2041, 2041, 2035, 2041, 2041, 2041,
+     2041, 2035, 2041, 2035, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2035, 2035,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2035,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2035, 2041, 2041, 2041, 2041, 2041, 2041,
+
+     2041, 2035, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2035, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2035, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2035, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2035, 2041, 2035, 2041, 2041, 2041,
+     2041, 2041, 2035, 2041, 2041, 2035, 2041, 2035, 2041, 2041,
+     2041, 2041, 2041, 2035, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2035, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+
+     2041, 2041, 2041, 2041, 2035, 2041, 2041, 2041, 2041, 2041,
+     2035, 2035, 2041, 2041, 2041, 2041, 2041, 2035, 2035, 2035,
+     2041, 2035, 2041, 2035, 2035, 2041, 2041, 2035, 2041, 2035,
+     2041, 2041, 2041, 2041, 2041, 2035, 2041, 2041, 2041, 2035,
+     2041, 2041, 2041, 2041, 2035, 2041, 2035, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2035, 2035, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2035, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2035, 2041, 2041, 2035, 2035, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2035, 2041, 2041, 2041, 2041, 2035, 2041, 2035,
+     2041, 2041, 2041, 2041, 2035, 2035, 2035, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2035, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2035, 2035,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2035,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2035, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2035, 2041, 2041, 2035, 2041, 2041, 2041, 2035,
+
+     2041, 2035, 2035, 2041, 2035, 2035, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2035, 2035,
+     2041, 2041, 2041, 2041, 2035, 2035, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2035, 2041, 2041, 2041,
+     2035, 2041, 2041, 2035, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2035, 2041, 2041, 2035, 2041, 2035, 2035, 2035,
+     2041, 2041, 2041, 2035, 2041, 2041, 2035, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2035, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+
+     2041, 2035, 2041, 2041, 2035, 2041, 2041, 2035, 2041, 2041,
+     2041, 2041, 2035, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2035, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2035, 2041, 2041, 2035, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2035, 2041, 2035, 2035, 2035,
+     2041, 2035, 2041, 2041, 2041, 2041, 2041, 2041, 2035, 2035,
+     2041, 2041, 2041, 2035, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2035, 2035, 2041, 2035, 2041, 2041,
+     2041, 2035, 2035, 2035, 2041, 2035, 2041, 2035, 2041, 2041,
+     2041, 2035, 2041, 2041, 2035, 2041, 2041, 2041, 2041, 2041,
+
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2035, 2035,
+     2041, 2035, 2041, 2035, 2041, 2041, 2035, 2041, 2041, 2041,
+     2041, 2035, 2035, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2035, 2035, 2035, 2041, 2035, 2041, 2041, 2041, 2035, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2035, 2041,
+     2035, 2035, 2041, 2041, 2041, 2041, 2041, 2041, 2035, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2035, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2035,
+     2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041,
+     2041, 2041, 2041, 2035, 2041, 2035, 2035, 2041, 2041, 2041,
+     2041, 2041, 2035, 2035,    0, 2035, 2035, 2035, 2035, 2035,
+     2035, 2035, 2035, 2035, 2035, 2035, 2035, 2035, 2035
     } ;
 
-static yyconst flex_uint16_t yy_nxt[4042] =
+static yyconst flex_uint16_t yy_nxt[4038] =
     {   0,
        14,   15,   16,   17,   18,   19,   18,   14,   14,   14,
-       14,   18,   20,   21,   14,   22,   23,   24,   25,   14,
-       26,   27,   28,   29,   30,   31,   32,   33,   34,   35,
-       36,   37,   38,   39,   40,   14,   14,   14,   14,   42,
-       43,   44,   42,   43,   44,  132,   47,   48,  132,   45,
-       49,   70,   45,   47,   48,   71,   50,   49,   58,   59,
-       60,   69,   69,   50,   52,   53,   54,   55,   61,   18,
-       58,   59,   60,  130,  130,   56,   52,   53,   54,   55,
-       61,   18,   69,  106,  237,   75,   76,   56,   15,   16,
-       17,   63,   64,   65,   68,   68,   69,   68,   68,   66,
-
-       68,   97,   69,   77,   69,   68,   86,  144,   67,   15,
-       16,   17,   63,   64,   65,   69,   69,   78,   69,   90,
-       66,   69,   88,   69,   79,  132,   87,   91,  132,   67,
-       73,   80,   73,   73,   69,   73,   89,  155,   96,   69,
-       73,   74,   69,   92,  137,  137,   93,   81,   69,   98,
-       69,   82,  140,   94,   83,   95,   84,   85,   69,   99,
-       69,  103,  112,  140,  125,  104,  143,  100,   70,  126,
-       69,  113,   71,  101,   69,  114,   69,  102,  145,   69,
-       69,  105,   69,   69,  122,  115,  123,  107,  116,   69,
-      127,  108,   69,  150,  128,   69,  146,  109,  129,  156,
-
-      110,  124,   69,  191,  140,   69,  161,  111,   69,  134,
-      149,  134,  134,  117,  134,   73,  118,   73,   73,  139,
-       73,  139,  139,  119,  139,  160,  142,  120,  121,   68,
-       69,   68,   68,  147,   68,   69,   69,  138,   69,   68,
-       73,  151,   73,   73,  157,   73,  148,  152,   69,   69,
-       73,   74,  159,   69,  153,  154,   69,   69,   69,   69,
-      164,   69,  158,  165,  167,  171,  162,  168,   69,   69,
-       69,  163,   69,  166,  173,  175,  172,   69,   69,  176,
-      169,  170,  179,   69,   69,   69,   69,   69,   69,   69,
-      180,  178,  177,  182,  174,   69,   69,  181,  183,  186,
-
-       69,   69,   69,   69,   69,  188,  185,  184,  196,  189,
-       69,   69,   69,   69,  187,  199,   69,  193,  195,   69,
-       69,  190,  192,  194,  198,  200,   69,  201,  197,   69,
-      203,  206,  204,   69,   69,   69,   69,   69,  208,  283,
-      205,  211,  130,  130,  137,  137,  209,  202,  140,  136,
-       69,  212,  207,  210,  134,  213,  134,  134,  139,  134,
-      139,  139,   73,  139,   73,   73,  214,   73,   69,   69,
-       69,   69,   69,  142,   69,   69,  221,  216,   69,  224,
-       69,   69,  222,  215,  220,  223,  225,  218,  226,  217,
-       69,   69,   69,  233,  219,   69,   69,   69,   69,   69,
-
-       69,  235,  236,  238,   69,  239,   69,   69,   69,   69,
-      227,   69,  240,  135,  234,  228,  264,   69,  242,  241,
-      229,  243,  245,   69,   69,  230,  244,  251,  246,   69,
-      247,  231,  232,  253,  255,  248,   69,  254,   69,   69,
-      252,  257,   69,   69,  133,  256,   69,  249,  260,  250,
-       69,  258,  262,   69,  263,  261,   69,   69,   69,   69,
-       69,   69,   69,   69,  259,   69,  266,  268,   69,  265,
-      272,  270,   69,   69,   69,   69,   69,  278,  267,   69,
-      276,  271,   69,   69,  269,  281,   69,  273,   69,  274,
-       69,  285,   69,  284,  275,  289,   69,   69,  277,  282,
-
-       69,  279,  280,  291,  287,   69,  288,  286,   69,   69,
-      140,  292,   69,   69,  298,   69,   69,   69,  290,   69,
-      294,  297,  295,   69,   69,  300,   69,  131,  293,  299,
-       69,  296,  301,  302,  304,   69,  309,  303,  306,   69,
-       69,  305,  307,   69,  308,   69,  310,   69,  311,   69,
-       69,   69,   69,  314,   69,  317,  315,   69,   69,  319,
-       69,   69,  320,  316,   69,  312,  313,   69,  322,   69,
-       69,  318,  321,   69,   69,   69,   69,  327,  323,   69,
-       69,   69,  328,   69,  330,   69,  332,  324,  326,  335,
-       69,  325,  329,   69,   69,   69,  336,   69,   69,  331,
-
-       69,  333,  334,   69,  348,   69,  338,  337,   69,  342,
-       69,   69,  346,  347,  339,  340,  344,  341,   69,  343,
-      345,  349,   69,   69,   69,  355,   69,   69,  350,   69,
-       69,  351,  353,  354,  356,   69,  357,  352,   69,   69,
-       69,  363,  358,  359,   69,   69,   69,   69,   69,   69,
-      361,  360,  365,  366,   69,  362,   69,   69,   69,  367,
-      368,  375,  369,  370,  364,  374,   69,   69,   69,   69,
-      371,  377,  376,  372,   69,  373,   69,  382,   69,  378,
-       69,  394,   69,  140,  380,  395,   69,   69,  379,   69,
-      381,  393,  384,  383,   69,  392,  385,  386,   69,   69,
-
-      400,   69,  398,   69,  396,   69,  387,   69,  388,  389,
-      390,   69,  401,  391,   69,  406,  404,  397,  403,  399,
-       69,  402,  405,   69,   69,  410,   69,   69,  413,  414,
-       69,   69,  412,   69,  407,  408,   69,   69,  409,   69,
-       69,   69,  411,  419,  420,   69,   69,   69,   69,  421,
-       69,  418,  416,  415,   69,  417,   69,  424,   69,  426,
-      428,  423,   69,  427,  422,   69,   69,  430,   69,  433,
-      425,  429,   69,   69,  432,  431,   69,  436,  434,   69,
-       69,   69,  439,  440,  437,   69,  435,   69,   69,  441,
-       69,   69,   69,  438,   69,  443,   69,  447,  446,   69,
-
-      444,   69,   69,  450,  445,   69,  448,   69,  442,   69,
-      451,   69,   69,   69,   69,  453,   69,  461,   69,   69,
-      449,  454,   69,   69,   69,  456,  452,  462,  463,   69,
-      466,  455,  457,  460,  458,   69,  459,  465,  464,  467,
-       69,   69,   69,   69,   69,   69,  470,  473,   69,   69,
-       69,   69,   69,   69,  469,  475,   69,   69,   69,   69,
-      489,   69,  468,  474,  471,  476,  472,  503,  486,  140,
-      477,   69,  478,  484,   69,  485,  487,  479,  490,  480,
-       69,   69,   69,  491,  492,   69,  488,  481,   69,  493,
-      482,   69,   69,  497,   69,  494,   69,  483,   69,  499,
-
-      496,   69,  140,  495,  505,  500,  504,   69,   69,   69,
-       69,  138,   69,   69,  498,   69,  502,  501,   69,  506,
-      509,  510,   69,  508,  512,  511,  507,  513,   69,   69,
-       69,  514,   69,  515,   69,  516,  520,  517,   69,   69,
-      521,   69,  523,   69,  524,   69,  526,   69,  518,  525,
-       69,  519,  522,  528,   69,  527,   69,   69,   69,  529,
-       69,  533,  530,   69,  532,   69,   69,  534,   69,  531,
-      535,  537,   69,   69,   69,   69,   69,  538,   69,   69,
-      544,  540,   69,   69,   69,  551,  541,  539,  536,  546,
-      542,   69,  543,  545,  549,   69,  547,  548,   69,   69,
-
-       69,   69,  552,   69,  550,  554,  555,   69,   69,   69,
-       69,  561,   69,  558,   69,   69,   69,  563,  562,  556,
-      557,   69,  560,   69,  553,  559,  564,   69,  136,  568,
-       69,   69,  565,  566,   69,  567,  569,  570,   69,   69,
-       69,  571,   69,  573,  572,   69,  577,  574,   69,  578,
-       69,   69,   69,  575,   69,  580,   69,   69,  576,  579,
-      583,  582,   69,  585,  584,   69,   69,   69,  587,  589,
-      581,   69,   69,   69,   69,   69,  588,   69,   69,  586,
-       69,  594,   69,  600,  595,   69,   69,   69,   69,  590,
-      591,   69,  592,  596,  593,   69,  603,   69,  597,   69,
-
-      599,  598,  605,  604,   69,  601,  602,   69,   69,  606,
-       69,   69,   69,  607,   69,   69,  611,  610,   69,  612,
-      613,  609,   69,  614,   69,   69,  608,   69,   69,  616,
-      140,  621,  615,  617,   69,  620,  619,   69,  622,  618,
-       69,  624,   69,  627,   69,   69,   69,   69,   69,  625,
-      629,  626,   69,   69,  632,   69,   69,  630,  623,   69,
-      633,   69,   69,   69,  628,  631,   69,   69,  644,   69,
-      645,  634,  643,  642,   69,  646,  641,  647,   69,  135,
-      635,   69,   69,  655,   69,  656,  636,  658,  659,   69,
-      637,   69,   69,  638,  657,   69,  661,   69,  660,  667,
-
-      639,   69,  663,  640,   69,  648,  649,  662,  650,   69,
-       69,  651,   69,  665,  664,   69,  652,  666,   69,   69,
-       69,   69,  653,  654,   69,  673,   69,  668,  672,   69,
-       69,   69,   69,  679,   69,   69,  678,  669,  682,  670,
-      671,  674,  680,  675,  677,  681,   69,   69,  676,   69,
-       69,   69,  683,   69,   69,   69,   69,  684,   69,  685,
-      687,  688,  690,   69,   69,  693,   69,  691,   69,   69,
-       69,  686,  692,   69,   69,  689,  697,  695,  696,  698,
-       69,   69,  700,   69,   69,  694,   69,   69,   69,  703,
-      705,  706,   69,   69,  699,   69,   69,  704,  701,   69,
-
-      708,   69,   69,   69,   69,   69,   69,  710,  702,  714,
-      713,   69,  717,   69,  707,   69,   69,  709,  721,   69,
-       69,  711,  712,  716,  715,  718,  720,  724,  725,  719,
-      723,  722,   69,   69,   69,   69,   69,   69,  726,   69,
-       69,  732,  730,   69,  733,   69,  734,  737,  728,   69,
-       69,   69,   69,   69,  727,   69,  729,  739,   69,   69,
-      731,  741,  140,  735,  736,   69,   69,   69,   69,  743,
-      738,  740,   69,  754,  742,   69,   69,   69,   69,  745,
-      755,  746,  758,   69,   69,  744,   69,   69,  747,   69,
-      756,  760,  748,   69,  749,   69,   69,  761,  750,  759,
-
-      751,  762,  757,   69,   69,  752,   69,  763,  764,  765,
-      753,  767,   69,   69,   69,  787,  769,  772,   69,  766,
-      771,   69,   69,  773,   69,   69,  768,  770,   69,  774,
-      779,   69,   69,  785,  775,  781,  776,  780,   69,  783,
-       69,   69,   69,  782,   69,  784,  789,  777,  788,   69,
-       69,  790,   69,  791,  778,  786,   69,  794,   69,   69,
-       69,   69,   69,  792,  795,  793,   69,   69,   69,  797,
-      798,   69,   69,   69,   69,   69,  800,  796,  802,   69,
-      808,   69,  799,   69,  806,   69,  804,  801,  807,   69,
-       69,  803,   69,   69,  805,  812,   69,  813,  814,   69,
-
-      809,  810,   69,  816,  811,  815,  817,   69,   69,  820,
-       69,   69,  818,  821,   69,   69,  822,   69,   69,  823,
-      824,  828,  825,  819,   69,   69,   69,   69,  830,   69,
-      826,   69,   69,  827,   69,   69,  833,  834,   69,  839,
-       69,  836,   69,   69,  829,  832,  835,   69,  831,  838,
-       69,  840,   69,  842,  837,   69,   69,  847,   69,   69,
-       69,   69,   69,   69,  848,  841,  849,  133,   69,   69,
-      843,  846,  851,   69,  844,  853,  845,  854,  850,  852,
-      855,   69,   69,  858,   69,   69,  857,   69,  856,   69,
-       69,  862,   69,   69,   69,   69,   69,   69,   69,   69,
-
-       69,   69,  861,  860,  871,  864,  859,  131,  880,   69,
-      863,   69,  865,  868,   69,  869,  867,  872,  870,  866,
-       69,   69,   69,   69,   69,  873,  874,   69,  875,  877,
-      879,   69,   69,  883,   69,   69,   69,  876,   69,   69,
-       69,  888,  878,   69,  886,   69,  881,   69,  889,  884,
-       69,  882,  890,  892,  885,   69,   69,   69,   69,  887,
-       69,  891,  895,   69,   69,  894,   69,   69,  897,   69,
-      899,   69,   69,  893,   69,   69,  900,  896,   69,  898,
-       69,  904,   69,  902,  901,   69,  903,  905,  909,   69,
-      913,  906,   69,   69,   69,   69,   69,   69,  908,  907,
-
-      910,  912,  915,   69,   69,   69,  919,  914,  917,  911,
-      920,   69,   69,   69,   69,   69,  916,  918,   69,  924,
-      927, 1136,  926,  921,   69,   69,  922,  923,  925,   69,
-      928,   69,   69,  930,   69,   69,  929,  931,   69,  932,
-       69,  933,   69,  935,  934,   69,  938,  939,   69,   69,
-       69,   69,   69,  940,  941,   69,  936,   69,  947,  948,
-      949,   69,   69,  937,   69,   69,  950,   69,   69,   69,
-      951,   69,   69,  942,   69,   69,  953,  957,  943,   69,
-      944,  954,  945,  952,  946,  955,   69,  959,  956,  960,
-      958,   69,   69,   69,  963,  965,   69,   69,  964,   69,
-
-      961,  967,   69,   69,  969,   69,  968,  971,   69,   69,
-      962,   69,  966,  973,   69,   69,  974,  976,   69,   69,
-       69,   69,   69,   69,  970,  978,  980,   69,  981,  972,
-      979,   69,   69,   69,   69,   69,  975,  983,  986,  977,
-      984,  982,  987,   69,   69,  985,  989,   69,   69,  988,
-       69,   69,   69,  991,  993,   69,   69,  990,  996,  997,
-       69,  992,   69,   69,   69,   69,   69, 1003,   69,   69,
-       69,   69,  994,   69,  998, 1001,  995,   69, 1007, 2030,
-      999,   69, 1000, 1002, 1008,   69, 1010, 1012, 1004, 1006,
-       69, 1013,   69, 1009, 1005,   69, 1011,   69,   69, 1014,
-
-     1016, 1018,   69, 1015,   69,   69,   69,   69, 1019,   69,
-       69, 1017,   69, 1020,   69, 1024,   69,   69,   69,   69,
-     1027,   69,   69,   69, 1021,   69,   69, 1023, 1036,   69,
-     1025, 1030,   69, 1022, 1026, 1028, 1031, 1029, 1032,   69,
-     1033,   69,   69,   69, 1035, 1034, 1037, 1038,   69, 2030,
-       69, 1039, 1044, 1042, 1041, 1043, 1045,   69, 1040,   69,
-     1046,   69,   69, 1047, 1048,   69,   69,   69,   69,   69,
-     1049,   69,   69, 1055, 1052, 1057, 1050, 1056,   69, 1058,
-       69,   69,   69,   69,   69, 1053, 1051,   69,   69,   69,
-       69, 1054, 1066,   69,   69, 1065,   69,   69,   69,   69,
-
-       69, 1059, 1060, 1061,   69,   69, 1062, 1064, 1063, 1067,
-       69, 1074, 1068, 1069, 1071, 1070, 1076, 1091,   69, 1072,
-     1073, 1075, 1077,   69,   69,   69,   69,   69,   69, 1078,
-     1079,   69,   69, 1083,   69,   69, 1081, 1084, 1080, 1088,
-       69, 1082,   69,   69,   69, 1094,   69, 1089, 1090,   69,
-     1085, 1087, 1086, 1093, 1092,   69,   69, 1097,   69, 1098,
-     1096, 1095, 1099,   69,   69, 1100,   69,   69,   69,   69,
-     1103, 1102,   69,   69, 1105,   69,   69,   69, 1107, 1109,
-       69, 1110,   69, 1101,   69, 1112,   69, 1104,   69, 1106,
-       69, 1108,   69,   69, 1115, 1118,   69,   69, 1117, 1114,
-
-       69,   69, 1111,   69, 1121,   69, 1122,   69, 1113,   69,
-       69, 1116,   69, 2030, 1120, 1119,   69,   69, 1125, 1127,
-       69, 1128,   69, 1129, 1131, 1123,   69, 1124,   69,   69,
-     1126,   69, 1130,   69, 1132, 1133,   69, 1135,   69, 1137,
-       69, 1134,   69, 1143,   69, 1138, 1139, 1140,   69,   69,
-     1141, 1145,   69,   69, 1144, 1149, 1148, 1146,   69, 1150,
-       69,   69, 1142,   69,   69, 1147, 1154,   69, 1156,   69,
-       69,   69, 1155,   69,   69, 1158, 1159,   69,   69, 1151,
-       69,   69, 1152, 1160, 1153,   69, 1167,   69,   69,   69,
-       69,   69, 1157,   69, 1162,   69, 1172,   69, 1161, 1164,
-
-     1165, 1163, 1166,   69,   69,   69,   69, 1168,   69, 1170,
-     1169, 1174, 1176,   69, 1171,   69,   69, 1177,   69, 1175,
-     1178, 1183,   69, 1173, 1184,   69,   69,   69,   69, 1179,
-     1180, 1185, 1186,   69, 1187, 1181,   69,   69,   69, 1193,
-       69, 1182, 1188,   69,   69, 1189, 1190, 1192,   69, 1191,
-     1194,   69,   69, 1196,   69,   69, 1195,   69,   69, 1203,
-       69, 1197, 1198,   69,   69,   69, 1200, 2030, 1199, 1206,
-       69, 1207, 1205,   69, 1209, 1202, 1204, 1210, 1212, 1214,
-     1201,   69, 1213,   69,   69, 1208,   69,   69, 1217,   69,
-       69, 1211, 1216,   69,   69, 1218, 1220,   69,   69, 1215,
-
-       69,   69,   69, 1221,   69, 1222, 1219, 1229, 1225,   69,
-     1226, 1223,   69, 1224,   69,   69, 1227, 1232,   69,   69,
-       69,   69,   69, 1228, 1234, 1230, 1235, 1236,   69,   69,
-       69,   69, 1231, 1237,   69, 1233, 1241,   69, 1238,   69,
-       69,   69, 1239, 1244, 1247, 1240, 1243,   69, 1242,   69,
-       69,   69, 1245, 1251,   69,   69,   69, 1250, 1252, 1248,
-     1246, 1253,   69,   69,   69, 1255, 1256,   69, 1249, 1254,
-       69,   69,   69,   69,   69, 1257, 1258,   69,   69, 1259,
-       69,   69, 1262, 1263, 1260, 1267,   69, 1268, 1261,   69,
-       69,   69,   69, 1272,   69, 1266, 1264,   69, 1265, 1274,
-
-       69,   69, 1269, 1276,   69, 1277,   69, 1278, 1270, 1279,
-     1271, 1273,   69,   69, 1280, 1282,   69,   69, 1275,   69,
-       69, 1284,   69,   69, 1285, 1286,   69,   69, 1293,   69,
-       69, 1281,   69,   69,   69, 1299,   69, 1291, 1287, 1288,
-     1289, 1283,   69,   69, 1301, 1290, 1295, 1292, 1297, 1294,
-     1296,   69,   69, 1298,   69,   69, 1304, 1305,   69,   69,
-       69, 1307,   69,   69,   69,   69,   69, 1312, 1300, 1306,
-     1309,   69, 1302, 1310, 1308,   69, 1303,   69, 1316,   69,
-     1315,   69, 1319,   69, 1320, 1321,   69,   69, 1318,   69,
-       69, 1311,   69, 1314,   69, 1322,   69, 1313,   69, 1317,
-
-       69, 1323,   69, 1327,   69,   69, 1330,   69,   69,   69,
-     1326,   69, 1332,   69, 1324, 1325, 2030,   69,   69,   69,
-     1328, 1336, 1331,   69, 1335, 1337,   69, 1338, 1333,   69,
-     1329, 1345, 1334, 1339,   69, 1342,   69, 1340, 1347,   69,
-     1346,   69, 1341, 1344, 1343,   69, 1348, 1350,   69, 1353,
-     1349,   69,   69,   69,   69,   69,   69,   69, 1358, 1355,
-     1352,   69,   69,   69, 1360, 1354,   69, 1351, 1356,   69,
-       69,   69, 1363, 1362, 1361, 1364,   69, 1365,   69,   69,
-       69,   69, 1357, 1359,   69, 1367, 1366, 1369,   69, 1368,
-       69,   69, 1373,   69, 1372, 1371,   69, 1370, 1375,   69,
-
-       69,   69,   69,   69,   69, 1374,   69, 1380, 1382, 1377,
-       69, 1381,   69,   69,   69, 1384, 1376,   69, 1383, 1378,
-       69, 1379,   69, 1389,   69,   69, 1385, 1391, 1386, 1387,
-     1393, 1388,   69, 1390,   69,   69,   69, 1395,   69, 1392,
-     1396, 1397,   69,   69,   69, 1400,   69,   69,   69, 1394,
-     1398,   69,   69,   69, 1399, 1401,   69,   69,   69,   69,
-     1403,   69,   69, 1404, 1405, 1408,   69, 1412, 1402,   69,
-       69, 1407, 1413, 1416, 1415,   69, 1414, 1410, 1409, 1406,
-       69, 1411, 1419,   69, 1417,   69,   69,   69,   69, 1422,
-       69, 1421,   69, 1423, 1418, 1424,   69, 1427,   69,   69,
-
-       69,   69,   69, 1428,   69, 1433,   69,   69, 1430,   69,
-     1425, 1420, 1429,   69, 1434,   69, 1426, 1439, 1432, 1437,
-     1431,   69, 1435,   69,   69,   69, 1438,   69, 1441, 1436,
-       69, 1442, 1446,   69, 1443, 1440,   69, 1444, 1445,   69,
-       69,   69,   69,   69,   69,   69, 1449, 1450, 1447,   69,
-       69,   69, 1448,   69,   69,   69, 1451, 1455,   69, 1456,
-     1460,   69,   69, 1453, 1452, 1454,   69, 1459,   69, 1457,
-     1464, 1461, 1462,   69, 1463, 1458,   69,   69, 1467,   69,
-       69, 1465, 1468,   69, 1471,   69,   69, 1469, 1470, 1472,
-     1466, 1473,   69,   69, 1474,   69, 1477,   69, 1475, 1479,
-
-       69,   69, 1478,   69,   69,   69,   69,   69,   69, 1481,
-       69,   69, 1484, 1476, 1487,   69,   69,   69,   69,   69,
-     1483, 1488,   69, 1490,   69, 1489, 1485, 1486, 1480, 1482,
-       69,   69,   69,   69,   69, 1500,   69,   69, 1492,   69,
-     1501, 1493, 1491,   69, 2030, 1498,   69, 1494,   69, 1505,
-     1496,   69, 1502, 1497, 1495, 1499,   69, 1503,   69, 1504,
-     1506,   69, 1507,   69,   69, 1510, 1508, 1511,   69, 1509,
-     1512, 1513,   69, 1514,   69, 1515,   69, 1517,   69,   69,
-     1519,   69, 1520,   69,   69,   69,   69, 1516, 1523,   69,
-     1522, 1525,   69,   69,   69,   69,   69, 1518, 1528,   69,
-
-     1527,   69, 1529, 1521,   69, 1524, 1531,   69, 1535,   69,
-       69, 1526,   69,   69, 1533, 1532,   69, 1530, 1540,   69,
-     1539,   69,   69, 1534, 1542,   69,   69,   69, 1538,   69,
-     1536,   69, 1546, 1544,   69, 1537,   69,   69, 1547,   69,
-     1541, 1549, 1543,   69,   69,   69, 1548,   69,   69, 1553,
-     1554,   69, 1551, 1545,   69,   69, 1556,   69,   69, 1560,
-     1557, 1559, 1550, 1555, 1552,   69,   69, 1562, 1558,   69,
-     1563, 1564,   69, 1565,   69,   69,   69, 1561,   69,   69,
-       69, 1566, 1572,   69, 1570, 1567,   69, 1568, 1573, 1569,
-     1571, 1576,   69, 1577,   69,   69,   69, 1579, 1575,   69,
-
-     1574,   69,   69,   69, 1583,   69,   69,   69, 1585, 1578,
-     1584, 1580, 1586,   69,   69, 1581,   69,   69,   69, 1587,
-       69, 1582, 1591,   69, 1594,   69,   69, 1588, 1593,   69,
-       69, 1590, 1595, 1598,   69, 1597, 1589,   69,   69, 1600,
-     1592, 1596, 1599,   69,   69, 1602,   69,   69,   69, 1603,
-       69, 1605, 1606,   69,   69, 1609,   69, 1601, 1611, 1608,
-     1610,   69,   69,   69,   69, 1612, 1607,   69,   69,   69,
-       69, 1618,   69, 1604, 1615,   69, 1620,   69, 1613,   69,
-     2030,   69, 1617,   69, 1619, 1623,   69, 1616, 1626, 1614,
-       69, 1624, 1625,   69, 1622, 1621,   69,   69, 1627,   69,
-
-     1630,   69, 1631,   69, 1629, 1632,   69,   69,   69,   69,
-     1635, 1628,   69,   69,   69,   69,   69, 1641,   69, 1633,
-       69, 1639,   69,   69, 1636, 1637, 1634, 1638,   69, 1642,
-       69,   69,   69, 1648, 1640,   69,   69,   69, 1654,   69,
-       69, 1645,   69, 1644, 1649, 1647,   69, 1652, 1643, 1655,
-       69, 1653,   69, 1656, 1646, 1650,   69,   69, 1651,   69,
-     1657,   69,   69,   69, 1664,   69, 1665,   69, 1661,   69,
-       69,   69,   69,   69, 1658,   69,   69,   69, 1666, 1659,
-     1668, 1660, 1662, 1663, 1674,   69, 1669,   69, 1667, 1675,
-     1670,   69, 1672, 1671,   69,   69, 1673,   69,   69,   69,
-
-       69,   69, 1679,   69,   69, 1676, 1677,   69, 1682, 1683,
-     1684,   69,   69,   69, 1678, 1687, 1688,   69, 1680, 1681,
-     1686, 1691,   69, 1685,   69,   69, 1689,   69, 1692,   69,
-       69, 1690,   69, 1694, 1695,   69, 1697,   69, 1698,   69,
-     1693, 1700,   69, 1696, 1701,   69, 1699,   69, 1702,   69,
-       69,   69,   69,   69, 1703,   69, 1706, 1707,   69, 1705,
-       69,   69, 1704, 1709,   69, 1711, 1712, 1714,   69, 1715,
-       69,   69, 1708, 1710,   69,   69, 1718,   69, 1716, 1713,
-     1717,   69, 1719, 1720,   69, 1721,   69, 1722, 1723,   69,
-       69,   69,   69,   69, 1724,   69, 1725,   69, 1726,   69,
-
-       69,   69, 1729, 1728, 1731, 1732,   69, 1727,   69,   69,
-       69, 1730,   69, 1737,   69,   69,   69,   69, 1735, 1736,
-       69, 1734,   69, 1738, 1733, 1742,   69,   69,   69, 1746,
-       69,   69, 1745,   69, 1739, 1748, 1740, 1744, 1751, 1741,
-       69, 1743, 1749,   69,   69,   69, 1747,   69, 1750,   69,
-       69, 1754,   69, 1752,   69, 1757, 1758,   69, 1753,   69,
-     1760, 1761,   69, 1755,   69, 1756,   69, 1762, 1763,   69,
-     1764,   69, 1759, 1765,   69,   69, 1768, 1769,   69,   69,
-       69,   69, 1771, 1770, 1766,   69, 1772,   69, 1775, 1767,
-       69, 1774,   69,   69,   69, 1776,   69,   69,   69, 1779,
-
-     1783,   69,   69, 1773,   69,   69,   69, 1787,   69, 1777,
-     1778,   69, 1782, 1785, 1780,   69, 1788, 1781,   69, 1789,
-       69, 1784,   69, 1786, 1790, 1791,   69,   69,   69,   69,
-       69, 1792, 1797,   69,   69, 1794,   69, 1798, 1800,   69,
-       69, 1801, 1803,   69,   69, 1806, 1799, 1795, 1793, 1796,
-       69, 1807,   69, 1805, 1804, 1808,   69,   69, 1802,   69,
-       69,   69,   69,   69, 1815, 1809, 1810, 1814, 1811,   69,
-       69,   69, 1812,   69, 1818, 1817,   69, 1819, 1816, 1820,
-       69,   69, 1823,   69,   69, 1821, 1813,   69, 1825,   69,
-     1827, 1822, 1829,   69,   69,   69,   69, 1832,   69,   69,
-
-       69,   69, 1824,   69, 1834,   69,   69, 1826,   69, 1828,
-     1835, 1831, 1833, 1830, 1838,   69, 1841,   69,   69, 1836,
-     1839, 1843,   69,   69, 1837, 1844,   69, 1845,   69,   69,
-       69, 1847,   69,   69, 1840, 1846,   69, 1842,   69, 1851,
-       69, 1854,   69, 1848, 1855,   69,   69, 1852,   69,   69,
-     1859,   69, 1849,   69,   69, 1850, 1860,   69, 1861,   69,
-     1857,   69, 1853,   69, 1864, 1856, 1862,   69, 1865, 1858,
-     1867,   69, 1870,   69,   69,   69, 1871,   69,   69, 1863,
-     1873,   69,   69, 1874,   69,   69, 1866, 1935, 1868, 1869,
-     1876, 1877,   69, 1872, 1878,   69, 1875, 1879,   69,   69,
-
-     1881,   69,   69, 1882, 1880, 1883,   69,   69,   69,   69,
-     1887,   69,   69,   69,   69, 1890,   69, 1888, 1886,   69,
-       69, 1884, 1889,   69, 1891,   69,   69,   69, 1885,   69,
-     1894,   69,   69, 1892, 1896, 1895,   69,   69,   69,   69,
-     1893, 1931, 1902, 1904,   69, 1897,   69, 1898, 1915, 1899,
-     1900, 1905,   69, 1907,   69,   69,   69, 1901, 1903, 1906,
-     1908, 1909,   69,   69, 1910, 1912,   69,   69,   69,   69,
-     1916, 1917,   69, 1918,   69,   69,   69, 1911,   69,   69,
-     1919, 2030, 1913,   69,   69,   69, 1914, 1936, 1923, 1924,
-     1926,   69,   69, 1921, 1927,   69, 1928,   69,   69,   69,
-
-     1922, 1920, 1930,   69, 1925,   69, 1932, 1929, 1934,   69,
-       69,   69,   69,   69, 1933,   69, 1938,   69,   69,   69,
-     1942,   69, 1943,   69, 1937,   69,   69,   69,   69, 1941,
-       69, 1939,   69, 1940, 1946, 1945,   69, 2030, 1947, 1944,
-     1954,   69,   69, 1950,   69, 1948, 1949, 1952, 1956,   69,
-       69, 1955, 1957,   69,   69, 1951, 1953,   69, 1962, 1958,
-       69,   69, 1959,   69,   69, 1961, 1964,   69, 1967, 1960,
-     1968,   69,   69,   69, 1963,   69, 1965,   69,   69,   69,
-       69,   69,   69, 1966,   69, 1969,   69,   69, 1980, 1977,
-     1970, 1971, 1972, 1974, 1975,   69,   69,   69, 1973,   69,
-
-     1978, 1976, 1981,   69, 1982, 1979, 1985,   69, 1983, 1986,
-       69,   69,   69,   69, 1987, 1984, 1990,   69,   69,   69,
-       69,   69,   69, 1993,   69,   69, 1997,   69,   69,   69,
-       69, 1988, 1989, 1992, 1998, 2002, 1991, 1996, 1994,   69,
-     2000, 1995,   69, 2001,   69,   69, 1999, 2004, 2005,   69,
-       69, 2003, 2006,   69,   69,   69,   69, 2007,   69, 2009,
-       69, 2011,   69, 2012,   69, 2015,   69,   69,   69, 2018,
-     2019,   69, 2008,   69, 2010, 2021,   69, 2022,   69, 2013,
-     2020, 2014,   69,   69,   69, 2016, 2017,   69, 2024, 2023,
-       69, 2030, 2025, 2028,   69, 2029,   69, 2030, 2030, 2030,
-
-     2030, 2030, 2030, 2026, 2030, 2030, 2030, 2030, 2030, 2027,
-       41,   41,   41,   41,   41,   41,   41,   46,   46,   46,
-       46,   46,   46,   46,   51,   51,   51,   51,   51,   51,
-       51,   57,   57,   57,   57,   57,   57,   57,   62,   62,
-       62,   62,   62,   62,   62,   72,   72, 2030,   72,   72,
-       72,   72,  130,  130, 2030, 2030, 2030,  130,  130,  132,
-      132, 2030, 2030,  132, 2030,  132,  134, 2030, 2030, 2030,
-     2030, 2030,  134,  137,  137, 2030, 2030, 2030,  137,  137,
-      139, 2030, 2030, 2030, 2030, 2030,  139,  141,  141, 2030,
-      141,  141,  141,  141,   73,   73, 2030,   73,   73,   73,
-
-       73,   13, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030,
-     2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030,
-     2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030,
-     2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030,
-     2030
+       14,   14,   18,   20,   21,   14,   22,   23,   24,   25,
+       14,   26,   27,   28,   29,   30,   31,   32,   33,   34,
+       35,   36,   37,   38,   39,   40,   14,   14,   14,   14,
+       42,   43,   44,   42,   43,   44,   47,   48,   47,   48,
+       49,   45,   49,   68,   45,   68,   68,   50,   68,   50,
+       52,   53,   54,   55,   68,   18,   52,   53,   54,   55,
+      171,   18,   56,   58,   59,   60,   69,   69,   56,   58,
+       59,   60,   70,   69,   61,   69,   71,   86,   75,   76,
+       61,   15,   16,   17,   63,   64,   65,   73,  106,   73,
+
+       73,   69,   73,   66,   69,   88,   77,   87,   73,   74,
+      220,   69,   67,   15,   16,   17,   63,   64,   65,   89,
+       69,   78,   69,   90,   69,   66,   96,   69,   79,   81,
+       69,   91,   97,   82,   67,   80,   83,   69,   84,   85,
+      132,   92,   69,  132,   93,   98,   69,   99,   70,   69,
+      103,   94,   71,   95,  104,  100,  112,   69,   69,  113,
+       69,  101,  107,  114,  145,  102,  108,  130,  130,   69,
+      105,   69,  109,  115,  117,  110,  116,  118,   69,  122,
+      140,  123,  111,   69,  119,  125,   69,  127,  120,  121,
+      126,  128,  137,  137,  143,  129,  124,  134,  195,  134,
+
+      134,   73,  134,   73,   73,  139,   73,  139,  139,   68,
+      139,   68,   68,  142,   68,   69,   73,   69,   73,   73,
+       68,   73,   69,   69,   69,  144,  147,   73,   74,   69,
+       69,  150,   69,   69,   69,  146,   69,  157,  151,  148,
+       69,   69,  149,   69,  152,   69,   69,  153,  154,  164,
+      159,  162,  155,  156,   69,   69,  158,  161,   69,  163,
+      160,   69,   69,  165,  167,   69,   69,  168,  166,  175,
+      173,   69,   69,  176,  172,   69,  179,   69,   69,   69,
+      169,  170,  180,   69,  182,  178,  177,   69,   69,   69,
+      174,  181,  183,  186,   69,   69,   69,  191,   69,   69,
+
+      188,   69,   69,  184,  189,  185,  187,  199,   69,   69,
+       69,   69,   69,   69,  190,  193,   69,  197,  192,   69,
+      196,  194,  198,  200,   69,  201,  203,   69,  204,  206,
+       69,  205,   69,   69,  210,  208,  130,  130,  211,  132,
+      137,  137,  132,  705,  209,  202,  134,  214,  134,  134,
+      207,  134,  139,   69,  139,  139,   73,  139,   73,   73,
+      140,   73,   69,  212,   69,   69,   69,  213,  142,   69,
+       69,  221,  226,  216,   69,   69,   69,   69,  222,  215,
+      223,   69,  224,  225,  218,  217,   69,   69,   68,   69,
+      219,  228,   69,  233,  227,  234,  229,   69,   69,   69,
+
+       69,  230,  235,  236,  238,   69,   69,  231,  232,  237,
+      239,   69,   69,  240,   69,   69,   69,  247,   69,  245,
+      246,  241,  248,  242,   69,  253,  243,   69,  254,  255,
+      244,   69,   69,  257,  249,   69,  250,   69,  251,   69,
+      252,  256,  260,   69,   69,  262,  258,   69,   69,  261,
+      263,   69,   69,  259,  264,   69,   69,   69,   69,   69,
+       69,  266,   69,  267,  268,  265,   69,  270,   69,   69,
+       69,  272,   69,  271,  278,  276,  281,  273,   69,  269,
+       69,   69,   69,   69,  274,  283,   69,   69,   69,  275,
+       69,  288,  285,  284,  277,   69,  279,  280,   69,  289,
+
+      287,  282,  291,  140,   69,   69,  286,   69,   69,  292,
+       69,  298,  297,   69,   69,  295,  300,   69,  294,  299,
+       69,   69,   69,  290,   69,   69,  293,   69,  301,  296,
+      306,   69,  304,  307,   69,  303,   69,  308,  302,  309,
+       69,  310,   69,   69,  311,   69,   69,  317,   69,  313,
+      305,  314,   69,   69,   69,  316,  315,  319,   69,  320,
+       69,  312,   69,   69,  322,  321,   69,   69,  318,   69,
+       69,   69,   69,   69,  327,   69,   69,   69,  328,  140,
+      330,   69,  323,   69,  324,  326,  335,  329,  325,  331,
+       69,  332,   69,  334,   69,  333,   69,  336,   69,   69,
+
+       69,   69,   69,   69,  343,  346,  347,  338,  337,  342,
+      348,   69,  344,  345,   69,  339,  340,  349,  341,  350,
+       69,   69,  351,   69,  355,   69,   69,   69,  357,   69,
+      353,  356,  354,   69,   69,  352,   69,   69,  359,  363,
+       69,  140,   69,   69,  358,   69,  360,  365,  366,   69,
+       69,   69,  362,  368,  367,  369,  361,   69,  375,   69,
+      364,   69,   69,  370,   69,   69,  374,  371,   69,   69,
+      372,   69,  373,  376,  377,   69,   69,  380,  382,  379,
+      392,   69,  378,  381,  140,  384,  394,   69,   69,   69,
+      393,  395,   69,  400,  383,   69,  399,  385,  386,   69,
+
+       69,   69,   69,  398,   69,  396,  397,  387,   69,  388,
+      389,  390,  401,  404,  391,  406,  403,  405,   69,   69,
+      402,   69,  410,   69,  407,   69,   69,   69,   69,  138,
+      408,  412,   69,  409,  413,  414,   69,   69,   69,  411,
+      419,   69,   69,  416,   69,  415,  420,   69,  417,   69,
+      418,  421,   69,   69,  428,   69,   69,  431,  424,  423,
+      429,  425,  427,   69,  430,   69,  422,   69,   69,   69,
+       69,   69,  434,  433,  426,  435,   69,  437,   69,   69,
+      440,  441,   69,  438,  439,   69,  432,   69,   69,  436,
+      444,   69,  442,   69,   69,   69,  448,   69,  447,   69,
+
+      445,   69,  449,  443,   69,  446,   69,  451,   69,  452,
+       69,   69,  454,   69,   69,   69,   69,  462,   69,  455,
+      450,   69,  453,   69,   69,  457,  464,  463,   69,   69,
+      461,  456,  458,  467,  459,  460,  466,  468,  465,   69,
+       69,   69,   69,   69,   69,   69,  471,   69,  474,   69,
+       69,  472,  476,   69,  470,   69,   69,   69,  492,   69,
+      475,  469,  490,  473,   69,  477,   69,   69,  494,  478,
+       69,  479,  487,  485,  486,   69,  480,  488,  481,   69,
+       69,   69,   69,   69,  491,  136,  482,   69,  489,  483,
+      495,  493,  496,   69,  497,   69,  484,   69,  500,   69,
+
+      498,   69,  503,  140,  499,  504,  501,  505,   69,  506,
+       69,   69,   69,  507,  502,   69,  511,   69,   69,  510,
+       69,  513,   69,  509,  512,  515,  508,   69,   69,   69,
+      514,   69,  518,  517,  521,  516,   69,  524,   69,  522,
+       69,  525,   69,  527,   69,  526,   69,  519,  529,  523,
+      520,   69,  528,   69,   69,   69,   69,   69,   69,   69,
+      531,   69,  534,  535,   69,  533,  537,  530,  536,   69,
+      539,   69,   69,   69,   69,  532,   69,  540,   69,  538,
+       69,  542,   69,  546,   69,  541,  543,   69,   69,  548,
+      544,  545,  547,  549,  550,  551,  552,   69,   69,   69,
+
+      553,   69,  554,   69,  556,   69,   69,   69,  557,   69,
+       69,  563,  560,   69,   69,   69,  565,   69,  566,  559,
+      564,  558,  562,   69,  555,  561,   69,   69,  567,  570,
+       69,   69,  572,  573,   69,   69,  571,  575,   69,  574,
+       69,  569,  576,   69,  568,   69,  579,   69,   69,   69,
+       69,   69,   69,  577,  582,  584,  585,  581,  578,   69,
+      587,  586,   69,   69,   69,  589,  580,   69,   69,  583,
+      591,   69,   69,   69,  588,   69,   69,   69,   69,  596,
+       69,   69,  602,  590,   69,  592,  597,   69,   69,  593,
+       69,  594,   69,  595,  599,  598,  601,  600,   69,  605,
+
+       69,  607,   69,  603,  606,   69,  604,  608,  609,   69,
+       69,   69,   69,   69,   69,   69,  613,  612,  615,  614,
+      616,   69,  611,   69,  610,   69,   69,   69,  618,   69,
+      623,  140,  617,  624,  619,  621,  622,  620,   69,   69,
+      626,   69,   69,  629,   69,   69,  634,   69,  627,   69,
+      628,  631,   69,   69,   69,   69,  632,   69,   69,  625,
+       69,  635,  630,  633,   69,   69,   69,  645,   69,  638,
+      647,  646,  636,  639,  644,  643,  640,   69,  648,  650,
+      637,   69,  649,  641,   69,   69,  642,   69,  651,  652,
+       69,  653,   69,  660,  654,  658,   69,   69,  670,  655,
+
+      661,   69,  659,  662,   69,  656,  657,  665,  663,   69,
+      664,   69,  666,   69,   69,   69,   69,  668,  667,   69,
+      669,   69,   69,   69,   69,  676,   69,   69,  671,   69,
+      675,   69,   69,  682,   69,  135,   69,  681,  672,  685,
+      678,  673,  674,  680,  677,  679,  683,  684,   69,   69,
+       69,   69,   69,   69,  686,   69,   69,  687,  688,   69,
+      690,  693,   69,  691,   69,  696,   69,   69,   69,  689,
+       69,   69,   69,  694,  695,  700,   69,  698,  692,  699,
+       69,  701,   69,  703,   69,   69,  697,   69,  706,  708,
+      709,   69,   69,   69,  702,   69,  707,   69,  711,  704,
+
+       69,   69,   69,   69,  133,   69,   69,  717,   69,   69,
+       69,  716,   69,  710,  724,   69,  712,  713,  720,   69,
+      721,  715,  714,  718,  722,  719,   69,   69,  727,  728,
+       69,  730,  723,   69,   69,   69,   69,  729,   69,  725,
+      736,  726,  731,  733,   69,  735,   69,   69,   69,   69,
+      732,  737,  740,   69,  742,   69,   69,  734,   69,  744,
+      140,   69,  739,   69,   69,  738,   69,  746,   69,   69,
+       69,  757,   69,  741,  743,   69,  745,   69,   69,  758,
+       69,  761,  749,  747,   69,   69,  131,  759,   69,  750,
+      748,   69,   69,  763,  751,  762,  752,   69,  764,  765,
+
+      753,  766,  754,  760,   69,   69,   69,  755,   69,   69,
+      768,  770,  756,  772,   69,   69,  776,   69,  775,  767,
+      769,  774,  771,  773,   69,  777,   69,  778,   69,   69,
+       69,   69,  779,   69,  780,   69,  784,   69,  787,   69,
+      783,  789,   69,  785,  788,  781,   69,  786,  792,   69,
+       69,  794,  782,   69,  793,   69,  790,   69,  795,   69,
+       69,  798,   69,   69,  799,  791,   69,   69,   69,   69,
+       69,   69,  796,  797,   69,  801,  806,  802,  804,  803,
+       69,  800,   69,   69,   69,  812,   69,   69,   69,  805,
+       69,   69,  810,  811,  807,  816,  808,   69,   69,   69,
+
+      809,   69,  815,  817,  818,  813,  814,   69,  820,  821,
+      819,   69,  824,  823,   69,   69,   69,  825,   69,   69,
+      826,  832,   69,  827,  822,  828,   69,   69,  829,   69,
+       69,   69,   69,  834,   69,   69,  830,   69,   69,  837,
+      838,  831,   69,  840,   69,   69,  843,   69,  836,  833,
+      839,  842,  835,  844,   69,   69,   69,   69,  841,  846,
+       69,   69,  851,   69,   69,   69,   69,   69,   69,  852,
+      853,   69,  845,  847,  850,   69,  848,  856,  855,  857,
+      849,  854,  858,  859,   69,   69,  860,   69,   69,   69,
+      861,  862,   69,   69,  866,   69,   69,   69,   69,   69,
+
+       69,  864,   69,  863,  875,  865,  868,   69,   69,   69,
+       69,  876,   69,  867,  877,  869,  872,   69,   69,  871,
+       69,   69,  873,  878,  870,   69,  879,   69,  874,   69,
+      881,   69,   69,   69,  880,   69,  882,   69,  884,  887,
+       69,   69,   69,  890,  885,   69,  883,  888,   69,  892,
+      893,  886,   69,  889,   69,   69,  895,  896,   69,  894,
+       69,  891,   69,   69,   69,  899,   69,  898,  901,  903,
+       69,   69,   69,  897,   69,  904,   69,   69,  910,   69,
+       69,  900,   69,  902,   69,  905,  909,  906,   69,   69,
+       69,   69,  908,  907,  914,  918,   69,   69,   69,  911,
+
+      917,   69,  913,  912,  915,   69,  920,   69,  924,   69,
+      916,  919,  922,  925,   69,   69,  921,  923,   69,   69,
+      929,   69,   69,   69,  932,   69,  933,  934,  926,  927,
+       69,  928,  931,   69,  930,   69,   69,   69,  938,   69,
+      936,  937,  935,   69,   69,   69,  943,  944,  939,  940,
+       69,   69,   69,   69,   69,  945,   69,  941,  946,   69,
+      947,   69,  952,  942,  953,  948,   69,  949,   69,  950,
+      954,  951,  955,   69,  957,   69,  959,   69,   69,   69,
+       69,  960,   69,   69,  958,   69,   69,  962,  956,   69,
+       69,  961,  966,  964,  965,  969,  970,   69,  963,   69,
+
+       69,  972,   69,   69,  967,   69,  973,  976,   69,   69,
+      974,  978,   69,   69,  968,  971,   69,   69,  975,  981,
+       69,  979,   69,   69,   69,   69,   69,  983,  140,  977,
+      985,  984,   69,  986,  980,   69,   69,  982,  991,  990,
+      992,  988,  987,  989,   69,   69,   69,  994,   69,   69,
+      993,   69,   69,   69,  998,   69,   69,  995,   69, 1002,
+       69,   69,  997,   69,   69,   69,   69, 1008,  996,   69,
+       69,   69,  999, 1006, 1003,   69, 1000, 1013,   69,   69,
+     1004, 1001, 1007, 1005, 1012,   69,   69,  138,   69, 1009,
+     1015, 1017,   69, 1011, 1014, 1010, 1018,   69,   69,   69,
+
+       69, 1019, 1021, 1023,   69, 1016, 1020,   69, 1024,   69,
+       69,   69,   69, 1022, 1027,   69, 1029,   69, 1025,   69,
+       69,   69,   69, 1032,   69,   69,   69,   69,   69, 1026,
+     1028,   69,   69, 1030, 1035, 1041, 1040, 1031, 1033, 1036,
+     1034, 1037, 1038, 1039,   69,   69,   69,   69,   69, 1042,
+     1043,   69, 1049, 1046, 1044,   69, 1048, 1050,   69,   69,
+     1051, 1045,   69,   69,   69, 1052, 1053,   69,   69, 1047,
+       69, 1055, 1054, 1056,   69, 1057,   69, 1060,   69, 1062,
+       69,   69, 1061,   69, 1063,   69,   69,   69, 1058,   69,
+       69, 1071,   69,   69,   69, 1059, 1070,   69, 1064, 1065,
+
+     1066,   69,   69,   69,   69, 1067,   69, 1079, 1069, 1082,
+       69, 1072, 1073, 1068,   69, 1077,   69, 1076,   69, 1078,
+     1074, 1075,   69, 1083,   69, 1080, 1081,   69, 1084, 1085,
+       69,   69,   69, 1088,   69,   69, 1086, 1089, 1093,   69,
+       69,   69,   69, 1087,   69, 1094, 1095, 1098, 1099,   69,
+     1090, 1092, 1091,   69, 1097,   69,   69, 1102, 1103, 1096,
+     1101,   69, 1100,   69,   69, 1104,   69, 1105,   69,   69,
+       69, 1108, 1107,   69,   69,   69,   69, 1106, 1109,   69,
+     1112, 1114,   69, 1115,   69,   69, 1117,   69, 1111,   69,
+       69, 1113,   69,   69, 1120,   69,   69,   69, 1110,   69,
+
+     1119, 1122, 1123,   69, 1116,   69, 1126, 1125,   69, 1118,
+       69, 1121,   69, 1124,   69, 1127, 1132, 1128,   69, 1129,
+     1134, 1130,   69, 1133, 1136,   69,   69,   69, 1131,   69,
+       69, 1138,   69,   69,   69, 1140,   69, 1142,   69, 1137,
+       69,   69, 1135, 1148, 1145, 1149, 1139, 1146,   69,   69,
+     1143,   69,   69, 1151, 1144,   69, 1154, 1141, 1153, 1147,
+     1150,   69,   69,   69, 1155,   69,   69, 1159,   69,   69,
+     1161, 1164,   69,   69, 1160,   69,   69, 1152,   69, 1156,
+     1163,   69,   69, 1165, 1157,   69, 1158,   69,   69, 1172,
+       69, 1162,   69,   69,   69,   69,   69, 1177,   69, 1166,
+
+     1170, 1169, 1167, 1171,   69, 1168,   69,   69, 1175,   69,
+       69, 1179, 1173, 1174,   69,   69, 1181, 1176,   69, 1188,
+       69,   69, 1180, 1182, 1178, 1185, 1183, 1189,   69,   69,
+     1186, 1184, 1190,   69,   69,   69,   69, 1192, 1191,   69,
+       69, 1198,   69, 1187, 1193, 1195,   69,   69, 1196, 1197,
+     1199,   69,   69, 1194,   69, 1201,   69,   69,   69, 1200,
+       69, 1208,   69,   69, 1202,   69, 1203, 1219, 1205,   69,
+     1204,   69, 1210,   69, 1211,   69, 1207,   69, 1209,   69,
+     1212,   69, 1206, 1216, 1214, 1217, 1221, 1215,   69, 1220,
+     1218,   69, 1222,   69, 1213, 1225,   69, 1224,   69, 1223,
+
+       69,   69,   69,   69,   69, 1227,   69, 1229, 1230, 1226,
+       69, 1228, 1234,   69, 1237,   69, 1231,   69,   69,   69,
+       69,   69, 1232, 1239,   69, 1233, 1235,   69,   69, 1240,
+     1243, 1236, 1241, 1242,   69, 1246,   69, 1238,   69,   69,
+       69,   69,   69, 1244, 1252,   69, 1248,   69,   69, 1245,
+       69, 1257, 1247, 1249, 1250,   69,   69, 1253, 1401, 1251,
+       69, 1255, 1256,   69,   69, 1254, 1258,   69,   69, 1259,
+     1261,   69, 1262,   69,   69,   69,   69, 1260, 1263,   69,
+       69,   69,   69, 1264, 1267, 1272,   69, 1265, 1273, 1268,
+       69, 1266,   69,   69,   69,   69,   69, 1271, 1277,   69,
+
+       69, 1270, 1269, 1279,   69, 1281,   69,   69,   69,  136,
+       69, 1274, 1275, 1280, 1282, 1276, 1278, 1283,   69, 1285,
+     1296, 1284, 1287,   69,   69,   69, 1286,   69,   69, 1289,
+       69, 1291, 1288,   69, 1290,   69, 1298,   69,   69, 1292,
+     1293, 1294,   69, 1300, 1297,   69, 1295,   69, 1301,   69,
+     1304,   69, 1302,   69, 1306, 1299,   69,   69,   69, 1309,
+     1310,   69,   69, 1312,   69,   69, 1303,   69,   69,   69,
+       69, 1311,   69, 1305, 1314,  135, 1307, 1315,   69, 1308,
+     1313,   69, 1317, 1320, 1321,   69,   69,   69, 1319,   69,
+       69, 1324, 1325, 1323, 1327, 1316, 1318,   69,   69, 1326,
+
+       69,   69,   69,   69,   69, 1322,   69, 1329,   69, 1332,
+     1328,   69, 1335,   69,   69, 1331,   69,   69,   69,   69,
+     1337, 1330, 1333, 1341, 1342,   69,   69,   69, 1336, 1344,
+       69,   69, 1340, 1339, 1334, 1343, 1338,   69, 1345, 1347,
+       69, 1351,   69, 1346,   69, 1349, 1348,   69, 1352,   69,
+     1353,   69, 1355, 1358,   69, 1354,   69, 1350,   69,   69,
+       69,   69,   69, 1357, 1360, 1363, 1359,   69, 1356, 1362,
+     1365,   69,   69, 1361,   69, 1367,   69,   69, 1368, 1366,
+     1369,   69, 1370,   69, 1364,   69,   69,   69,   69,   69,
+       69, 1372, 1373,   69, 1371, 1374,   69, 1375, 1376, 1377,
+
+       69,   69, 1378, 1380,   69,   69, 1381,   69, 1387,   69,
+     1382,   69, 1379, 1385,   69,   69, 1386,   69,   69, 1389,
+     1394,   69,   69, 1383,   69,   69, 1384,   69, 1398, 1388,
+     1390, 1392,   69, 1393,   69, 1391,   69,   69, 1400, 1402,
+       69, 1395, 1396,   69,   69,   69, 1397,   69, 1405,   69,
+     1403,   69,   69, 1399, 1406,   69,   69,   69,   69,  133,
+       69,   69,   69, 1408, 1404,   69, 1413, 1409, 1410,   69,
+     1407,   69, 1412, 1418, 1417,   69, 1419,   69, 1411, 1414,
+     1420, 1415, 1416,   69, 1421,   69, 1424,   69,   69,   69,
+       69, 1425, 1422, 1426,   69, 1428, 1427,   69,   69, 1423,
+
+     1432,   69, 1429,   69,   69,   69,   69, 1430, 1433,   69,
+     1438,   69, 1435,   69, 1434,   69, 1439,   69, 1431, 1442,
+       69,   69, 1444, 1437, 1436,   69, 1443,   69, 1440,   69,
+     1446,   69, 1447,   69,   69,   69, 1450, 1441,   69, 1445,
+     1451,   69, 1448,   69, 1452, 1449,   69,   69, 1454,   69,
+     1453, 1455,   69,   69,   69,   69,   69,   69,   69, 1460,
+     1456,   69, 1461, 1465,   69,   69,   69, 1464,   69, 1457,
+     1458, 1459, 1462,   69, 1466, 1467,   69, 1469,   69, 1463,
+     1468, 1471, 1472, 1470,   69,   69, 1475, 1473,   69, 1476,
+       69,   69, 1474,   69, 1477, 1478,   69,   69, 1479, 1482,
+
+       69,   69,   69, 1480,   69,   69, 1483, 1484,   69, 1486,
+       69, 1481,   69,   69,   69,   69,   69, 1488, 1489, 1492,
+       69, 1495,   69,   69,   69, 1485, 1493,   69,   69, 1494,
+     1490, 1491,   69, 1487,   69,   69,   69,   69, 1505,   69,
+       69,   69,   69, 1497, 1506,   69, 1498, 1503,   69, 1496,
+     1527, 1499,   69, 1501, 1508, 1507, 1500, 1502, 1504,   69,
+     1510, 1509, 1511,   69, 1512,   69,   69, 1513,   69, 1515,
+       69,   69, 1518,   69, 1519,   69, 1520,   69,   69, 1514,
+     1516, 1522,   69, 1517, 1524,   69, 1525,   69,   69, 1521,
+     1528,   69,   69, 1530,   69,   69, 1523,   69,   69,   69,
+
+     1534, 1533,   69, 1532, 1536,   69,   69, 1526,   69, 1540,
+       69, 1529,   69, 1531,   69, 1535,   69,   69,   69, 1545,
+       69, 1537, 1544, 1538,   69, 1539, 1547,   69,   69,   69,
+       69, 1543, 1541,   69, 1551, 1549, 1546, 1542,   69, 1552,
+       69,   69,   69,   69, 1548, 1554,   69,   69,   69,   69,
+     1553, 1558, 1559,   69,   69, 1550, 1556, 1561,   69, 1564,
+       69,   69, 1562, 1557, 1560,   69, 1555,   69, 1563, 1567,
+     1569, 1565,   69, 1568,   69, 1570,   69,   69, 1566,   69,
+       69,   69,   69, 1571,   69, 1577,   69, 1609,   69, 1575,
+       69, 1578,   69, 1576, 1574, 1581,   69, 1572,   69, 1573,
+
+     1580, 1582,   69,   69, 1579,   69, 1583,   69, 1584, 1587,
+     1585,   69, 1588,   69,   69,   69, 1590, 1586, 1589, 1591,
+       69,   69,   69,   69,   69, 1593, 1592, 1596,   69,   69,
+      131, 1599,   69, 1598,   69, 1594, 1595,   69, 1600, 1602,
+     1603,   69,   69,   69, 1597, 1601,   69,   69,   69, 1604,
+     1605,   69, 1607,   69,   69, 1622, 1606, 1608,   69, 1610,
+     1611,   69,   69, 1614,   69, 1612, 1616, 1613, 1615,   69,
+       69, 1617,   69,   69,   69, 1619,   69, 1623,   69, 1620,
+     1625,   69,   69,   69, 1628,   69,   69,   69, 1629, 1618,
+     1624, 1630,   69,   69,   69, 1621,   69,   69, 1627, 1631,
+
+     1626,   69, 1634, 1632, 1635,   69,   69, 1633, 1636,   69,
+     1637,   69,   69, 1640, 1639,   69,   69,   69, 1638,   69,
+       69, 1646,   69,   69, 1644,   69,   69, 1641, 1642, 1643,
+       69,   69, 1647,   69,   69, 1653,   69,   69,   69,   69,
+     1645, 1659,   69, 1650, 1657, 1654, 1649, 1652,   69, 1660,
+       69, 1648,   69, 1658,   69, 1651, 1655,   69, 1661, 1656,
+       69,   69,   69,   69,   69,   69, 1669, 1670,   69,   69,
+       69, 1666, 1662,   69,   69,   69, 1664,   69, 1663, 1671,
+     1673, 1665, 1668, 1667,   69,   69, 1680, 1672,   69, 1674,
+     1679,   69,   69, 1675,   69, 1676,   69,   69,   69,   69,
+
+     1677,   69, 1684,   69, 1678,   69, 1681, 1688, 1687, 1682,
+     1689,   69,   69,   69,   69, 1683, 1692,   69, 1685, 1686,
+     1693,   69, 1696,   69,   69,   69,   69,   69, 1697, 1694,
+     1690, 1699, 1691, 1700,   69, 1695, 1702,   69,   69, 1701,
+     1698, 1703,   69, 1705,   69, 1706,   69,   69, 1707,   69,
+       69,   69,   69,   69,   69,   69,   69, 1704, 1711, 1712,
+     1710,   69,   69, 1709, 1714,   69, 1716, 1715, 1719,   69,
+     1717, 1708, 1720,   69, 1713,   69,   69, 1718, 1723,   69,
+       69, 1722, 1721,   69,   69, 1724, 1725,   69, 1726,   69,
+     1728,   69, 1727,   69,   69, 1729,   69,   69, 1730,   69,
+
+       69,   69,   69, 1731,   69, 1734,   69, 1733,   69, 1736,
+       69,   69, 1732, 1735,   69, 1737,   69, 1739,   69, 1742,
+     1738,   69,   69, 1740,   69, 1741,   69, 1744, 1747,   69,
+     1743, 1745,   69, 1751,   69, 1749,   69,   69,   69, 1754,
+       69, 1746, 1753, 1748,   69, 1755,   69, 1750,   69, 1756,
+       69,   69,   69,   69, 1759, 1752,   69, 1757, 1773, 1758,
+       69, 1762, 1763,   69,   69, 1760, 2035, 1761,   69, 1765,
+     1766,   69,   69, 1764, 1771, 1767, 1768,   69, 1769,   69,
+     1770,   69,   69, 1774,   69,   69, 1776,   69,   69, 1775,
+       69, 1777,   69, 1780, 1779, 1781, 1772,   69,   69,   69,
+
+       69,   69,   69, 1784, 1788,   69,   69,   69,   69,   69,
+     1778,   69, 1792,   69, 1782, 1783, 1787, 1790, 1785,   69,
+     1793, 1786,   69, 1794, 1795, 1789, 1791,   69,   69,   69,
+       69,   69, 1796, 1797, 1802,   69,   69,   69, 1799, 1803,
+     1805,   69,   69,   69, 1808,   69,   69, 1806,   69,   69,
+     1800, 1801, 1809,   69, 1798, 1804,   69, 1812, 1810, 1814,
+       69, 1807, 1813,   69,   69, 1815,   69,   69, 1811, 1816,
+       69, 1820, 1819,   69,   69,   69, 1817,   69, 1823, 1822,
+       69, 1824, 1821, 1825,   69,   69, 1828,   69,   69, 1826,
+     1832, 1818,   69, 1830,   69, 1827,   69, 1834,   69,   69,
+
+       69, 1837,   69,   69,   69, 1831, 1829,   69, 1839,   69,
+       69,   69,   69,   69,   69, 1836, 1838, 1844, 1835, 1833,
+     1840, 1843,   69, 1841, 1846,   69, 1848,   69, 1842, 1849,
+       69, 1850,   69, 1847,   69,   69, 1845, 1852,   69, 1851,
+       69,   69, 1853,   69, 1856,   69, 1859,   69, 1860,   69,
+       69,   69,   69, 1864,   69, 1857,   69,   69, 1854, 1855,
+     1865,   69, 1866, 1862,   69,   69,   69, 1858, 1867, 1861,
+       69, 1870, 1863, 1869,   69, 1872, 1875,   69, 1876,   69,
+       69,   69, 1873, 1874, 1868, 1878,   69,   69,   69,   69,
+     1882,   69, 1879, 1871, 1881, 1883,   69, 1884,   69, 1877,
+
+       69,   69, 1880, 1886,   69, 1885,   69, 1887, 1888,   69,
+       69,   69, 1892,   69,   69, 1889,   69, 1895,   69, 1893,
+     1891,   69,   69,   69, 1894,   69, 1896,   69,   69,   69,
+     1890, 2035, 1899,   69,   69,   69, 1901, 1900,   69,   69,
+     1909,   69, 1897, 1898, 1907, 1910,   69, 1902,   69, 1903,
+       69, 1904, 1905,   69, 1911,   69, 1906, 1913, 1908, 1912,
+       69, 1914,   69, 1917,   69,   69, 1915,   69,   69, 1916,
+       69, 1921, 1922,   69, 1923,   69,   69, 1920,   69,   69,
+     1918, 1924,   69,   69,   69, 1919,   69, 1928,   69, 1929,
+     1931,   69, 1932,   69, 1926, 1933,   69, 1934, 1935,   69,
+
+       69,   69, 1937, 1925, 1927, 1930,   69, 1939,   69, 1941,
+       69,   69, 1936, 1940,   69,   69,   69,   69,   69, 1943,
+       69, 1938,   69, 1947,   69, 1942, 1948,   69,   69,   69,
+       69,   69,   69, 1946,   69, 1944, 1945,   69,   69, 1951,
+     2035, 1950, 1952,   69, 1949, 1959,   69, 1955,   69, 1953,
+     1954, 2035, 1957, 1961,   69, 1962,   69, 1960, 1958, 1956,
+       69,   69,   69, 1967,   69, 1963, 1964,   69, 1965,   69,
+     1969,   69,   69, 1972, 1973,   69,   69, 1966, 1968,   69,
+       69,   69, 1970,   69,   69,   69,   69,   69,   69, 1974,
+       69, 1971,   69, 1982, 1975, 1976,   69, 1977, 1979, 1980,
+
+       69, 1983,   69, 1978,   69, 1985, 1981, 1986,   69, 1984,
+       69, 1989, 1990, 1987,   69, 1988, 1991,   69,   69, 1993,
+       69, 1992, 1995,   69,   69,   69,   69,   69,   69,   69,
+     1998,   69,   69, 2002, 2003,   69,   69, 1997,   69, 1994,
+       69, 2005, 1996, 2007, 2001, 1999, 2000,   69, 2006,   69,
+     2010,   69,   69,   69, 2004, 2009, 2008,   69,   69, 2011,
+     2012,   69,   69, 2014,   69,   69,   69, 2016,   69, 2017,
+       69, 2020,   69,   69, 2023,   69, 2013, 2024,   69,   69,
+     2015,   69, 2025,   69, 2018, 2019, 2028, 2021, 2026,   69,
+       69, 2022, 2027,   69,   69, 2029, 2033,   69, 2035, 2030,
+
+     2031, 2035, 2032, 2034,   69,   41,   41,   41,   41,   41,
+       41,   41,   46,   46,   46,   46,   46,   46,   46,   51,
+       51,   51,   51,   51,   51,   51,   57,   57,   57,   57,
+       57,   57,   57,   62,   62,   62,   62,   62,   62,   62,
+       72,   72, 2035,   72,   72,   72,   72,  130,  130, 2035,
+     2035, 2035,  130,  130,  132,  132, 2035, 2035,  132, 2035,
+      132,  134, 2035, 2035, 2035, 2035, 2035,  134,  137,  137,
+     2035, 2035, 2035,  137,  137,  139, 2035, 2035, 2035, 2035,
+     2035,  139,  141,  141, 2035,  141,  141,  141,  141,   73,
+       73, 2035,   73,   73,   73,   73,   13, 2035, 2035, 2035,
+
+     2035, 2035, 2035, 2035, 2035, 2035, 2035, 2035, 2035, 2035,
+     2035, 2035, 2035, 2035, 2035, 2035, 2035, 2035, 2035, 2035,
+     2035, 2035, 2035, 2035, 2035, 2035, 2035, 2035, 2035, 2035,
+     2035, 2035, 2035, 2035, 2035, 2035, 2035
     } ;
 
-static yyconst flex_int16_t yy_chk[4042] =
+static yyconst flex_int16_t yy_chk[4038] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    3,
-        3,    3,    4,    4,    4,   50,    5,    5,   50,    3,
-        5,   15,    4,    6,    6,   15,    5,    6,    9,    9,
-        9,  162,   33,    6,    7,    7,    7,    7,    9,    7,
-       10,   10,   10,   45,   45,    7,    8,    8,    8,    8,
-       10,    8,   21,   33,  162,   21,   21,    8,   11,   11,
-       11,   11,   11,   11, 2036,   20,   29,   20,   20,   11,
-
-       20,   29,   24,   21,   75,   20,   24,   75,   11,   12,
-       12,   12,   12,   12,   12,   83,   22,   22,   26,   26,
-       12,   25,   25,   28,   22,  133,   24,   26,  133,   12,
-       19,   22,   19,   19,   30,   19,   25,   83,   28,   27,
-       19,   19,   23,   27,   61,   61,   27,   23,   35,   30,
-       39,   23,   67,   27,   23,   27,   23,   23,   31,   31,
-       32,   32,   35,  741,   39,   32,   67,   31,   70,   39,
-       36,   36,   70,   31,   76,   36,   77,   31,   76,   80,
-       84,   32,   34,   38,   38,   36,   38,   34,   36,   40,
-       40,   34,   79,   80,   40,   88,   77,   34,   40,   84,
-
-       34,   38,  112,  112,  139,   87,   88,   34,   37,   56,
-       79,   56,   56,   37,   56,   64,   37,   64,   64,   66,
-       64,   66,   66,   37,   66,   87,   64,   37,   37,   69,
-       78,   69,   69,   78,   69,   81,   82,  137,   86,   69,
-       72,   81,   72,   72,   85,   72,   78,   81,   89,   85,
-       72,   72,   86,   90,   82,   82,   91,   96,   92,   93,
-       91,   94,   85,   92,   94,   95,   89,   94,   99,   97,
-       95,   90,   98,   93,   97,   98,   96,  100,  101,   98,
-       94,   94,  101,  102,  103,  105,  104,  106,  107,  116,
-      102,  100,   99,  104,   97,  108,  109,  103,  105,  108,
-
-      110,  111,  113,  115,  114,  110,  107,  106,  116,  110,
-      117,  118,  122,  120,  109,  119,  123,  114,  115,  124,
-      119,  111,  113,  114,  118,  120,  121,  121,  117,  125,
-      122,  125,  123,  126,  127,  128,  129,  202,  126,  202,
-      124,  129,  131,  131,  138,  138,  127,  121,  143,  136,
-      144,  143,  125,  128,  135,  144,  135,  135,  140,  135,
-      140,  140,  141,  140,  141,  141,  145,  141,  146,  147,
-      148,  145,  149,  141,  150,  151,  152,  147,  154,  154,
-      153,  152,  152,  146,  151,  153,  155,  149,  156,  148,
-      156,  155,  158,  158,  150,  159,  160,  161,  165,  163,
-
-      164,  160,  161,  163,  166,  164,  167,  172,  168,  184,
-      156,  157,  165,  134,  159,  157,  184,  169,  167,  166,
-      157,  167,  169,  170,  173,  157,  168,  172,  170,  171,
-      171,  157,  157,  174,  176,  171,  175,  175,  174,  176,
-      173,  177,  178,  179,  132,  176,  177,  171,  180,  171,
-      181,  178,  182,  180,  183,  181,  185,  182,  187,  183,
-      186,  188,  189,  190,  179,  192,  186,  188,  191,  185,
-      192,  190,  193,  194,  195,  196,  197,  198,  187,  201,
-      196,  191,  198,  199,  189,  200,  203,  193,  205,  194,
-      200,  204,  206,  203,  195,  208,  204,  211,  197,  201,
-
-      208,  199,  199,  209,  206,  207,  207,  205,  209,  210,
-      212,  210,  213,  214,  215,  219,  222,  218,  208,  215,
-      211,  214,  212,  220,  216,  217,  221,  130,  210,  216,
-      217,  213,  218,  219,  221,  223,  226,  220,  223,  226,
-      224,  222,  224,  225,  225,  227,  227,  228,  228,  229,
-      231,  230,  232,  231,  233,  234,  232,  235,  240,  236,
-      234,  237,  237,  233,  236,  229,  230,  238,  239,  241,
-      242,  235,  238,  239,  246,  243,  244,  244,  240,  245,
-      247,  248,  245,  250,  247,  249,  249,  241,  243,  252,
-      251,  242,  246,  253,  252,  254,  253,  255,  257,  248,
-
-      256,  250,  251,  258,  261,  261,  255,  254,  259,  256,
-      260,  263,  260,  260,  255,  255,  258,  255,  262,  257,
-      259,  262,  264,  265,  266,  267,  267,  270,  263,  268,
-      273,  263,  265,  266,  268,  269,  269,  264,  271,  272,
-      274,  275,  270,  271,  276,   68,  275,  277,  278,  280,
-      273,  272,  277,  278,  281,  274,  282,  279,  285,  278,
-      279,  283,  279,  280,  276,  282,  283,  284,  286,  287,
-      281,  285,  284,  281,  289,  281,  288,  289,  290,  285,
-      292,  294,  293,  295,  287,  294,  294,  297,  286,  300,
-      288,  293,  290,  289,  291,  292,  291,  291,  296,  298,
-
-      299,  301,  297,  302,  295,  299,  291,  304,  291,  291,
-      291,  303,  300,  291,  306,  305,  303,  296,  302,  298,
-      305,  301,  304,  307,  308,  309,  310,  311,  312,  312,
-      309,  312,  311,  313,  306,  307,  314,  316,  308,  315,
-      318,  317,  310,  317,  318,  319,  320,  321,  322,  319,
-      323,  316,  314,  313,  328,  315,  325,  322,  324,  323,
-      325,  321,  326,  324,  320,  330,  332,  327,  329,  330,
-      322,  326,  327,  331,  329,  328,  333,  333,  331,  334,
-      335,  336,  336,  337,  334,  338,  332,  339,  337,  338,
-      340,  341,  342,  335,  343,  340,  344,  344,  343,  346,
-
-      341,  345,  347,  347,  342,  350,  345,  351,  339,  349,
-      349,  353,  352,  354,  356,  351,  357,  359,  360,  358,
-      346,  352,  359,  361,  362,  354,  350,  360,  361,  363,
-      364,  353,  356,  358,  356,  364,  357,  363,  362,  365,
-      366,  367,  368,  370,  365,  369,  367,  370,  371,  373,
-      372,  374,  378,  376,  366,  372,  377,  380,  381,  383,
-      380,  394,  365,  371,  368,  373,  369,  394,  378,   62,
-      374,  375,  375,  376,  388,  377,  379,  375,  381,  375,
-      385,  379,  382,  382,  383,  387,  379,  375,  384,  384,
-      375,  386,  389,  388,  390,  385,  391,  375,  392,  390,
-
-      387,  393,  396,  386,  397,  391,  396,  398,  399,  397,
-      400,   57,  401,  403,  389,  405,  393,  392,  407,  398,
-      401,  402,  402,  400,  404,  403,  399,  405,  406,  404,
-      408,  406,  410,  407,  409,  408,  411,  409,  419,  412,
-      411,  411,  413,  413,  414,  414,  416,  416,  410,  415,
-      421,  410,  412,  418,  415,  417,  417,  420,  418,  419,
-      422,  423,  420,  424,  422,  425,  423,  424,  426,  421,
-      425,  427,  428,  429,  431,  433,  427,  428,  430,  432,
-      432,  430,  439,  436,  434,  439,  430,  429,  426,  434,
-      430,  435,  431,  433,  437,  438,  435,  436,  440,  437,
-
-      441,  442,  440,  443,  438,  441,  442,  444,  445,  446,
-      447,  448,  449,  445,  450,  453,  448,  450,  449,  443,
-      444,  454,  447,  451,  440,  446,  451,  452,   52,  455,
-      464,  456,  452,  453,  455,  454,  456,  457,  458,  459,
-      461,  458,  457,  460,  459,  462,  463,  460,  460,  464,
-      465,  463,  466,  461,  470,  466,  467,  472,  462,  465,
-      468,  467,  469,  469,  468,  468,  471,  473,  471,  473,
-      466,  474,  475,  476,  477,  479,  472,  478,  480,  470,
-      481,  478,  482,  484,  479,  483,  485,  486,  484,  474,
-      475,  489,  476,  480,  477,  487,  487,  491,  481,  488,
-
-      483,  482,  489,  488,  490,  485,  486,  492,  493,  490,
-      494,  495,  496,  491,  499,  497,  495,  494,  498,  496,
-      497,  493,  500,  498,  501,  502,  492,  503,  505,  500,
-      504,  505,  499,  501,  506,  504,  503,  507,  506,  502,
-      508,  508,  509,  511,  512,  514,  513,  515,  511,  508,
-      513,  509,  517,  518,  516,  519,  525,  514,  507,  516,
-      517,  522,  529,  528,  512,  515,  530,  535,  529,  536,
-      530,  518,  528,  525,  531,  531,  522,  532,  534,   51,
-      519,  520,  532,  534,  537,  535,  520,  537,  538,  538,
-      520,  539,  541,  520,  536,  540,  540,  546,  539,  546,
-
-      520,  542,  542,  520,  533,  533,  533,  541,  533,  543,
-      544,  533,  545,  544,  543,  547,  533,  545,  548,  549,
-      551,  550,  533,  533,  552,  552,  553,  547,  551,  554,
-      555,  557,  556,  558,  558,  561,  557,  548,  561,  549,
-      550,  553,  559,  554,  556,  560,  562,  559,  555,  563,
-      560,  564,  562,  565,  567,  566,  568,  563,  570,  564,
-      566,  567,  569,  569,  571,  572,  573,  570,  575,  576,
-      572,  565,  571,  577,  578,  568,  577,  575,  576,  578,
-      579,  580,  580,  581,  582,  573,  583,  590,  585,  583,
-      585,  586,  586,  587,  579,  588,  589,  583,  581,  591,
-
-      588,  593,  592,  597,  596,  594,  595,  590,  582,  594,
-      593,  602,  597,  598,  587,  599,  603,  589,  601,  601,
-      600,  591,  592,  596,  595,  598,  600,  604,  605,  599,
-      603,  602,  604,  605,  606,  607,  608,  609,  606,  610,
-      611,  611,  609,  613,  612,  614,  613,  616,  608,  612,
-      617,  615,  616,  619,  607,  624,  608,  618,  618,  621,
-      610,  620,  620,  614,  615,  622,  623,  625,  626,  622,
-      617,  619,  628,  628,  621,  630,  629,  631,  632,  624,
-      629,  625,  632,  635,  633,  623,  634,  636,  626,  627,
-      630,  634,  627,  638,  627,  642,  656,  635,  627,  633,
-
-      627,  636,  631,  637,  639,  627,  640,  637,  638,  639,
-      627,  640,  641,  643,  644,  656,  642,  645,  648,  639,
-      644,  650,  645,  646,  646,  654,  641,  643,  647,  647,
-      648,  651,  649,  654,  647,  650,  647,  649,  652,  652,
-      653,  655,  658,  651,  662,  653,  658,  647,  657,  657,
-      661,  660,  663,  661,  647,  655,  660,  664,  666,  665,
-      667,  668,  664,  662,  665,  663,  669,  670,  671,  667,
-      668,  673,  674,  672,  675,  676,  670,  666,  672,  677,
-      678,  680,  669,  681,  676,  678,  674,  671,  677,  682,
-      683,  673,  684,  685,  675,  683,  686,  684,  685,  689,
-
-      680,  681,  687,  687,  682,  686,  688,  691,  695,  692,
-      696,  688,  689,  692,  692,  693,  693,  694,  697,  693,
-      694,  698,  695,  691,  699,  700,  698,  701,  700,  702,
-      696,  703,  704,  697,  705,  707,  703,  704,  708,  710,
-      710,  707,  711,  709,  699,  702,  705,  712,  701,  709,
-      713,  711,  714,  713,  708,  715,  716,  718,  717,  719,
-      722,  720,  718,  725,  719,  712,  720,   46,  724,  723,
-      714,  717,  723,  728,  715,  725,  716,  726,  722,  724,
-      727,  729,  726,  730,  730,  727,  729,  731,  728,  732,
-      733,  734,  735,  737,  738,  734,  736,  740,  744,  742,
-
-      743,  754,  733,  732,  745,  736,  731,   41,  754,  745,
-      735,  753,  737,  742,  749,  743,  740,  746,  744,  738,
-      747,  748,  746,  750,  751,  747,  748,  752,  749,  751,
-      753,  755,  756,  757,  757,  758,  759,  750,  760,  761,
-      762,  762,  752,  763,  760,  764,  755,  765,  763,  758,
-      766,  756,  764,  766,  759,  767,  768,  769,  770,  761,
-      772,  765,  769,  771,  777,  768,  774,  775,  771,  776,
-      774,  778,  781,  767,  779,  780,  775,  770,  782,  772,
-      783,  779,  784,  777,  776,  785,  778,  780,  784,  786,
-      789,  781,  787,  790,  791,  789,  792, 1014,  783,  782,
-
-      785,  787,  791,  793,  796,  794,  795,  790,  793,  786,
-      795,  795,  797,  801,  798,  800,  792,  794,  799,  799,
-      802, 1014,  801,  796,  805,  802,  797,  798,  800,  803,
-      803,  804,  806,  805,  807,  809,  804,  806,  810,  807,
-      808,  808,  811,  810,  809,  812,  813,  814,  815,  820,
-      816,  813,  814,  815,  816,  823,  811,  818,  818,  819,
-      820,  819,  822,  812,  817,  824,  822,  825,  828,  834,
-      823,  829,   14,  817,  827,  831,  825,  828,  817,  830,
-      817,  826,  817,  824,  817,  826,  826,  830,  827,  831,
-      829,  832,  833,  835,  834,  836,  836,  837,  835,  841,
-
-      832,  838,  838,  840,  841,  842,  840,  843,  843,  844,
-      833,  846,  837,  845,  845,  847,  846,  848,  848,  849,
-      850,  852,  851,  854,  842,  850,  852,  853,  853,  844,
-      851,  855,  857,  856,  864,  869,  847,  855,  859,  849,
-      856,  854,  860,  859,  861,  857,  862,  860,  863,  861,
-      865,  862,  867,  864,  866,  866,  868,  863,  869,  870,
-      871,  865,  872,  873,  870,  874,  875,  875,  876,  877,
-      881,  878,  867,  879,  871,  873,  868,  884,  879,   13,
-      871,  882,  872,  874,  880,  880,  882,  885,  876,  878,
-      886,  885,  885,  881,  877,  887,  884,  889,  888,  886,
-
-      888,  890,  892,  887,  891,  893,  890,  894,  891,  895,
-      896,  889,  897,  892,  898,  896,  899,  900,  901,  902,
-      899,  908,  903,  904,  893,  905,  906,  895,  908,  910,
-      897,  902,  914,  894,  898,  900,  903,  901,  904,  907,
-      905,  909,  911,  912,  907,  906,  909,  910,  913,    0,
-      915,  911,  916,  914,  913,  915,  917,  916,  912,  918,
-      918,  917,  919,  919,  921,  921,  922,  923,  924,  925,
-      922,  926,  927,  928,  925,  929,  923,  928,  928,  929,
-      929,  930,  934,  931,  932,  926,  924,  933,  935,  936,
-      938,  927,  937,  939,  940,  936,  941,  937,  943,  961,
-
-      942,  930,  931,  932,  947,  944,  933,  935,  934,  938,
-      945,  945,  939,  940,  942,  941,  947,  961,  946,  943,
-      944,  946,  948,  948,  949,  951,  950,  952,  953,  949,
-      950,  954,  956,  954,  962,  957,  952,  954,  951,  958,
-      958,  953,  959,  966,  960,  964,  964,  959,  960,  980,
-      954,  957,  956,  963,  962,  968,  969,  969,  963,  970,
-      968,  966,  972,  972,  970,  974,  974,  975,  977,  978,
-      978,  977,  979,  982,  980,  981,  983,  985,  982,  984,
-      984,  985,  986,  975,  987,  987,  988,  979,  989,  981,
-      990,  983,  991,  992,  990,  994,  994,  995,  992,  989,
-
-      996,  998,  986,  997,  997,  999,  998, 1000,  988, 1001,
-     1002,  991, 1006,    0,  996,  995, 1004, 1003, 1001, 1003,
-     1009, 1004, 1011, 1005, 1007,  999, 1017, 1000, 1005, 1007,
-     1002, 1012, 1006, 1016, 1009, 1010, 1010, 1012, 1015, 1015,
-     1023, 1011, 1021, 1019, 1018, 1016, 1017, 1018, 1019, 1020,
-     1018, 1021, 1022, 1024, 1020, 1025, 1024, 1022, 1026, 1026,
-     1025, 1027, 1018, 1028, 1029, 1023, 1030, 1031, 1032, 1033,
-     1034, 1030, 1031, 1032, 1038, 1034, 1035, 1035, 1036, 1027,
-     1037, 1039, 1028, 1036, 1029, 1040, 1043, 1044, 1041, 1042,
-     1045, 1043, 1033, 1047, 1038, 1046, 1049, 1049, 1037, 1040,
-
-     1041, 1039, 1042, 1050, 1052, 1053, 1051, 1044, 1054, 1046,
-     1045, 1051, 1053, 1055, 1047, 1057, 1059, 1054, 1064, 1052,
-     1054, 1060, 1060, 1050, 1061, 1061, 1066, 1063, 1062, 1055,
-     1057, 1062, 1063, 1065, 1064, 1057, 1071, 1067, 1068, 1069,
-     1072, 1059, 1065, 1073, 1069, 1066, 1067, 1068, 1074, 1067,
-     1070, 1070, 1075, 1072, 1076, 1078, 1071, 1079, 1080, 1080,
-     1081, 1073, 1074, 1082, 1083, 1085, 1076,    0, 1075, 1083,
-     1084, 1084, 1082, 1086, 1085, 1079, 1081, 1085, 1087, 1089,
-     1078, 1090, 1087, 1087, 1089, 1084, 1095, 1091, 1092, 1093,
-     1097, 1086, 1091, 1092, 1101, 1093, 1096, 1103, 1104, 1090,
-
-     1102, 1096, 1098, 1097, 1105, 1098, 1095, 1106, 1102, 1107,
-     1103, 1098, 1106, 1101, 1108, 1111, 1104, 1110, 1110, 1117,
-     1112, 1113, 1114, 1105, 1112, 1107, 1113, 1114, 1115, 1116,
-     1119, 1123, 1108, 1115, 1121, 1111, 1120, 1120, 1116, 1122,
-     1124, 1125, 1117, 1123, 1126, 1119, 1122, 1127, 1121, 1126,
-     1128, 1129, 1124, 1130, 1130, 1131, 1135, 1129, 1131, 1127,
-     1125, 1132, 1132, 1137, 1134, 1135, 1136, 1136, 1128, 1134,
-     1139, 1138, 1140, 1141, 1143, 1137, 1138, 1142, 1144, 1139,
-     1145, 1148, 1142, 1143, 1140, 1146, 1146, 1147, 1141, 1149,
-     1150, 1152, 1147, 1151, 1151, 1145, 1143, 1154, 1144, 1153,
-
-     1153, 1156, 1148, 1155, 1155, 1156, 1158, 1157, 1149, 1158,
-     1150, 1152, 1157, 1161, 1160, 1162, 1163, 1168, 1154, 1160,
-     1162, 1164, 1164, 1165, 1165, 1166, 1167, 1169, 1170, 1171,
-     1166, 1161, 1175, 1170, 1174, 1176, 1176, 1168, 1167, 1167,
-     1167, 1163, 1177, 1178, 1178, 1167, 1173, 1169, 1174, 1171,
-     1173, 1173, 1179, 1175, 1180, 1181, 1181, 1182, 1182, 1187,
-     1185, 1186, 1186, 1188, 1189, 1190, 1191, 1191, 1177, 1185,
-     1188, 1192, 1179, 1189, 1187, 1195, 1180, 1193, 1196, 1197,
-     1195, 1198, 1199, 1196, 1200, 1201, 1201, 1199, 1198, 1200,
-     1202, 1190, 1203, 1193, 1204, 1202, 1205, 1192, 1206, 1197,
-
-     1207, 1203, 1208, 1207, 1209, 1210, 1210, 1211, 1212, 1215,
-     1206, 1224, 1212, 1214, 1204, 1205,    0, 1216, 1218, 1217,
-     1208, 1216, 1211, 1222, 1215, 1217, 1220, 1218, 1212, 1223,
-     1209, 1224, 1214, 1219, 1219, 1221, 1221, 1220, 1226, 1226,
-     1225, 1229, 1220, 1223, 1222, 1225, 1227, 1228, 1230, 1231,
-     1227, 1227, 1228, 1233, 1231, 1234, 1235, 1236, 1237, 1234,
-     1230, 1238, 1240, 1237, 1239, 1233, 1246, 1229, 1235, 1239,
-     1242, 1243, 1243, 1242, 1240, 1244, 1244, 1245, 1245, 1247,
-     1255, 1249, 1236, 1238, 1248, 1247, 1246, 1249, 1250, 1248,
-     1252, 1254, 1255, 1257, 1254, 1252, 1259, 1250, 1258, 1258,
-
-     1260, 1261, 1262, 1263, 1266, 1257, 1264, 1263, 1265, 1260,
-     1269, 1264, 1277, 1265, 1268, 1268, 1259, 1275, 1266, 1261,
-     1270, 1262, 1271, 1273, 1273, 1278, 1268, 1277, 1269, 1270,
-     1279, 1271, 1280, 1275, 1286, 1279, 1281, 1281, 1282, 1278,
-     1282, 1283, 1283, 1285, 1287, 1287, 1288, 1289, 1290, 1280,
-     1285, 1291, 1292, 1293, 1286, 1288, 1294, 1297, 1302, 1295,
-     1290, 1298, 1300, 1291, 1292, 1295, 1304, 1300, 1289, 1303,
-     1301, 1294, 1301, 1304, 1303, 1306, 1302, 1297, 1295, 1293,
-     1308, 1298, 1309, 1309, 1306, 1310, 1311, 1312, 1313, 1312,
-     1314, 1311, 1315, 1313, 1308, 1314, 1316, 1317, 1318, 1319,
-
-     1320, 1322, 1317, 1318, 1323, 1324, 1324, 1326, 1320, 1327,
-     1315, 1310, 1319, 1325, 1325, 1330, 1316, 1330, 1323, 1328,
-     1322, 1329, 1326, 1331, 1328, 1334, 1329, 1332, 1332, 1327,
-     1333, 1333, 1336, 1336, 1334, 1331, 1335, 1334, 1335, 1337,
-     1338, 1340, 1341, 1343, 1344, 1345, 1340, 1341, 1337, 1346,
-     1352, 1348, 1338, 1350, 1351, 1357, 1343, 1348, 1353, 1350,
-     1354, 1354, 1355, 1345, 1344, 1346, 1358, 1353, 1363, 1351,
-     1358, 1355, 1356, 1356, 1357, 1352, 1359, 1360, 1361, 1362,
-     1367, 1359, 1361, 1361, 1366, 1366, 1370, 1362, 1363, 1367,
-     1360, 1368, 1368, 1369, 1369, 1371, 1372, 1373, 1370, 1374,
-
-     1374, 1372, 1373, 1376, 1377, 1379, 1378, 1380, 1381, 1377,
-     1385, 1382, 1380, 1371, 1383, 1383, 1387, 1384, 1386, 1388,
-     1379, 1384, 1390, 1386, 1391, 1385, 1381, 1382, 1376, 1378,
-     1392, 1393, 1394, 1395, 1396, 1398, 1398, 1399, 1388, 1400,
-     1399, 1390, 1387, 1401,    0, 1395, 1402, 1391, 1403, 1403,
-     1393, 1406, 1400, 1394, 1392, 1396, 1407, 1401, 1409, 1402,
-     1404, 1404, 1405, 1405, 1408, 1408, 1406, 1409, 1413, 1407,
-     1409, 1410, 1410, 1411, 1411, 1412, 1412, 1414, 1414, 1415,
-     1416, 1416, 1417, 1417, 1418, 1420, 1422, 1413, 1421, 1421,
-     1420, 1423, 1423, 1424, 1425, 1426, 1429, 1415, 1426, 1430,
-
-     1425, 1427, 1427, 1418, 1431, 1422, 1428, 1428, 1432, 1432,
-     1434, 1424, 1435, 1436, 1430, 1429, 1437, 1427, 1438, 1438,
-     1437, 1439, 1441, 1431, 1440, 1440, 1442, 1443, 1436, 1445,
-     1434, 1444, 1444, 1442, 1447, 1435, 1448, 1449, 1445, 1450,
-     1439, 1448, 1441, 1451, 1452, 1453, 1447, 1455, 1454, 1452,
-     1453, 1456, 1450, 1443, 1457, 1459, 1455, 1461, 1463, 1459,
-     1456, 1458, 1449, 1454, 1451, 1467, 1458, 1463, 1457, 1464,
-     1464, 1465, 1466, 1466, 1469, 1470, 1465, 1461, 1472, 1474,
-     1476, 1466, 1474, 1475, 1470, 1467, 1477, 1467, 1475, 1469,
-     1472, 1478, 1478, 1480, 1480, 1481, 1482, 1482, 1477, 1483,
-
-     1476, 1484, 1485, 1486, 1486, 1489, 1488, 1492, 1489, 1481,
-     1488, 1483, 1490, 1490, 1491, 1484, 1493, 1494, 1495, 1491,
-     1496, 1485, 1495, 1497, 1498, 1501, 1499, 1492, 1497, 1498,
-     1502, 1494, 1499, 1503, 1504, 1502, 1493, 1505, 1503, 1505,
-     1496, 1501, 1504, 1508, 1509, 1509, 1510, 1511, 1518, 1510,
-     1512, 1512, 1516, 1516, 1521, 1522, 1522, 1508, 1526, 1521,
-     1524, 1524, 1528, 1526, 1527, 1527, 1518, 1529, 1532, 1530,
-     1533, 1534, 1534, 1511, 1530, 1536, 1537, 1538, 1528, 1539,
-        0, 1537, 1533, 1545, 1536, 1541, 1541, 1532, 1545, 1529,
-     1543, 1543, 1544, 1544, 1539, 1538, 1546, 1547, 1546, 1548,
-
-     1549, 1549, 1550, 1550, 1548, 1551, 1551, 1552, 1553, 1554,
-     1554, 1547, 1555, 1556, 1559, 1557, 1558, 1560, 1560, 1552,
-     1561, 1558, 1562, 1563, 1555, 1556, 1553, 1557, 1564, 1561,
-     1565, 1566, 1567, 1567, 1559, 1568, 1570, 1569, 1573, 1573,
-     1578, 1564, 1571, 1563, 1568, 1566, 1572, 1571, 1562, 1574,
-     1574, 1572, 1575, 1575, 1565, 1569, 1579, 1580, 1570, 1582,
-     1578, 1581, 1583, 1585, 1585, 1584, 1587, 1587, 1582, 1588,
-     1589, 1591, 1592, 1590, 1579, 1593, 1594, 1595, 1588, 1580,
-     1590, 1581, 1583, 1584, 1596, 1596, 1591, 1598, 1589, 1597,
-     1592, 1599, 1594, 1593, 1597, 1600, 1595, 1601, 1602, 1603,
-
-     1611, 1607, 1601, 1604, 1608, 1598, 1599, 1605, 1604, 1605,
-     1607, 1614, 1612, 1615, 1600, 1612, 1613, 1613, 1602, 1603,
-     1611, 1616, 1616, 1608, 1617, 1619, 1614, 1627, 1617, 1620,
-     1622, 1615, 1634, 1620, 1621, 1621, 1624, 1624, 1626, 1626,
-     1619, 1628, 1628, 1622, 1629, 1629, 1627, 1633, 1633, 1635,
-     1636, 1637, 1638, 1639, 1634, 1640, 1637, 1638, 1642, 1636,
-     1643, 1644, 1635, 1640, 1645, 1643, 1644, 1646, 1646, 1647,
-     1647, 1648, 1639, 1642, 1656, 1649, 1650, 1651, 1648, 1645,
-     1649, 1650, 1651, 1652, 1652, 1653, 1653, 1656, 1657, 1660,
-     1658, 1659, 1661, 1657, 1658, 1662, 1659, 1663, 1660, 1664,
-
-     1667, 1666, 1663, 1662, 1666, 1667, 1668, 1661, 1669, 1670,
-     1671, 1664, 1672, 1672, 1673, 1675, 1676, 1681, 1670, 1671,
-     1677, 1669, 1679, 1673, 1668, 1678, 1678, 1683, 1680, 1682,
-     1682, 1684, 1681, 1687, 1675, 1684, 1676, 1680, 1687, 1677,
-     1686, 1679, 1685, 1685, 1689, 1690, 1683, 1692, 1686, 1693,
-     1694, 1692, 1702, 1689, 1696, 1696, 1699, 1699, 1690, 1703,
-     1703, 1704, 1704, 1693, 1705, 1694, 1709, 1705, 1706, 1706,
-     1707, 1707, 1702, 1708, 1708, 1710, 1711, 1712, 1712, 1713,
-     1717, 1711, 1716, 1713, 1709, 1718, 1716, 1716, 1719, 1710,
-     1722, 1718, 1723, 1719, 1724, 1722, 1725, 1726, 1727, 1724,
-
-     1728, 1728, 1729, 1717, 1731, 1730, 1732, 1732, 1735, 1723,
-     1723, 1737, 1727, 1730, 1725, 1733, 1733, 1726, 1734, 1734,
-     1736, 1729, 1738, 1731, 1735, 1736, 1739, 1740, 1745, 1741,
-     1754, 1737, 1743, 1743, 1744, 1739, 1748, 1744, 1747, 1747,
-     1750, 1748, 1751, 1751, 1753, 1754, 1745, 1740, 1738, 1741,
-     1752, 1755, 1756, 1753, 1752, 1755, 1755, 1757, 1750, 1759,
-     1760, 1762, 1766, 1767, 1767, 1756, 1757, 1766, 1759, 1768,
-     1770, 1775, 1760, 1771, 1771, 1770, 1774, 1771, 1768, 1773,
-     1773, 1777, 1776, 1778, 1781, 1774, 1762, 1776, 1778, 1779,
-     1780, 1775, 1782, 1782, 1784, 1780, 1785, 1786, 1786, 1787,
-
-     1788, 1789, 1777, 1790, 1788, 1791, 1792, 1779, 1794, 1781,
-     1789, 1785, 1787, 1784, 1792, 1793, 1795, 1795, 1796, 1790,
-     1793, 1798, 1798, 1805, 1791, 1799, 1799, 1801, 1801, 1806,
-     1802, 1804, 1804, 1810, 1794, 1802, 1807, 1796, 1809, 1809,
-     1811, 1812, 1812, 1805, 1813, 1813, 1814, 1810, 1815, 1816,
-     1817, 1817, 1806, 1818, 1821, 1807, 1818, 1819, 1819, 1822,
-     1815, 1823, 1811, 1824, 1823, 1814, 1821, 1825, 1824, 1816,
-     1826, 1827, 1828, 1828, 1831, 1826, 1830, 1830, 1834, 1822,
-     1833, 1833, 1835, 1834, 1919, 1836, 1825, 1919, 1827, 1827,
-     1836, 1837, 1837, 1831, 1838, 1838, 1835, 1839, 1839, 1840,
-
-     1842, 1842, 1846, 1846, 1840, 1848, 1848, 1849, 1850, 1851,
-     1852, 1852, 1853, 1860, 1856, 1857, 1857, 1853, 1851, 1858,
-     1861, 1849, 1856, 1863, 1858, 1862, 1864, 1865, 1850, 1913,
-     1862, 1866, 1867, 1860, 1864, 1863, 1868, 1869, 1872, 1892,
-     1861, 1913, 1869, 1874, 1874, 1865, 1885, 1866, 1892, 1867,
-     1867, 1875, 1875, 1880, 1880, 1876, 1882, 1868, 1872, 1876,
-     1882, 1884, 1884, 1886, 1885, 1888, 1888, 1889, 1891, 1893,
-     1893, 1894, 1894, 1895, 1895, 1896, 1897, 1886, 1898, 1899,
-     1896,    0, 1889, 1900, 1901, 1902, 1891, 1920, 1900, 1901,
-     1903, 1903, 1920, 1898, 1906, 1906, 1908, 1908, 1910, 1915,
-
-     1899, 1897, 1911, 1911, 1902, 1914, 1914, 1910, 1916, 1916,
-     1921, 1922, 1923, 1925, 1915, 1924, 1922, 1929, 1931, 1932,
-     1929, 1933, 1931, 1935, 1921, 1936, 1937, 1939, 1938, 1925,
-     1940, 1923, 1941, 1924, 1935, 1933, 1942,    0, 1936, 1932,
-     1943, 1943, 1944, 1939, 1949, 1937, 1938, 1941, 1945, 1945,
-     1950, 1944, 1946, 1946, 1947, 1940, 1942, 1948, 1951, 1947,
-     1952, 1955, 1948, 1951, 1958, 1950, 1953, 1953, 1959, 1949,
-     1960, 1961, 1963, 1959, 1952, 1960, 1955, 1962, 1965, 1966,
-     1967, 1968, 1969, 1958, 1970, 1961, 1972, 1973, 1973, 1970,
-     1962, 1963, 1965, 1967, 1968, 1971, 1977, 1974, 1966, 1975,
-
-     1971, 1969, 1974, 1976, 1975, 1972, 1978, 1980, 1976, 1979,
-     1979, 1978, 1981, 1982, 1980, 1977, 1983, 1984, 1987, 1988,
-     1985, 1983, 1989, 1987, 1990, 1991, 1991, 1993, 1998, 1992,
-     1996, 1981, 1982, 1985, 1992, 1996, 1984, 1990, 1988, 1994,
-     1994, 1989, 1995, 1995, 1997, 2000, 1993, 1998, 1999, 1999,
-     2001, 1997, 2000, 2002, 2003, 2004, 2006, 2001, 2007, 2003,
-     2008, 2006, 2009, 2007, 2010, 2010, 2011, 2012, 2013, 2013,
-     2014, 2014, 2002, 2015, 2004, 2016, 2016, 2017, 2017, 2008,
-     2015, 2009, 2018, 2020, 2024, 2011, 2012, 2023, 2020, 2018,
-     2025,    0, 2023, 2026, 2026, 2027, 2027,    0,    0,    0,
-
-        0,    0,    0, 2024,    0,    0,    0,    0,    0, 2025,
-     2031, 2031, 2031, 2031, 2031, 2031, 2031, 2032, 2032, 2032,
-     2032, 2032, 2032, 2032, 2033, 2033, 2033, 2033, 2033, 2033,
-     2033, 2034, 2034, 2034, 2034, 2034, 2034, 2034, 2035, 2035,
-     2035, 2035, 2035, 2035, 2035, 2037, 2037,    0, 2037, 2037,
-     2037, 2037, 2038, 2038,    0,    0,    0, 2038, 2038, 2039,
-     2039,    0,    0, 2039,    0, 2039, 2040,    0,    0,    0,
-        0,    0, 2040, 2041, 2041,    0,    0,    0, 2041, 2041,
-     2042,    0,    0,    0,    0,    0, 2042, 2043, 2043,    0,
-     2043, 2043, 2043, 2043, 2044, 2044,    0, 2044, 2044, 2044,
-
-     2044, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030,
-     2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030,
-     2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030,
-     2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030, 2030,
-     2030
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        3,    3,    3,    4,    4,    4,    5,    5,    6,    6,
+        5,    3,    6,   20,    4,   20,   20,    5,   20,    6,
+        7,    7,    7,    7,   20,    7,    8,    8,    8,    8,
+       95,    8,    7,    9,    9,    9,   95,   33,    8,   10,
+       10,   10,   15,   24,    9,   21,   15,   24,   21,   21,
+       10,   11,   11,   11,   11,   11,   11,   19,   33,   19,
+
+       19,  151,   19,   11,   25,   25,   21,   24,   19,   19,
+      151,   28,   11,   12,   12,   12,   12,   12,   12,   25,
+       22,   22,   26,   26,   23,   12,   28,   29,   22,   23,
+       30,   26,   29,   23,   12,   22,   23,   27,   23,   23,
+       50,   27,   35,   50,   27,   30,   31,   31,   70,   32,
+       32,   27,   70,   27,   32,   31,   35,   34,   36,   36,
+       76,   31,   34,   36,   76,   31,   34,   45,   45,   37,
+       32,   39,   34,   36,   37,   34,   36,   37,   38,   38,
+       67,   38,   34,  115,   37,   39,   40,   40,   37,   37,
+       39,   40,   61,   61,   67,   40,   38,   56,  115,   56,
+
+       56,   64,   56,   64,   64,   66,   64,   66,   66,   69,
+       66,   69,   69,   64,   69,   77,   72,   80,   72,   72,
+       69,   72,   75,   78,   79,   75,   78,   72,   72,   82,
+       83,   80,   81,   89,   84,   77,   86,   85,   81,   78,
+       87,   90,   79,   85,   81,   91,   88,   82,   82,   91,
+       86,   89,   83,   84,   93,   96,   85,   88,   92,   90,
+       87,   94,   99,   92,   94,   97,   98,   94,   93,   98,
+       97,  100,  101,   98,   96,  102,  101,  104,  103,  105,
+       94,   94,  102,  106,  104,  100,   99,  107,  109,  108,
+       97,  103,  105,  108,  111,  110,  112,  112,  113,  117,
+
+      110,  116,  114,  106,  110,  107,  109,  119,  122,  118,
+      124,  120,  123,  119,  111,  114,  128,  117,  113,  584,
+      116,  114,  118,  120,  121,  121,  122,  125,  123,  125,
+      126,  124,  127,  129,  128,  126,  131,  131,  129,  133,
+      138,  138,  133,  584,  127,  121,  135,  145,  135,  135,
+      125,  135,  140,  145,  140,  140,  141,  140,  141,  141,
+      143,  141,  144,  143,  146,  147,  148,  144,  141,  149,
+      150,  152,  156,  147,  156,  153,  159,  152,  152,  146,
+      153,  154,  154,  155,  149,  148,  162,  157, 2041,  155,
+      150,  157,  158,  158,  156,  159,  157,  160,  161,  165,
+
+      163,  157,  160,  161,  163,  164,  166,  157,  157,  162,
+      164,  167,  168,  165,  169,  170,  171,  171,  172,  169,
+      170,  166,  171,  167,  173,  174,  167,  175,  175,  176,
+      168,  174,  179,  177,  171,  176,  171,  178,  172,  177,
+      173,  176,  180,  187,  181,  182,  178,  184,  180,  181,
+      183,  182,  185,  179,  184,  186,  183,  189,  188,  190,
+      191,  186,  193,  187,  188,  185,  192,  190,  194,  195,
+      196,  192,  197,  191,  198,  196,  200,  193,  199,  189,
+      198,  201,  200,  202,  194,  202,  203,  205,  206,  195,
+      207,  207,  204,  203,  197,  211,  199,  199,  204,  208,
+
+      206,  201,  209,  212,  214,  208,  205,  210,  209,  210,
+      213,  215,  214,  218,  216,  212,  217,  215,  211,  216,
+      219,  220,  217,  208,  221,  222,  210,  223,  218,  213,
+      223,  224,  221,  224,  230,  220,  225,  225,  219,  226,
+      227,  227,  226,  228,  228,  229,  233,  234,  231,  230,
+      222,  231,  232,  234,  235,  233,  232,  236,  237,  237,
+      238,  229,  240,  236,  239,  238,  241,  242,  235,  246,
+      239,  248,  243,  244,  244,  245,  247,  250,  245,  744,
+      247,  251,  240,  257,  241,  243,  252,  246,  242,  248,
+      249,  249,  252,  251,  253,  250,  254,  253,  255,  258,
+
+      256,  259,  263,  260,  257,  260,  260,  255,  254,  256,
+      261,  261,  258,  259,  262,  255,  255,  262,  255,  263,
+      264,  265,  263,  266,  267,  267,  268,  269,  269,  270,
+      265,  268,  266,  271,  272,  264,  273,  274,  271,  275,
+      276,  139,  277,  278,  270,  275,  272,  277,  278,  280,
+      279,  281,  274,  279,  278,  279,  273,  282,  283,  286,
+      276,  285,  287,  280,  283,  292,  282,  281,  284,  288,
+      281,  290,  281,  284,  285,  289,  298,  287,  289,  286,
+      292,  293,  285,  288,  295,  290,  294,  296,  297,  300,
+      293,  294,  294,  299,  289,  291,  298,  291,  291,  299,
+
+      301,  302,  304,  297,  306,  295,  296,  291,  303,  291,
+      291,  291,  300,  303,  291,  305,  302,  304,  307,  308,
+      301,  305,  309,  310,  306,  313,  311,  314,  309,  137,
+      307,  311,  315,  308,  312,  312,  316,  312,  317,  310,
+      317,  320,  318,  314,  321,  313,  318,  319,  315,  324,
+      316,  319,  322,  323,  324,  326,  325,  327,  321,  320,
+      325,  322,  323,  327,  326,  328,  319,  329,  330,  332,
+      331,  335,  330,  329,  322,  331,  333,  333,  334,  336,
+      336,  337,  339,  334,  335,  340,  328,  337,  338,  332,
+      340,  341,  338,  342,  343,  344,  344,  345,  343,  346,
+
+      341,  350,  345,  339,  351,  342,  347,  347,  349,  349,
+      352,  353,  351,  354,  356,  357,  358,  359,  360,  352,
+      346,  361,  350,  359,  362,  354,  361,  360,  363,  368,
+      358,  353,  356,  364,  356,  357,  363,  365,  362,  364,
+      366,  367,  369,  365,  370,  371,  367,  372,  370,  373,
+      374,  368,  372,  376,  366,  377,  378,  382,  382,  380,
+      371,  365,  380,  369,  381,  373,  383,  384,  384,  374,
+      375,  375,  378,  376,  377,  385,  375,  379,  375,  387,
+      386,  388,  389,  379,  381,  136,  375,  393,  379,  375,
+      385,  383,  386,  390,  387,  392,  375,  391,  390,  394,
+
+      388,  398,  393,  396,  389,  394,  391,  396,  399,  397,
+      400,  401,  403,  398,  392,  397,  402,  402,  405,  401,
+      407,  404,  406,  400,  403,  406,  399,  404,  408,  409,
+      405,  410,  409,  408,  411,  407,  412,  413,  413,  411,
+      411,  414,  414,  416,  416,  415,  419,  410,  418,  412,
+      410,  415,  417,  417,  418,  420,  421,  422,  423,  427,
+      420,  426,  423,  424,  425,  422,  426,  419,  425,  424,
+      428,  430,  429,  432,  434,  421,  428,  429,  431,  427,
+      437,  431,  433,  433,  435,  430,  431,  439,  436,  435,
+      431,  432,  434,  436,  437,  438,  439,  440,  441,  442,
+
+      440,  438,  441,  443,  442,  444,  445,  446,  443,  447,
+      448,  449,  446,  451,  450,  452,  451,  449,  452,  445,
+      450,  444,  448,  453,  441,  447,  454,  455,  453,  456,
+      459,  457,  458,  459,  460,  456,  457,  461,  458,  460,
+      462,  455,  461,  461,  454,  463,  464,  465,  466,  471,
+      468,  467,  464,  462,  467,  468,  469,  466,  463,  470,
+      470,  469,  469,  472,  473,  472,  465,  475,  474,  467,
+      474,  476,  477,  478,  471,  479,  482,  480,  483,  479,
+      481,  484,  485,  473,  486,  475,  480,  487,  485,  476,
+      490,  477,  492,  478,  482,  481,  484,  483,  488,  488,
+
+      489,  490,  491,  486,  489,  493,  487,  491,  492,  494,
+      495,  496,  497,  498,  500,  499,  496,  495,  498,  497,
+      499,  501,  494,  503,  493,  502,  504,  506,  501,  507,
+      506,  505,  500,  507,  502,  504,  505,  503,  508,  509,
+      509,  510,  513,  512,  515,  516,  517,  514,  509,  512,
+      510,  514,  517,  518,  519,  520,  515,  526,  529,  508,
+      523,  518,  513,  516,  521,  530,  531,  529,  538,  521,
+      531,  530,  519,  521,  526,  523,  521,  532,  532,  534,
+      520,  533,  533,  521,  537,  534,  521,  535,  535,  535,
+      536,  535,  543,  538,  535,  536,  548,  539,  548,  535,
+
+      539,  541,  537,  540,  540,  535,  535,  543,  541,  542,
+      542,  544,  544,  545,  546,  547,  549,  546,  545,  550,
+      547,  551,  553,  552,  554,  554,  556,  557,  549,  555,
+      553,  558,  559,  560,  560,  134,  563,  559,  550,  563,
+      556,  551,  552,  558,  555,  557,  561,  562,  564,  565,
+      566,  567,  561,  562,  564,  568,  569,  565,  566,  570,
+      568,  571,  571,  569,  572,  574,  573,  575,  577,  567,
+      578,  574,  579,  572,  573,  579,  580,  577,  570,  578,
+      581,  580,  582,  582,  583,  585,  575,  587,  585,  587,
+      588,  588,  589,  590,  581,  591,  585,  592,  590,  583,
+
+      593,  594,  595,  596,  132,  597,  598,  596,  600,  599,
+      601,  595,  609,  589,  603,  603,  591,  592,  599,  604,
+      600,  594,  593,  597,  601,  598,  602,  605,  606,  607,
+      610,  609,  602,  608,  606,  607,  612,  608,  611,  604,
+      614,  605,  610,  611,  613,  613,  614,  616,  615,  617,
+      610,  615,  618,  619,  620,  620,  621,  612,  618,  622,
+      622,  623,  617,  624,  625,  616,  626,  624,  627,  628,
+      630,  630,  632,  619,  621,  631,  623,  634,  633,  631,
+      635,  634,  627,  625,  637,  638,  130,  632,  636,  628,
+      626,  629,  644,  636,  629,  635,  629,  639,  637,  638,
+
+      629,  639,  629,  633,  640,  641,  642,  629,  643,  645,
+      641,  642,  629,  644,   68,  646,  648,  648,  647,  640,
+      641,  646,  643,  645,  647,  649,  650,  650,  651,  653,
+      649,  652,  650,  657,  650,  654,  652,  655,  655,  656,
+      651,  657,  658,  653,  656,  650,  659,  654,  660,  660,
+      661,  663,  650,  665,  661,  664,  658,  663,  664,  668,
+      666,  667,  669,  672,  668,  659,  670,  667,  671,  673,
+      674,  675,  665,  666,  676,  670,  675,  671,  673,  672,
+      678,  669,  677,  679,  680,  681,  683,  685,  684,  674,
+      686,  681,  679,  680,  676,  686,  677,  694,  687,  688,
+
+      678,  689,  685,  687,  688,  683,  684,  690,  690,  691,
+      689,  692,  695,  694,  698,  691,  699,  695,  695,  696,
+      696,  701,  697,  696,  692,  697,  700,  701,  698,  702,
+      703,  704,  705,  703,  706,  707,  699,  710,  708,  706,
+      707,  700,  711,  710,  714,  712,  713,  713,  705,  702,
+      708,  712,  704,  714,  715,  717,  716,  718,  711,  716,
+      719,  720,  721,  725,  722,  723,  727,  728,  721,  722,
+      723,  731,  715,  717,  720,  726,  718,  727,  726,  728,
+      719,  725,  729,  730,  734,  732,  731,  735,  729,  730,
+      732,  733,  733,  736,  737,  738,  740,  739,  737,  741,
+
+      743,  735,  745,  734,  748,  736,  739,  746,  747,  750,
+      748,  749,  752,  738,  750,  740,  745,  749,  751,  743,
+      753,  755,  746,  751,  741,  754,  752,  756,  747,  758,
+      754,  757,  759,  761,  753,  762,  755,  763,  757,  760,
+      760,  764,  768,  763,  758,  766,  756,  761,  765,  765,
+      766,  759,  767,  762,  769,  770,  768,  769,  771,  767,
+      772,  764,  773,  774,  775,  772,  784,  771,  774,  777,
+      777,  778,  780,  770,  781,  778,  779,  782,  784,  783,
+      785,  773,  786,  775,  787,  779,  783,  780,  788,  789,
+      790,  791,  782,  781,  788,  793,  796,  794,  795,  785,
+
+      791,  793,  787,  786,  789,  798,  795,  797,  799,  800,
+      790,  794,  797,  799,  799,  801,  796,  798,  802,  803,
+      803,  804,  808,  805,  806,  807,  807,  808,  800,  801,
+      806,  802,  805,  809,  804,  810,  811,  812,  812,  813,
+      810,  811,  809,  815,  814,  816,  817,  818,  813,  814,
+      819,  821,  817,  818,  820,  819,  828,  815,  820,  824,
+      821,  822,  822,  816,  823,  821,  823,  821,  826,  821,
+      824,  821,  826,  827,  828,  829,  830,  831,  832,  833,
+      835,  830,  830,  836,  829,  834,  837,  832,  827,  838,
+      839,  831,  836,  834,  835,  839,  840,  840,  833,  846,
+
+      841,  842,  842,  844,  837,  845,  844,  847,  847,  848,
+      845,  849,  849,  851,  838,  841,  850,  853,  846,  852,
+      852,  850,  854,  855,  858,  856,  861,  854,   62,  848,
+      856,  855,  857,  857,  851,  859,  860,  853,  863,  861,
+      864,  859,  858,  860,  863,  865,  864,  866,  867,  868,
+      865,  869,  871,  866,  870,  870,  872,  867,  873,  874,
+      875,  877,  869,  876,  878,  874,  879,  879,  868,  880,
+      881,  885,  871,  877,  875,  882,  872,  884,  884,  883,
+      875,  873,  878,  876,  883,  886,  888,   57,  898,  880,
+      886,  889,  890,  882,  885,  881,  889,  889,  891,  893,
+
+      892,  890,  892,  894,  895,  888,  891,  896,  895,  894,
+      897,  900,  899,  893,  898,  901,  900,  902,  896,  904,
+      905,  906,  907,  904,  911,  908,  909,  910,  913,  897,
+      899,  912,  915,  901,  907,  913,  912,  902,  905,  908,
+      906,  909,  910,  911,  914,  916,  917,  918,  919,  914,
+      915,  920,  921,  918,  916,  929,  920,  922,  921,  923,
+      923,  917,  928,  922,  924,  924,  926,  926,  927,  919,
+      930,  928,  927,  929,  931,  930,  932,  933,  935,  934,
+      936,  937,  933,  933,  934,  934,  938,  939,  931,  940,
+      941,  942,  943,  944,  948,  932,  941,  942,  935,  936,
+
+      937,  945,  946,  947,  949,  938,  950,  950,  940,  953,
+      953,  943,  944,  939,  952,  948,  956,  947,  954,  949,
+      945,  946,  951,  954,  955,  951,  952,  957,  955,  956,
+      958,  959,  961,  959,  967,  962,  957,  959,  963,  963,
+      964,  966,  965,  958,  971,  964,  965,  968,  969,  969,
+      959,  962,  961,  968,  967,  973,  974,  974,  975,  966,
+      973,  980,  971,  984,  975,  977,  977,  979,  979,  982,
+      983,  983,  982,  985,  986,  987,  988,  980,  984,  990,
+      987,  989,  989,  990,  991,  992,  992,  993,  986,  994,
+      995,  988,  996, 1001,  995, 1000,  997, 1004,  985, 1005,
+
+      994,  997,  999,  999,  991, 1002, 1002, 1001, 1007,  993,
+     1003,  996, 1006, 1000, 1008, 1003, 1008, 1004, 1009, 1005,
+     1010, 1006, 1011, 1009, 1012, 1014, 1010, 1016, 1007, 1017,
+     1012, 1015, 1015, 1019, 1022, 1017, 1020, 1020, 1021, 1014,
+     1025, 1023, 1011, 1024, 1023, 1025, 1016, 1023, 1027, 1024,
+     1021, 1026, 1028, 1027, 1022, 1029, 1030, 1019, 1029, 1023,
+     1026, 1032, 1030, 1031, 1031, 1033, 1034, 1035, 1038, 1036,
+     1037, 1040, 1040, 1035, 1036, 1039, 1037, 1028, 1041, 1032,
+     1039, 1042, 1043, 1041, 1033, 1044, 1034, 1045, 1046, 1048,
+     1047, 1038, 1049, 1050, 1051, 1048, 1052, 1054, 1054, 1042,
+
+     1046, 1045, 1043, 1047, 1055, 1044, 1056, 1057, 1051, 1058,
+     1062, 1056, 1049, 1050, 1059, 1060, 1058, 1052, 1064, 1065,
+     1065, 1069, 1057, 1059, 1055, 1062, 1059, 1066, 1066, 1067,
+     1062, 1060, 1067, 1068, 1071, 1070, 1072, 1069, 1068, 1076,
+     1073, 1074, 1077, 1064, 1070, 1072, 1078, 1074, 1072, 1073,
+     1075, 1075, 1079, 1071, 1080, 1077, 1081, 1083, 1084, 1076,
+     1085, 1085, 1086, 1087, 1078, 1091, 1079, 1094, 1081, 1088,
+     1080, 1095, 1087, 1094, 1088, 1090, 1084, 1100, 1086, 1089,
+     1089, 1096, 1083, 1091, 1090, 1092, 1096, 1090, 1106, 1095,
+     1092, 1092, 1097, 1098, 1089, 1101, 1102, 1100, 1097, 1098,
+
+     1107, 1101, 1103, 1108, 1109, 1103, 1110, 1106, 1107, 1102,
+     1112, 1103, 1111, 1113, 1115, 1115, 1108, 1116, 1111, 1117,
+     1122, 1121, 1109, 1117, 1118, 1110, 1112, 1119, 1120, 1118,
+     1121, 1113, 1119, 1120, 1124, 1125, 1125, 1116, 1126, 1127,
+     1130, 1128, 1129, 1122, 1131, 1132, 1127, 1133, 1136, 1124,
+     1131, 1136, 1126, 1128, 1129, 1134, 1287, 1132, 1287, 1130,
+     1142, 1134, 1135, 1135, 1139, 1133, 1137, 1137, 1140, 1139,
+     1141, 1141, 1142, 1143, 1144, 1145, 1146, 1140, 1143, 1147,
+     1148, 1149, 1150, 1144, 1147, 1151, 1151, 1145, 1152, 1148,
+     1153, 1146, 1159, 1154, 1152, 1155, 1157, 1150, 1156, 1156,
+
+     1173, 1149, 1148, 1158, 1158, 1160, 1160, 1168, 1166,   52,
+     1161, 1153, 1154, 1159, 1161, 1155, 1157, 1162, 1163, 1165,
+     1173, 1163, 1167, 1162, 1174, 1165, 1166, 1172, 1167, 1169,
+     1169, 1171, 1168, 1170, 1170, 1176, 1175, 1171, 1179, 1172,
+     1172, 1172, 1175, 1178, 1174, 1180, 1172, 1182, 1178, 1178,
+     1181, 1181, 1179, 1183, 1183, 1176, 1184, 1185, 1186, 1186,
+     1187, 1187, 1190, 1191, 1191, 1192, 1180, 1193, 1194, 1195,
+     1197, 1190, 1198, 1182, 1193,   51, 1184, 1194, 1200, 1185,
+     1192, 1196, 1196, 1200, 1201, 1202, 1203, 1209, 1198, 1207,
+     1201, 1204, 1205, 1203, 1207, 1195, 1197, 1204, 1205, 1206,
+
+     1206, 1208, 1210, 1211, 1213, 1202, 1212, 1209, 1214, 1212,
+     1208, 1215, 1215, 1216, 1219, 1211, 1217, 1220, 1222, 1221,
+     1217, 1210, 1213, 1221, 1222, 1227, 1223, 1225, 1216, 1224,
+     1224, 1228, 1220, 1219, 1214, 1223, 1217, 1229, 1225, 1226,
+     1226, 1230, 1234, 1225, 1241, 1228, 1227, 1230, 1231, 1231,
+     1232, 1235, 1233, 1236, 1238, 1232, 1232, 1229, 1233, 1236,
+     1239, 1240, 1243, 1235, 1239, 1242, 1238, 1245, 1234, 1241,
+     1244, 1242, 1247, 1240, 1251, 1247, 1244, 1248, 1248, 1245,
+     1249, 1249, 1250, 1250, 1243, 1252, 1264, 1253, 1255, 1254,
+     1260, 1252, 1253, 1257, 1251, 1254, 1259, 1255, 1257, 1259,
+
+     1262, 1265, 1260, 1263, 1263, 1266, 1264, 1267, 1270, 1268,
+     1265, 1269, 1262, 1268, 1270, 1271, 1269, 1274, 1273, 1273,
+     1278, 1278, 1275, 1266, 1276, 1280, 1267, 1282, 1284, 1271,
+     1273, 1275, 1283, 1276, 1284, 1274, 1285, 1286, 1286, 1288,
+     1288, 1280, 1282, 1290, 1291, 1293, 1283, 1292, 1292, 1294,
+     1290, 1295, 1298, 1285, 1293, 1296, 1297, 1299, 1307,   46,
+     1300, 1302, 1303, 1295, 1291, 1315, 1300, 1296, 1297, 1305,
+     1294, 1306, 1299, 1306, 1305, 1308, 1307, 1309, 1298, 1300,
+     1308, 1302, 1303, 1311, 1309, 1313, 1314, 1314, 1316, 1320,
+     1318, 1315, 1311, 1316, 1317, 1318, 1317, 1319, 1321, 1313,
+
+     1322, 1324, 1319, 1323, 1325, 1327, 1322, 1320, 1323, 1328,
+     1329, 1329, 1325, 1331, 1324, 1330, 1330, 1332, 1321, 1333,
+     1335, 1334, 1335, 1328, 1327, 1333, 1334, 1336, 1331, 1337,
+     1337, 1338, 1338, 1339, 1340, 1342, 1340, 1332, 1343, 1336,
+     1341, 1341, 1339, 1345, 1342, 1339, 1346, 1348, 1345, 1349,
+     1343, 1346, 1350, 1353, 1357, 1351, 1355, 1356, 1358, 1353,
+     1348, 1362, 1355, 1359, 1359, 1360, 1368, 1358, 1365, 1349,
+     1350, 1351, 1356, 1363, 1360, 1361, 1361, 1363, 1364, 1357,
+     1362, 1365, 1366, 1364, 1367, 1372, 1368, 1366, 1366, 1371,
+     1371, 1375, 1367, 1376, 1372, 1373, 1373, 1374, 1374, 1377,
+
+     1381, 1378, 1384, 1375, 1382, 1377, 1378, 1379, 1379, 1382,
+     1383, 1376, 1386, 1385, 1390, 1387, 1391, 1384, 1385, 1388,
+     1388, 1391, 1389, 1392, 1393, 1381, 1389, 1395, 1396, 1390,
+     1386, 1387, 1397, 1383, 1398, 1400, 1399, 1401, 1403, 1403,
+     1406, 1404, 1405, 1393, 1404, 1425, 1395, 1400, 1407, 1392,
+     1425, 1396, 1411, 1398, 1406, 1405, 1397, 1399, 1401, 1408,
+     1408, 1407, 1409, 1409, 1410, 1410, 1412, 1411, 1413, 1413,
+     1418, 1414, 1415, 1415, 1416, 1416, 1417, 1417, 1420, 1412,
+     1414, 1419, 1419, 1414, 1421, 1421, 1422, 1422, 1423, 1418,
+     1426, 1426, 1427, 1428, 1428, 1429, 1420, 1430, 1431, 1432,
+
+     1432, 1431, 1434, 1430, 1433, 1433, 1436, 1423, 1435, 1437,
+     1437, 1427, 1439, 1429, 1440, 1432, 1441, 1444, 1442, 1443,
+     1443, 1434, 1442, 1435, 1446, 1436, 1445, 1445, 1447, 1448,
+     1450, 1441, 1439, 1449, 1449, 1447, 1444, 1440, 1452, 1450,
+     1453, 1454, 1456, 1455, 1446, 1453, 1457, 1458, 1460, 1459,
+     1452, 1457, 1458, 1461, 1462, 1448, 1455, 1460, 1466, 1463,
+     1468, 1516, 1461, 1456, 1459, 1463, 1454, 1464, 1462, 1468,
+     1470, 1464, 1469, 1469, 1471, 1471, 1470, 1472, 1466, 1474,
+     1475, 1477, 1479, 1471, 1481, 1479, 1480, 1516, 1482, 1475,
+     1490, 1480, 1486, 1477, 1474, 1483, 1483, 1472, 1488, 1472,
+
+     1482, 1485, 1485, 1489, 1481, 1497, 1486, 1487, 1487, 1490,
+     1488, 1491, 1491, 1494, 1493, 1498, 1494, 1489, 1493, 1495,
+     1495, 1496, 1499, 1500, 1501, 1497, 1496, 1500, 1502, 1506,
+       41, 1503, 1504, 1502, 1507, 1498, 1499, 1503, 1504, 1507,
+     1508, 1509, 1513, 1538, 1501, 1506, 1508, 1523, 1510, 1509,
+     1510, 1514, 1514, 1534, 1515, 1538, 1513, 1515, 1517, 1517,
+     1521, 1521, 1526, 1527, 1527, 1523, 1531, 1526, 1529, 1529,
+     1532, 1532, 1531, 1533, 1535, 1534, 1537, 1539, 1539, 1535,
+     1542, 1541, 1543, 1544, 1546, 1546, 1542, 1548, 1548, 1533,
+     1541, 1549, 1549, 1552, 1550, 1537, 1558, 1553, 1544, 1550,
+
+     1543, 1551, 1553, 1551, 1554, 1554, 1557, 1552, 1555, 1555,
+     1556, 1556, 1559, 1559, 1558, 1560, 1561, 1562, 1557, 1563,
+     1564, 1565, 1565, 1566, 1563, 1567, 1568, 1560, 1561, 1562,
+     1569, 1570, 1566, 1571, 1572, 1572, 1573, 1575, 1574, 1576,
+     1564, 1578, 1578, 1569, 1576, 1573, 1568, 1571, 1577, 1579,
+     1579, 1567, 1583, 1577, 1585, 1570, 1574, 1580, 1580, 1575,
+     1584, 1586, 1587, 1588, 1589, 1590, 1590, 1592, 1592, 1594,
+     1593, 1587, 1583, 1595, 1596, 1597, 1585, 1598, 1584, 1593,
+     1595, 1586, 1589, 1588, 1599, 1600, 1602, 1594, 1603, 1596,
+     1601, 1601, 1602, 1597, 1604, 1598, 1605, 1606, 1607, 1608,
+
+     1599, 1612, 1606, 1609, 1600, 1610, 1603, 1610, 1609, 1604,
+     1612, 1613, 1616, 1617, 1619, 1605, 1617, 1620, 1607, 1608,
+     1618, 1618, 1621, 1621, 1622, 1624, 1627, 1625, 1622, 1619,
+     1613, 1625, 1616, 1626, 1626, 1620, 1629, 1629, 1632, 1627,
+     1624, 1631, 1631, 1633, 1633, 1634, 1634, 1638, 1638, 1639,
+     1640, 1641, 1647, 1642, 1643, 1644, 1645, 1632, 1642, 1643,
+     1641, 1648, 1650, 1640, 1645, 1649, 1648, 1647, 1651, 1651,
+     1649, 1639, 1652, 1652, 1644, 1653, 1654, 1650, 1655, 1661,
+     1656, 1654, 1653,   14, 1655, 1656, 1657, 1657, 1658, 1658,
+     1662, 1663, 1661, 1664, 1665, 1663, 1662, 1666, 1664, 1667,
+
+     1668, 1669, 1673, 1665, 1674, 1668, 1671, 1667, 1680, 1671,
+     1672, 1681, 1666, 1669, 1675, 1672, 1676, 1674, 1677, 1677,
+     1673, 1678, 1682, 1675, 1684, 1676, 1685, 1680, 1683, 1683,
+     1678, 1681, 1686, 1687, 1687, 1685, 1688, 1691, 1689, 1690,
+     1690, 1682, 1689, 1684, 1692, 1691, 1695, 1686, 1694, 1692,
+     1697, 1698, 1699, 1707, 1697, 1688, 1714, 1694, 1716, 1695,
+     1701, 1701, 1704, 1704, 1716, 1698,   13, 1699, 1708, 1708,
+     1709, 1709, 1710, 1707, 1714, 1710, 1711, 1711, 1712, 1712,
+     1713, 1713, 1715, 1717, 1717, 1718, 1721, 1722, 1723, 1718,
+     1727, 1721, 1721, 1724, 1723, 1727, 1715, 1728, 1729, 1724,
+
+     1730, 1731, 1732, 1729, 1733, 1733, 1734, 1736, 1740, 1735,
+     1722, 1737, 1737, 1742, 1728, 1728, 1732, 1735, 1730, 1738,
+     1738, 1731, 1739, 1739, 1740, 1734, 1736, 1741, 1743, 1744,
+     1745, 1746, 1741, 1742, 1748, 1748, 1749, 1750, 1744, 1749,
+     1752, 1752, 1753, 1755, 1756, 1756, 1761, 1753, 1757, 1758,
+     1745, 1746, 1757, 1759, 1743, 1750, 1762, 1760, 1758, 1761,
+     1764, 1755, 1760, 1760, 1765, 1762, 1767, 1771, 1759, 1764,
+     1772, 1772, 1771, 1773, 1775, 1780, 1765, 1776, 1776, 1775,
+     1779, 1776, 1773, 1778, 1778, 1782, 1781, 1784, 1783, 1779,
+     1785, 1767, 1781, 1783, 1786, 1780, 1785, 1787, 1787, 1789,
+
+     1790, 1791, 1791, 1792, 1793, 1784, 1782, 1795, 1793, 1796,
+     1799, 1794, 1798, 1797, 1801, 1790, 1792, 1798, 1789, 1786,
+     1794, 1797, 1810, 1795, 1800, 1800, 1803, 1803, 1796, 1804,
+     1804, 1806, 1806, 1801, 1807, 1811, 1799, 1809, 1809, 1807,
+     1812, 1815, 1810, 1814, 1814, 1816, 1817, 1817, 1818, 1818,
+     1819, 1820, 1821, 1822, 1822, 1815, 1826, 1823, 1811, 1812,
+     1823, 1824, 1824, 1820, 1827, 1832, 1829, 1816, 1826, 1819,
+     1828, 1829, 1821, 1828, 1830, 1831, 1833, 1833, 1835, 1835,
+     1836, 1831, 1832, 1832, 1827, 1838, 1838, 1839, 1840, 1841,
+     1842, 1842, 1839, 1830, 1841, 1843, 1843, 1844, 1844, 1836,
+
+     1845, 1854, 1840, 1847, 1847, 1845, 1851, 1851, 1853, 1853,
+     1855, 1856, 1857, 1857, 1858, 1854, 1861, 1862, 1862, 1858,
+     1856, 1863, 1865, 1866, 1861, 1868, 1863, 1867, 1869, 1870,
+     1855,    0, 1867, 1871, 1872, 1873, 1869, 1868, 1877, 1874,
+     1879, 1879, 1865, 1866, 1874, 1880, 1880, 1870, 1890, 1871,
+     1881, 1872, 1872, 1887, 1881, 1891, 1873, 1887, 1877, 1885,
+     1885, 1889, 1889, 1893, 1893, 1894, 1890, 1896, 1897, 1891,
+     1898, 1898, 1899, 1899, 1900, 1900, 1901, 1897, 1902, 1903,
+     1894, 1901, 1905, 1904, 1906, 1896, 1907, 1905, 1915, 1906,
+     1908, 1908, 1911, 1911, 1903, 1913, 1913, 1915, 1916, 1916,
+
+     1918, 1919, 1919, 1902, 1904, 1907, 1920, 1921, 1921, 1925,
+     1924, 1926, 1918, 1924, 1927, 1925, 1928, 1930, 1929, 1927,
+     1934, 1920, 1936, 1934, 1937, 1926, 1936, 1938, 1940, 1941,
+     1942, 1944, 1943, 1930, 1945, 1928, 1929, 1946, 1947, 1940,
+        0, 1938, 1941, 1954, 1937, 1948, 1948, 1944, 1949, 1942,
+     1943,    0, 1946, 1950, 1950, 1951, 1951, 1949, 1947, 1945,
+     1952, 1953, 1955, 1956, 1957, 1952, 1953, 1960, 1954, 1956,
+     1958, 1958, 1963, 1964, 1965, 1966, 1968, 1955, 1957, 1964,
+     1965, 1967, 1960, 1970, 1971, 1972, 1973, 1974, 1975, 1966,
+     1977, 1963, 1982, 1975, 1967, 1968, 1976, 1970, 1972, 1973,
+
+     1986, 1976, 1979, 1971, 1978, 1978, 1974, 1979, 1980, 1977,
+     1981, 1982, 1983, 1980, 1985, 1981, 1984, 1984, 1983, 1986,
+     1987, 1985, 1988, 1989, 1990, 1992, 1993, 1994, 1988, 1997,
+     1992, 1995, 1996, 1996, 1997, 1998, 2003, 1990, 2001, 1987,
+     1999, 1999, 1989, 2001, 1995, 1993, 1994, 2000, 2000, 2002,
+     2004, 2004, 2005, 2006, 1998, 2003, 2002, 2007, 2008, 2005,
+     2006, 2009, 2011, 2008, 2012, 2013, 2014, 2011, 2016, 2012,
+     2015, 2015, 2017, 2018, 2018, 2020, 2007, 2019, 2019, 2023,
+     2009, 2029, 2020, 2030, 2013, 2014, 2023, 2016, 2021, 2021,
+     2025, 2017, 2022, 2022, 2028, 2025, 2031, 2031,    0, 2028,
+
+     2029,    0, 2030, 2032, 2032, 2036, 2036, 2036, 2036, 2036,
+     2036, 2036, 2037, 2037, 2037, 2037, 2037, 2037, 2037, 2038,
+     2038, 2038, 2038, 2038, 2038, 2038, 2039, 2039, 2039, 2039,
+     2039, 2039, 2039, 2040, 2040, 2040, 2040, 2040, 2040, 2040,
+     2042, 2042,    0, 2042, 2042, 2042, 2042, 2043, 2043,    0,
+        0,    0, 2043, 2043, 2044, 2044,    0,    0, 2044,    0,
+     2044, 2045,    0,    0,    0,    0,    0, 2045, 2046, 2046,
+        0,    0,    0, 2046, 2046, 2047,    0,    0,    0,    0,
+        0, 2047, 2048, 2048,    0, 2048, 2048, 2048, 2048, 2049,
+     2049,    0, 2049, 2049, 2049, 2049, 2035, 2035, 2035, 2035,
+
+     2035, 2035, 2035, 2035, 2035, 2035, 2035, 2035, 2035, 2035,
+     2035, 2035, 2035, 2035, 2035, 2035, 2035, 2035, 2035, 2035,
+     2035, 2035, 2035, 2035, 2035, 2035, 2035, 2035, 2035, 2035,
+     2035, 2035, 2035, 2035, 2035, 2035, 2035
     } ;
 
 static yy_state_type yy_last_accepting_state;
@@ -2218,7 +2217,7 @@ static void config_end_include(void)
 #define YY_NO_INPUT 1
 #endif
 
-#line 2220 "<stdout>"
+#line 2219 "<stdout>"
 
 #define INITIAL 0
 #define quotedstring 1
@@ -2441,7 +2440,7 @@ YY_DECL
        {
 #line 207 "./util/configlexer.lex"
 
-#line 2443 "<stdout>"
+#line 2442 "<stdout>"
 
        while ( /*CONSTCOND*/1 )                /* loops until end-of-file is reached */
                {
@@ -2474,13 +2473,13 @@ yy_match:
                        while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
                                {
                                yy_current_state = (int) yy_def[yy_current_state];
-                               if ( yy_current_state >= 2031 )
+                               if ( yy_current_state >= 2036 )
                                        yy_c = yy_meta[(unsigned int) yy_c];
                                }
                        yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
                        ++yy_cp;
                        }
-               while ( yy_base[yy_current_state] != 4002 );
+               while ( yy_base[yy_current_state] != 3997 );
 
 yy_find_action:
                yy_act = yy_accept[yy_current_state];
@@ -3070,420 +3069,425 @@ YY_RULE_SETUP
 case 113:
 YY_RULE_SETUP
 #line 323 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_LOG_LEVEL) }
+{ YDVAR(1, VAR_FAKE_SHA1) }
        YY_BREAK
 case 114:
 YY_RULE_SETUP
 #line 324 "./util/configlexer.lex"
-{ YDVAR(1, VAR_KEY_CACHE_SIZE) }
+{ YDVAR(1, VAR_VAL_LOG_LEVEL) }
        YY_BREAK
 case 115:
 YY_RULE_SETUP
 #line 325 "./util/configlexer.lex"
-{ YDVAR(1, VAR_KEY_CACHE_SLABS) }
+{ YDVAR(1, VAR_KEY_CACHE_SIZE) }
        YY_BREAK
 case 116:
 YY_RULE_SETUP
 #line 326 "./util/configlexer.lex"
-{ YDVAR(1, VAR_NEG_CACHE_SIZE) }
+{ YDVAR(1, VAR_KEY_CACHE_SLABS) }
        YY_BREAK
 case 117:
 YY_RULE_SETUP
 #line 327 "./util/configlexer.lex"
-{ 
-                                 YDVAR(1, VAR_VAL_NSEC3_KEYSIZE_ITERATIONS) }
+{ YDVAR(1, VAR_NEG_CACHE_SIZE) }
        YY_BREAK
 case 118:
 YY_RULE_SETUP
-#line 329 "./util/configlexer.lex"
-{ YDVAR(1, VAR_ADD_HOLDDOWN) }
+#line 328 "./util/configlexer.lex"
+{ 
+                                 YDVAR(1, VAR_VAL_NSEC3_KEYSIZE_ITERATIONS) }
        YY_BREAK
 case 119:
 YY_RULE_SETUP
 #line 330 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DEL_HOLDDOWN) }
+{ YDVAR(1, VAR_ADD_HOLDDOWN) }
        YY_BREAK
 case 120:
 YY_RULE_SETUP
 #line 331 "./util/configlexer.lex"
-{ YDVAR(1, VAR_KEEP_MISSING) }
+{ YDVAR(1, VAR_DEL_HOLDDOWN) }
        YY_BREAK
 case 121:
 YY_RULE_SETUP
 #line 332 "./util/configlexer.lex"
-{ YDVAR(1, VAR_PERMIT_SMALL_HOLDDOWN) }
+{ YDVAR(1, VAR_KEEP_MISSING) }
        YY_BREAK
 case 122:
 YY_RULE_SETUP
 #line 333 "./util/configlexer.lex"
-{ YDVAR(1, VAR_USE_SYSLOG) }
+{ YDVAR(1, VAR_PERMIT_SMALL_HOLDDOWN) }
        YY_BREAK
 case 123:
 YY_RULE_SETUP
 #line 334 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_IDENTITY) }
+{ YDVAR(1, VAR_USE_SYSLOG) }
        YY_BREAK
 case 124:
 YY_RULE_SETUP
 #line 335 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_TIME_ASCII) }
+{ YDVAR(1, VAR_LOG_IDENTITY) }
        YY_BREAK
 case 125:
 YY_RULE_SETUP
 #line 336 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_QUERIES) }
+{ YDVAR(1, VAR_LOG_TIME_ASCII) }
        YY_BREAK
 case 126:
 YY_RULE_SETUP
 #line 337 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_REPLIES) }
+{ YDVAR(1, VAR_LOG_QUERIES) }
        YY_BREAK
 case 127:
 YY_RULE_SETUP
 #line 338 "./util/configlexer.lex"
-{ YDVAR(2, VAR_LOCAL_ZONE) }
+{ YDVAR(1, VAR_LOG_REPLIES) }
        YY_BREAK
 case 128:
 YY_RULE_SETUP
 #line 339 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOCAL_DATA) }
+{ YDVAR(2, VAR_LOCAL_ZONE) }
        YY_BREAK
 case 129:
 YY_RULE_SETUP
 #line 340 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOCAL_DATA_PTR) }
+{ YDVAR(1, VAR_LOCAL_DATA) }
        YY_BREAK
 case 130:
 YY_RULE_SETUP
 #line 341 "./util/configlexer.lex"
-{ YDVAR(1, VAR_UNBLOCK_LAN_ZONES) }
+{ YDVAR(1, VAR_LOCAL_DATA_PTR) }
        YY_BREAK
 case 131:
 YY_RULE_SETUP
 #line 342 "./util/configlexer.lex"
-{ YDVAR(1, VAR_INSECURE_LAN_ZONES) }
+{ YDVAR(1, VAR_UNBLOCK_LAN_ZONES) }
        YY_BREAK
 case 132:
 YY_RULE_SETUP
 #line 343 "./util/configlexer.lex"
-{ YDVAR(1, VAR_STATISTICS_INTERVAL) }
+{ YDVAR(1, VAR_INSECURE_LAN_ZONES) }
        YY_BREAK
 case 133:
 YY_RULE_SETUP
 #line 344 "./util/configlexer.lex"
-{ YDVAR(1, VAR_STATISTICS_CUMULATIVE) }
+{ YDVAR(1, VAR_STATISTICS_INTERVAL) }
        YY_BREAK
 case 134:
 YY_RULE_SETUP
 #line 345 "./util/configlexer.lex"
-{ YDVAR(1, VAR_EXTENDED_STATISTICS) }
+{ YDVAR(1, VAR_STATISTICS_CUMULATIVE) }
        YY_BREAK
 case 135:
 YY_RULE_SETUP
 #line 346 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SHM_ENABLE) }
+{ YDVAR(1, VAR_EXTENDED_STATISTICS) }
        YY_BREAK
 case 136:
 YY_RULE_SETUP
 #line 347 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SHM_KEY) }
+{ YDVAR(1, VAR_SHM_ENABLE) }
        YY_BREAK
 case 137:
 YY_RULE_SETUP
 #line 348 "./util/configlexer.lex"
-{ YDVAR(0, VAR_REMOTE_CONTROL) }
+{ YDVAR(1, VAR_SHM_KEY) }
        YY_BREAK
 case 138:
 YY_RULE_SETUP
 #line 349 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_ENABLE) }
+{ YDVAR(0, VAR_REMOTE_CONTROL) }
        YY_BREAK
 case 139:
 YY_RULE_SETUP
 #line 350 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_INTERFACE) }
+{ YDVAR(1, VAR_CONTROL_ENABLE) }
        YY_BREAK
 case 140:
 YY_RULE_SETUP
 #line 351 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_PORT) }
+{ YDVAR(1, VAR_CONTROL_INTERFACE) }
        YY_BREAK
 case 141:
 YY_RULE_SETUP
 #line 352 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_USE_CERT) }
+{ YDVAR(1, VAR_CONTROL_PORT) }
        YY_BREAK
 case 142:
 YY_RULE_SETUP
 #line 353 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SERVER_KEY_FILE) }
+{ YDVAR(1, VAR_CONTROL_USE_CERT) }
        YY_BREAK
 case 143:
 YY_RULE_SETUP
 #line 354 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SERVER_CERT_FILE) }
+{ YDVAR(1, VAR_SERVER_KEY_FILE) }
        YY_BREAK
 case 144:
 YY_RULE_SETUP
 #line 355 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_KEY_FILE) }
+{ YDVAR(1, VAR_SERVER_CERT_FILE) }
        YY_BREAK
 case 145:
 YY_RULE_SETUP
 #line 356 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_CERT_FILE) }
+{ YDVAR(1, VAR_CONTROL_KEY_FILE) }
        YY_BREAK
 case 146:
 YY_RULE_SETUP
 #line 357 "./util/configlexer.lex"
-{ YDVAR(1, VAR_PYTHON_SCRIPT) }
+{ YDVAR(1, VAR_CONTROL_CERT_FILE) }
        YY_BREAK
 case 147:
 YY_RULE_SETUP
 #line 358 "./util/configlexer.lex"
-{ YDVAR(0, VAR_PYTHON) }
+{ YDVAR(1, VAR_PYTHON_SCRIPT) }
        YY_BREAK
 case 148:
 YY_RULE_SETUP
 #line 359 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DOMAIN_INSECURE) }
+{ YDVAR(0, VAR_PYTHON) }
        YY_BREAK
 case 149:
 YY_RULE_SETUP
 #line 360 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MINIMAL_RESPONSES) }
+{ YDVAR(1, VAR_DOMAIN_INSECURE) }
        YY_BREAK
 case 150:
 YY_RULE_SETUP
 #line 361 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RRSET_ROUNDROBIN) }
+{ YDVAR(1, VAR_MINIMAL_RESPONSES) }
        YY_BREAK
 case 151:
 YY_RULE_SETUP
 #line 362 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MAX_UDP_SIZE) }
+{ YDVAR(1, VAR_RRSET_ROUNDROBIN) }
        YY_BREAK
 case 152:
 YY_RULE_SETUP
 #line 363 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNS64_PREFIX) }
+{ YDVAR(1, VAR_MAX_UDP_SIZE) }
        YY_BREAK
 case 153:
 YY_RULE_SETUP
 #line 364 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNS64_SYNTHALL) }
+{ YDVAR(1, VAR_DNS64_PREFIX) }
        YY_BREAK
 case 154:
 YY_RULE_SETUP
 #line 365 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DEFINE_TAG) }
+{ YDVAR(1, VAR_DNS64_SYNTHALL) }
        YY_BREAK
 case 155:
 YY_RULE_SETUP
 #line 366 "./util/configlexer.lex"
-{ YDVAR(2, VAR_LOCAL_ZONE_TAG) }
+{ YDVAR(1, VAR_DEFINE_TAG) }
        YY_BREAK
 case 156:
 YY_RULE_SETUP
 #line 367 "./util/configlexer.lex"
-{ YDVAR(2, VAR_ACCESS_CONTROL_TAG) }
+{ YDVAR(2, VAR_LOCAL_ZONE_TAG) }
        YY_BREAK
 case 157:
 YY_RULE_SETUP
 #line 368 "./util/configlexer.lex"
-{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_ACTION) }
+{ YDVAR(2, VAR_ACCESS_CONTROL_TAG) }
        YY_BREAK
 case 158:
 YY_RULE_SETUP
 #line 369 "./util/configlexer.lex"
-{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_DATA) }
+{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_ACTION) }
        YY_BREAK
 case 159:
 YY_RULE_SETUP
 #line 370 "./util/configlexer.lex"
-{ YDVAR(2, VAR_ACCESS_CONTROL_VIEW) }
+{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_DATA) }
        YY_BREAK
 case 160:
 YY_RULE_SETUP
 #line 371 "./util/configlexer.lex"
-{ YDVAR(3, VAR_LOCAL_ZONE_OVERRIDE) }
+{ YDVAR(2, VAR_ACCESS_CONTROL_VIEW) }
        YY_BREAK
 case 161:
 YY_RULE_SETUP
 #line 372 "./util/configlexer.lex"
-{ YDVAR(0, VAR_DNSTAP) }
+{ YDVAR(3, VAR_LOCAL_ZONE_OVERRIDE) }
        YY_BREAK
 case 162:
 YY_RULE_SETUP
 #line 373 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_ENABLE) }
+{ YDVAR(0, VAR_DNSTAP) }
        YY_BREAK
 case 163:
 YY_RULE_SETUP
 #line 374 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_SOCKET_PATH) }
+{ YDVAR(1, VAR_DNSTAP_ENABLE) }
        YY_BREAK
 case 164:
 YY_RULE_SETUP
 #line 375 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_SEND_IDENTITY) }
+{ YDVAR(1, VAR_DNSTAP_SOCKET_PATH) }
        YY_BREAK
 case 165:
 YY_RULE_SETUP
 #line 376 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_SEND_VERSION) }
+{ YDVAR(1, VAR_DNSTAP_SEND_IDENTITY) }
        YY_BREAK
 case 166:
 YY_RULE_SETUP
 #line 377 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_IDENTITY) }
+{ YDVAR(1, VAR_DNSTAP_SEND_VERSION) }
        YY_BREAK
 case 167:
 YY_RULE_SETUP
 #line 378 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_VERSION) }
+{ YDVAR(1, VAR_DNSTAP_IDENTITY) }
        YY_BREAK
 case 168:
 YY_RULE_SETUP
 #line 379 "./util/configlexer.lex"
-{
-               YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES) }
+{ YDVAR(1, VAR_DNSTAP_VERSION) }
        YY_BREAK
 case 169:
 YY_RULE_SETUP
-#line 381 "./util/configlexer.lex"
+#line 380 "./util/configlexer.lex"
 {
-               YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES) }
+               YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES) }
        YY_BREAK
 case 170:
 YY_RULE_SETUP
-#line 383 "./util/configlexer.lex"
+#line 382 "./util/configlexer.lex"
 {
-               YDVAR(1, VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES) }
+               YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES) }
        YY_BREAK
 case 171:
 YY_RULE_SETUP
-#line 385 "./util/configlexer.lex"
+#line 384 "./util/configlexer.lex"
 {
-               YDVAR(1, VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES) }
+               YDVAR(1, VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES) }
        YY_BREAK
 case 172:
 YY_RULE_SETUP
-#line 387 "./util/configlexer.lex"
+#line 386 "./util/configlexer.lex"
 {
-               YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES) }
+               YDVAR(1, VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES) }
        YY_BREAK
 case 173:
 YY_RULE_SETUP
-#line 389 "./util/configlexer.lex"
+#line 388 "./util/configlexer.lex"
 {
-               YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES) }
+               YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES) }
        YY_BREAK
 case 174:
 YY_RULE_SETUP
-#line 391 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DISABLE_DNSSEC_LAME_CHECK) }
+#line 390 "./util/configlexer.lex"
+{
+               YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES) }
        YY_BREAK
 case 175:
 YY_RULE_SETUP
 #line 392 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IP_RATELIMIT) }
+{ YDVAR(1, VAR_DISABLE_DNSSEC_LAME_CHECK) }
        YY_BREAK
 case 176:
 YY_RULE_SETUP
 #line 393 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RATELIMIT) }
+{ YDVAR(1, VAR_IP_RATELIMIT) }
        YY_BREAK
 case 177:
 YY_RULE_SETUP
 #line 394 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IP_RATELIMIT_SLABS) }
+{ YDVAR(1, VAR_RATELIMIT) }
        YY_BREAK
 case 178:
 YY_RULE_SETUP
 #line 395 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RATELIMIT_SLABS) }
+{ YDVAR(1, VAR_IP_RATELIMIT_SLABS) }
        YY_BREAK
 case 179:
 YY_RULE_SETUP
 #line 396 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IP_RATELIMIT_SIZE) }
+{ YDVAR(1, VAR_RATELIMIT_SLABS) }
        YY_BREAK
 case 180:
 YY_RULE_SETUP
 #line 397 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RATELIMIT_SIZE) }
+{ YDVAR(1, VAR_IP_RATELIMIT_SIZE) }
        YY_BREAK
 case 181:
 YY_RULE_SETUP
 #line 398 "./util/configlexer.lex"
-{ YDVAR(2, VAR_RATELIMIT_FOR_DOMAIN) }
+{ YDVAR(1, VAR_RATELIMIT_SIZE) }
        YY_BREAK
 case 182:
 YY_RULE_SETUP
 #line 399 "./util/configlexer.lex"
-{ YDVAR(2, VAR_RATELIMIT_BELOW_DOMAIN) }
+{ YDVAR(2, VAR_RATELIMIT_FOR_DOMAIN) }
        YY_BREAK
 case 183:
 YY_RULE_SETUP
 #line 400 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IP_RATELIMIT_FACTOR) }
+{ YDVAR(2, VAR_RATELIMIT_BELOW_DOMAIN) }
        YY_BREAK
 case 184:
 YY_RULE_SETUP
 #line 401 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RATELIMIT_FACTOR) }
+{ YDVAR(1, VAR_IP_RATELIMIT_FACTOR) }
        YY_BREAK
 case 185:
 YY_RULE_SETUP
 #line 402 "./util/configlexer.lex"
-{ YDVAR(2, VAR_RESPONSE_IP_TAG) }
+{ YDVAR(1, VAR_RATELIMIT_FACTOR) }
        YY_BREAK
 case 186:
 YY_RULE_SETUP
 #line 403 "./util/configlexer.lex"
-{ YDVAR(2, VAR_RESPONSE_IP) }
+{ YDVAR(2, VAR_RESPONSE_IP_TAG) }
        YY_BREAK
 case 187:
 YY_RULE_SETUP
 #line 404 "./util/configlexer.lex"
-{ YDVAR(2, VAR_RESPONSE_IP_DATA) }
+{ YDVAR(2, VAR_RESPONSE_IP) }
        YY_BREAK
 case 188:
-/* rule 188 can match eol */
 YY_RULE_SETUP
 #line 405 "./util/configlexer.lex"
+{ YDVAR(2, VAR_RESPONSE_IP_DATA) }
+       YY_BREAK
+case 189:
+/* rule 189 can match eol */
+YY_RULE_SETUP
+#line 406 "./util/configlexer.lex"
 { LEXOUT(("NL\n")); cfg_parser->line++; }
        YY_BREAK
 /* Quoted strings. Strip leading and ending quotes */
-case 189:
+case 190:
 YY_RULE_SETUP
-#line 408 "./util/configlexer.lex"
+#line 409 "./util/configlexer.lex"
 { BEGIN(quotedstring); LEXOUT(("QS ")); }
        YY_BREAK
 case YY_STATE_EOF(quotedstring):
-#line 409 "./util/configlexer.lex"
+#line 410 "./util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
        if(--num_args == 0) { BEGIN(INITIAL); }
        else                { BEGIN(val); }
 }
        YY_BREAK
-case 190:
+case 191:
 YY_RULE_SETUP
-#line 414 "./util/configlexer.lex"
+#line 415 "./util/configlexer.lex"
 { LEXOUT(("STR(%s) ", yytext)); yymore(); }
        YY_BREAK
-case 191:
-/* rule 191 can match eol */
+case 192:
+/* rule 192 can match eol */
 YY_RULE_SETUP
-#line 415 "./util/configlexer.lex"
+#line 416 "./util/configlexer.lex"
 { yyerror("newline inside quoted string, no end \""); 
                          cfg_parser->line++; BEGIN(INITIAL); }
        YY_BREAK
-case 192:
+case 193:
 YY_RULE_SETUP
-#line 417 "./util/configlexer.lex"
+#line 418 "./util/configlexer.lex"
 {
         LEXOUT(("QE "));
        if(--num_args == 0) { BEGIN(INITIAL); }
@@ -3496,34 +3500,34 @@ YY_RULE_SETUP
 }
        YY_BREAK
 /* Single Quoted strings. Strip leading and ending quotes */
-case 193:
+case 194:
 YY_RULE_SETUP
-#line 429 "./util/configlexer.lex"
+#line 430 "./util/configlexer.lex"
 { BEGIN(singlequotedstr); LEXOUT(("SQS ")); }
        YY_BREAK
 case YY_STATE_EOF(singlequotedstr):
-#line 430 "./util/configlexer.lex"
+#line 431 "./util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
        if(--num_args == 0) { BEGIN(INITIAL); }
        else                { BEGIN(val); }
 }
        YY_BREAK
-case 194:
+case 195:
 YY_RULE_SETUP
-#line 435 "./util/configlexer.lex"
+#line 436 "./util/configlexer.lex"
 { LEXOUT(("STR(%s) ", yytext)); yymore(); }
        YY_BREAK
-case 195:
-/* rule 195 can match eol */
+case 196:
+/* rule 196 can match eol */
 YY_RULE_SETUP
-#line 436 "./util/configlexer.lex"
+#line 437 "./util/configlexer.lex"
 { yyerror("newline inside quoted string, no end '"); 
                             cfg_parser->line++; BEGIN(INITIAL); }
        YY_BREAK
-case 196:
+case 197:
 YY_RULE_SETUP
-#line 438 "./util/configlexer.lex"
+#line 439 "./util/configlexer.lex"
 {
         LEXOUT(("SQE "));
        if(--num_args == 0) { BEGIN(INITIAL); }
@@ -3536,38 +3540,38 @@ YY_RULE_SETUP
 }
        YY_BREAK
 /* include: directive */
-case 197:
+case 198:
 YY_RULE_SETUP
-#line 450 "./util/configlexer.lex"
+#line 451 "./util/configlexer.lex"
 { 
        LEXOUT(("v(%s) ", yytext)); inc_prev = YYSTATE; BEGIN(include); }
        YY_BREAK
 case YY_STATE_EOF(include):
-#line 452 "./util/configlexer.lex"
+#line 453 "./util/configlexer.lex"
 {
         yyerror("EOF inside include directive");
         BEGIN(inc_prev);
 }
        YY_BREAK
-case 198:
-YY_RULE_SETUP
-#line 456 "./util/configlexer.lex"
-{ LEXOUT(("ISP ")); /* ignore */ }
-       YY_BREAK
 case 199:
-/* rule 199 can match eol */
 YY_RULE_SETUP
 #line 457 "./util/configlexer.lex"
-{ LEXOUT(("NL\n")); cfg_parser->line++;}
+{ LEXOUT(("ISP ")); /* ignore */ }
        YY_BREAK
 case 200:
+/* rule 200 can match eol */
 YY_RULE_SETUP
 #line 458 "./util/configlexer.lex"
-{ LEXOUT(("IQS ")); BEGIN(include_quoted); }
+{ LEXOUT(("NL\n")); cfg_parser->line++;}
        YY_BREAK
 case 201:
 YY_RULE_SETUP
 #line 459 "./util/configlexer.lex"
+{ LEXOUT(("IQS ")); BEGIN(include_quoted); }
+       YY_BREAK
+case 202:
+YY_RULE_SETUP
+#line 460 "./util/configlexer.lex"
 {
        LEXOUT(("Iunquotedstr(%s) ", yytext));
        config_start_include_glob(yytext);
@@ -3575,27 +3579,27 @@ YY_RULE_SETUP
 }
        YY_BREAK
 case YY_STATE_EOF(include_quoted):
-#line 464 "./util/configlexer.lex"
+#line 465 "./util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
         BEGIN(inc_prev);
 }
        YY_BREAK
-case 202:
+case 203:
 YY_RULE_SETUP
-#line 468 "./util/configlexer.lex"
+#line 469 "./util/configlexer.lex"
 { LEXOUT(("ISTR(%s) ", yytext)); yymore(); }
        YY_BREAK
-case 203:
-/* rule 203 can match eol */
+case 204:
+/* rule 204 can match eol */
 YY_RULE_SETUP
-#line 469 "./util/configlexer.lex"
+#line 470 "./util/configlexer.lex"
 { yyerror("newline before \" in include name"); 
                                  cfg_parser->line++; BEGIN(inc_prev); }
        YY_BREAK
-case 204:
+case 205:
 YY_RULE_SETUP
-#line 471 "./util/configlexer.lex"
+#line 472 "./util/configlexer.lex"
 {
        LEXOUT(("IQE "));
        yytext[yyleng - 1] = '\0';
@@ -3605,7 +3609,7 @@ YY_RULE_SETUP
        YY_BREAK
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(val):
-#line 477 "./util/configlexer.lex"
+#line 478 "./util/configlexer.lex"
 {
        LEXOUT(("LEXEOF "));
        yy_set_bol(1); /* Set beginning of line, so "^" rules match.  */
@@ -3617,33 +3621,33 @@ case YY_STATE_EOF(val):
        }
 }
        YY_BREAK
-case 205:
+case 206:
 YY_RULE_SETUP
-#line 488 "./util/configlexer.lex"
+#line 489 "./util/configlexer.lex"
 { LEXOUT(("unquotedstr(%s) ", yytext)); 
                        if(--num_args == 0) { BEGIN(INITIAL); }
                        yylval.str = strdup(yytext); return STRING_ARG; }
        YY_BREAK
-case 206:
+case 207:
 YY_RULE_SETUP
-#line 492 "./util/configlexer.lex"
+#line 493 "./util/configlexer.lex"
 {
        ub_c_error_msg("unknown keyword '%s'", yytext);
        }
        YY_BREAK
-case 207:
+case 208:
 YY_RULE_SETUP
-#line 496 "./util/configlexer.lex"
+#line 497 "./util/configlexer.lex"
 {
        ub_c_error_msg("stray '%s'", yytext);
        }
        YY_BREAK
-case 208:
+case 209:
 YY_RULE_SETUP
-#line 500 "./util/configlexer.lex"
+#line 501 "./util/configlexer.lex"
 ECHO;
        YY_BREAK
-#line 3645 "<stdout>"
+#line 3649 "<stdout>"
 
        case YY_END_OF_BUFFER:
                {
@@ -3934,7 +3938,7 @@ static int yy_get_next_buffer (void)
                while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
                        {
                        yy_current_state = (int) yy_def[yy_current_state];
-                       if ( yy_current_state >= 2031 )
+                       if ( yy_current_state >= 2036 )
                                yy_c = yy_meta[(unsigned int) yy_c];
                        }
                yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -3962,11 +3966,11 @@ static int yy_get_next_buffer (void)
        while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
                {
                yy_current_state = (int) yy_def[yy_current_state];
-               if ( yy_current_state >= 2031 )
+               if ( yy_current_state >= 2036 )
                        yy_c = yy_meta[(unsigned int) yy_c];
                }
        yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-       yy_is_jam = (yy_current_state == 2030);
+       yy_is_jam = (yy_current_state == 2035);
 
                return yy_is_jam ? 0 : yy_current_state;
 }
@@ -4605,7 +4609,7 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 500 "./util/configlexer.lex"
+#line 501 "./util/configlexer.lex"
 
 
 

diff --git a/util/configlexer.lex b/util/configlexer.lex
index c37830a3333fd8577b77ac0f93fceb12e3266102..bc7e21bf04508e19389d6c3ee6de306fede095c3 100644 (file)
--- a/util/configlexer.lex
+++ b/util/configlexer.lex
@@ -320,6 +320,7 @@ val-permissive-mode{COLON}  { YDVAR(1, VAR_VAL_PERMISSIVE_MODE) }
 ignore-cd-flag{COLON}          { YDVAR(1, VAR_IGNORE_CD_FLAG) }
 serve-expired{COLON}           { YDVAR(1, VAR_SERVE_EXPIRED) }
 fake-dsa{COLON}                        { YDVAR(1, VAR_FAKE_DSA) }
+fake-sha1{COLON}               { YDVAR(1, VAR_FAKE_SHA1) }
 val-log-level{COLON}           { YDVAR(1, VAR_VAL_LOG_LEVEL) }
 key-cache-size{COLON}          { YDVAR(1, VAR_KEY_CACHE_SIZE) }
 key-cache-slabs{COLON}         { YDVAR(1, VAR_KEY_CACHE_SLABS) }

diff --git a/util/configparser.c b/util/configparser.c
index e38f40e0b133013bd4c0e3672bf897346527456c..d215588a81b0b163b68cf3aa5ca63ecb23914511 100644 (file)
--- a/util/configparser.c
+++ b/util/configparser.c
@@ -314,10 +314,11 @@ extern int yydebug;
     VAR_VIEW_FIRST = 443,
     VAR_SERVE_EXPIRED = 444,
     VAR_FAKE_DSA = 445,
-    VAR_LOG_IDENTITY = 446,
-    VAR_USE_SYSTEMD = 447,
-    VAR_SHM_ENABLE = 448,
-    VAR_SHM_KEY = 449
+    VAR_FAKE_SHA1 = 446,
+    VAR_LOG_IDENTITY = 447,
+    VAR_USE_SYSTEMD = 448,
+    VAR_SHM_ENABLE = 449,
+    VAR_SHM_KEY = 450
   };
 #endif
 /* Tokens.  */
@@ -509,10 +510,11 @@ extern int yydebug;
 #define VAR_VIEW_FIRST 443
 #define VAR_SERVE_EXPIRED 444
 #define VAR_FAKE_DSA 445
-#define VAR_LOG_IDENTITY 446
-#define VAR_USE_SYSTEMD 447
-#define VAR_SHM_ENABLE 448
-#define VAR_SHM_KEY 449
+#define VAR_FAKE_SHA1 446
+#define VAR_LOG_IDENTITY 447
+#define VAR_USE_SYSTEMD 448
+#define VAR_SHM_ENABLE 449
+#define VAR_SHM_KEY 450
 
 /* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
@@ -523,7 +525,7 @@ union YYSTYPE
 
        char*   str;
 
-#line 527 "util/configparser.c" /* yacc.c:355  */
+#line 529 "util/configparser.c" /* yacc.c:355  */
 };
 
 typedef union YYSTYPE YYSTYPE;
@@ -540,7 +542,7 @@ int yyparse (void);
 
 /* Copy the second part of user declarations.  */
 
-#line 544 "util/configparser.c" /* yacc.c:358  */
+#line 546 "util/configparser.c" /* yacc.c:358  */
 
 #ifdef short
 # undef short
@@ -782,21 +784,21 @@ union yyalloc
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  2
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   394
+#define YYLAST   396
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  195
+#define YYNTOKENS  196
 /* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  207
+#define YYNNTS  208
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  397
+#define YYNRULES  399
 /* YYNSTATES -- Number of states.  */
-#define YYNSTATES  600
+#define YYNSTATES  603
 
 /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
    by yylex, with out-of-bounds checking.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   449
+#define YYMAXUTOK   450
 
 #define YYTRANSLATE(YYX)                                                \
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -849,7 +851,8 @@ static const yytype_uint8 yytranslate[] =
      155,   156,   157,   158,   159,   160,   161,   162,   163,   164,
      165,   166,   167,   168,   169,   170,   171,   172,   173,   174,
      175,   176,   177,   178,   179,   180,   181,   182,   183,   184,
-     185,   186,   187,   188,   189,   190,   191,   192,   193,   194
+     185,   186,   187,   188,   189,   190,   191,   192,   193,   194,
+     195
 };
 
 #if YYDEBUG
@@ -871,31 +874,31 @@ static const yytype_uint16 yyrline[] =
      203,   204,   204,   205,   205,   206,   206,   206,   207,   207,
      208,   208,   209,   210,   210,   211,   212,   212,   213,   213,
      214,   214,   214,   215,   215,   216,   216,   217,   217,   218,
-     218,   219,   219,   219,   220,   220,   220,   221,   221,   223,
-     235,   236,   237,   237,   237,   237,   237,   238,   240,   252,
-     253,   254,   254,   254,   254,   255,   257,   271,   272,   273,
-     273,   273,   273,   274,   274,   276,   285,   294,   305,   314,
-     323,   332,   343,   352,   365,   380,   389,   398,   407,   416,
-     425,   434,   443,   452,   461,   470,   479,   488,   497,   506,
-     515,   522,   529,   538,   547,   556,   570,   579,   588,   597,
-     604,   611,   637,   645,   652,   659,   666,   673,   681,   689,
-     697,   704,   711,   720,   729,   736,   743,   751,   759,   769,
-     779,   789,   802,   813,   821,   834,   843,   852,   861,   871,
-     881,   889,   902,   911,   919,   928,   936,   949,   958,   965,
-     975,   985,   995,  1005,  1015,  1025,  1035,  1045,  1052,  1059,
-    1066,  1075,  1084,  1093,  1100,  1110,  1127,  1134,  1152,  1165,
-    1178,  1187,  1196,  1205,  1214,  1224,  1234,  1243,  1252,  1265,
-    1274,  1281,  1290,  1299,  1308,  1317,  1325,  1338,  1346,  1374,
-    1381,  1396,  1406,  1416,  1423,  1430,  1439,  1453,  1472,  1491,
-    1503,  1515,  1527,  1538,  1557,  1567,  1576,  1584,  1592,  1605,
-    1618,  1631,  1644,  1653,  1662,  1672,  1682,  1692,  1699,  1706,
-    1715,  1725,  1735,  1745,  1752,  1759,  1768,  1778,  1788,  1817,
-    1827,  1835,  1844,  1853,  1858,  1859,  1860,  1860,  1860,  1861,
-    1861,  1861,  1862,  1862,  1864,  1874,  1883,  1890,  1900,  1907,
-    1914,  1921,  1928,  1933,  1934,  1935,  1935,  1936,  1936,  1937,
-    1937,  1938,  1939,  1940,  1941,  1942,  1943,  1945,  1953,  1960,
-    1968,  1976,  1983,  1990,  1999,  2008,  2017,  2026,  2035,  2044,
-    2049,  2050,  2051,  2053,  2059,  2069,  2076,  2085
+     218,   219,   219,   219,   220,   220,   220,   221,   221,   221,
+     223,   235,   236,   237,   237,   237,   237,   237,   238,   240,
+     252,   253,   254,   254,   254,   254,   255,   257,   271,   272,
+     273,   273,   273,   273,   274,   274,   276,   285,   294,   305,
+     314,   323,   332,   343,   352,   365,   380,   389,   398,   407,
+     416,   425,   434,   443,   452,   461,   470,   479,   488,   497,
+     506,   515,   522,   529,   538,   547,   556,   570,   579,   588,
+     597,   604,   611,   637,   645,   652,   659,   666,   673,   681,
+     689,   697,   704,   711,   720,   729,   736,   743,   751,   759,
+     769,   779,   789,   802,   813,   821,   834,   843,   852,   861,
+     871,   881,   889,   902,   911,   919,   928,   936,   949,   958,
+     965,   975,   985,   995,  1005,  1015,  1025,  1035,  1045,  1052,
+    1059,  1066,  1075,  1084,  1093,  1100,  1110,  1127,  1134,  1152,
+    1165,  1178,  1187,  1196,  1205,  1214,  1224,  1234,  1243,  1252,
+    1265,  1278,  1287,  1294,  1303,  1312,  1321,  1330,  1338,  1351,
+    1359,  1387,  1394,  1409,  1419,  1429,  1436,  1443,  1452,  1466,
+    1485,  1504,  1516,  1528,  1540,  1551,  1570,  1580,  1589,  1597,
+    1605,  1618,  1631,  1644,  1657,  1666,  1675,  1685,  1695,  1705,
+    1712,  1719,  1728,  1738,  1748,  1758,  1765,  1772,  1781,  1791,
+    1801,  1830,  1840,  1848,  1857,  1866,  1871,  1872,  1873,  1873,
+    1873,  1874,  1874,  1874,  1875,  1875,  1877,  1887,  1896,  1903,
+    1913,  1920,  1927,  1934,  1941,  1946,  1947,  1948,  1948,  1949,
+    1949,  1950,  1950,  1951,  1952,  1953,  1954,  1955,  1956,  1958,
+    1966,  1973,  1981,  1989,  1996,  2003,  2012,  2021,  2030,  2039,
+    2048,  2057,  2062,  2063,  2064,  2066,  2072,  2082,  2089,  2098
 };
 #endif
 
@@ -970,7 +973,7 @@ static const char *const yytname[] =
   "VAR_ACCESS_CONTROL_TAG", "VAR_LOCAL_ZONE_OVERRIDE",
   "VAR_ACCESS_CONTROL_TAG_ACTION", "VAR_ACCESS_CONTROL_TAG_DATA",
   "VAR_VIEW", "VAR_ACCESS_CONTROL_VIEW", "VAR_VIEW_FIRST",
-  "VAR_SERVE_EXPIRED", "VAR_FAKE_DSA", "VAR_LOG_IDENTITY",
+  "VAR_SERVE_EXPIRED", "VAR_FAKE_DSA", "VAR_FAKE_SHA1", "VAR_LOG_IDENTITY",
   "VAR_USE_SYSTEMD", "VAR_SHM_ENABLE", "VAR_SHM_KEY", "$accept",
   "toplevelvars", "toplevelvar", "serverstart", "contents_server",
   "content_server", "stubstart", "contents_stub", "content_stub",
@@ -1018,9 +1021,9 @@ static const char *const yytname[] =
   "server_cache_max_negative_ttl", "server_cache_min_ttl",
   "server_bogus_ttl", "server_val_clean_additional",
   "server_val_permissive_mode", "server_ignore_cd_flag",
-  "server_serve_expired", "server_fake_dsa", "server_val_log_level",
-  "server_val_nsec3_keysize_iterations", "server_add_holddown",
-  "server_del_holddown", "server_keep_missing",
+  "server_serve_expired", "server_fake_dsa", "server_fake_sha1",
+  "server_val_log_level", "server_val_nsec3_keysize_iterations",
+  "server_add_holddown", "server_del_holddown", "server_keep_missing",
   "server_permit_small_holddown", "server_key_cache_size",
   "server_key_cache_slabs", "server_neg_cache_size", "server_local_zone",
   "server_local_data", "server_local_data_ptr", "server_minimal_responses",
@@ -1082,7 +1085,7 @@ static const yytype_uint16 yytoknum[] =
      415,   416,   417,   418,   419,   420,   421,   422,   423,   424,
      425,   426,   427,   428,   429,   430,   431,   432,   433,   434,
      435,   436,   437,   438,   439,   440,   441,   442,   443,   444,
-     445,   446,   447,   448,   449
+     445,   446,   447,   448,   449,   450
 };
 # endif
 
@@ -1116,7 +1119,8 @@ static const yytype_int16 yypact[] =
      134,   136,   138,   167,   168,   169,   170,   174,   175,   218,
      219,   220,   221,   222,   224,   225,   226,   230,   234,   235,
      261,   262,   272,   273,   274,   275,   276,   277,   278,   279,
-     280,   281,   282,   283,   284,   313,   315,   322,   323,   324,
+     280,   281,   282,   283,   284,   313,   315,   323,   324,   325,
+     326,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
     -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
     -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
     -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
@@ -1130,36 +1134,36 @@ static const yytype_int16 yypact[] =
     -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
     -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
     -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,   327,   328,
+     329,   330,   331,   332,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,   333,   334,   335,   336,   337,  -132,  -132,  -132,  -132,
+    -132,  -132,   338,   339,   340,   341,   344,   345,  -132,  -132,
+    -132,  -132,  -132,  -132,  -132,   346,   347,   348,   349,   350,
+     351,   352,   353,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,   354,   355,   356,   357,   358,   359,   360,   361,
+     362,   363,   364,   365,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,  -132,  -132,  -132,  -132,  -132,   366,  -132,  -132,
     -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
-    -132,  -132,  -132,  -132,  -132,  -132,   325,   326,   327,   328,
-     329,   330,  -132,  -132,  -132,  -132,  -132,  -132,  -132,   331,
-     332,   333,   334,   335,  -132,  -132,  -132,  -132,  -132,  -132,
-     336,   337,   338,   339,   340,   341,  -132,  -132,  -132,  -132,
-    -132,  -132,  -132,   344,   345,   346,   347,   348,   349,   350,
-     351,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
-     352,   353,   354,   355,   356,   357,   358,   359,   360,   361,
-     362,   363,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
-    -132,  -132,  -132,  -132,  -132,   364,  -132,  -132,  -132,  -132,
     -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
     -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
     -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
     -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,  -132,  -132,  -132,  -132,   367,   368,  -132,  -132,
     -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
-    -132,  -132,  -132,  -132,   365,   366,  -132,  -132,  -132,  -132,
     -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
     -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
     -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
     -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
-    -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,   367,   368,
-     369,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
-     370,   372,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
-    -132,   373,   374,   375,   376,   377,   378,  -132,  -132,  -132,
+     369,   370,   372,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,   373,   374,  -132,  -132,  -132,  -132,  -132,  -132,
+    -132,  -132,  -132,   375,   376,   377,   378,   379,   380,  -132,
     -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
-    -132,  -132,  -132,  -132,  -132,   379,  -132,   380,   381,  -132,
+    -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,   381,  -132,
+     382,   383,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
     -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
     -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
-    -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
-     382,   383,   384,  -132,  -132,  -132,  -132,  -132,  -132,  -132
+    -132,  -132,  -132,   384,   385,   386,  -132,  -132,  -132,  -132,
+    -132,  -132,  -132
 };
 
   /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
@@ -1167,8 +1171,8 @@ static const yytype_int16 yypact[] =
      means the default is an error.  */
 static const yytype_uint16 yydefact[] =
 {
-       2,     0,     1,    11,   159,   168,   343,   389,   362,   176,
-       3,    13,   161,   170,   178,   345,   364,   391,     4,     5,
+       2,     0,     1,    11,   160,   169,   345,   391,   364,   177,
+       3,    13,   162,   171,   179,   347,   366,   393,     4,     5,
        6,    10,     8,     9,     7,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -1184,49 +1188,50 @@ static const yytype_uint16 yydefact[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      12,    14,    15,    74,    77,    86,   157,   158,    16,    25,
-      65,    17,    78,    79,    36,    58,    73,    18,    19,    21,
-      22,    20,    23,    24,   109,   110,   111,   112,   113,   153,
-      75,    64,    90,   107,   108,    26,    27,    28,    29,    30,
-      66,    80,    81,    96,    52,    62,    53,    91,    46,    47,
-      48,    49,   100,   104,   117,   125,   140,   101,    59,    31,
-      32,    33,    88,   118,   119,   120,    34,    35,    37,    38,
-      40,    41,    39,   123,    42,    43,    44,    50,    69,   105,
-      83,   124,    76,   136,    84,    85,   102,   103,    89,    45,
-      67,    70,    51,    54,    92,    93,    68,   137,    94,    55,
-      56,    57,   106,   150,   151,    95,    63,    97,    98,    99,
-     138,    60,    61,    82,    71,    72,    87,   114,   115,   116,
-     121,   122,   141,   142,   144,   146,   147,   145,   148,   154,
-     126,   127,   130,   131,   128,   129,   132,   133,   135,   134,
-     139,   149,   143,   152,   155,   156,     0,     0,     0,     0,
-       0,     0,   160,   162,   163,   164,   166,   167,   165,     0,
-       0,     0,     0,     0,   169,   171,   172,   173,   174,   175,
-       0,     0,     0,     0,     0,     0,   177,   179,   180,   183,
-     184,   181,   182,     0,     0,     0,     0,     0,     0,     0,
-       0,   344,   346,   348,   347,   353,   349,   350,   351,   352,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   363,   365,   366,   367,   368,   369,   370,   371,
-     372,   373,   374,   375,   376,     0,   390,   392,   186,   185,
-     192,   195,   193,   201,   202,   205,   203,   204,   206,   207,
-     219,   220,   221,   222,   223,   243,   244,   245,   250,   251,
-     198,   252,   253,   256,   254,   255,   258,   259,   260,   273,
-     232,   233,   234,   235,   261,   276,   228,   230,   277,   283,
-     284,   285,   199,   242,   295,   296,   229,   290,   215,   194,
-     224,   274,   280,   262,     0,     0,   299,   200,   187,   214,
-     266,   188,   196,   197,   225,   226,   297,   264,   268,   269,
-     189,   300,   246,   272,   216,   231,   278,   279,   282,   289,
-     227,   293,   291,   292,   236,   241,   270,   271,   237,   238,
-     263,   286,   217,   218,   208,   209,   210,   211,   212,   301,
-     302,   303,   247,   248,   249,   257,   304,   305,     0,     0,
-       0,   265,   239,   394,   314,   318,   316,   315,   319,   317,
-       0,     0,   322,   323,   267,   281,   294,   324,   325,   240,
-     306,     0,     0,     0,     0,     0,     0,   287,   288,   395,
-     213,   190,   191,   326,   327,   328,   331,   330,   329,   332,
-     333,   334,   335,   336,   337,     0,   341,     0,     0,   342,
-     354,   356,   355,   358,   359,   360,   361,   357,   377,   378,
-     379,   380,   381,   382,   383,   384,   385,   386,   387,   388,
-     393,   275,   298,   313,   396,   397,   320,   321,   307,   308,
-       0,     0,     0,   312,   338,   339,   340,   311,   309,   310
+       0,    12,    14,    15,    74,    77,    86,   157,   158,    16,
+      25,    65,    17,    78,    79,    36,    58,    73,    18,    19,
+      21,    22,    20,    23,    24,   109,   110,   111,   112,   113,
+     153,    75,    64,    90,   107,   108,    26,    27,    28,    29,
+      30,    66,    80,    81,    96,    52,    62,    53,    91,    46,
+      47,    48,    49,   100,   104,   117,   125,   140,   101,    59,
+      31,    32,    33,    88,   118,   119,   120,    34,    35,    37,
+      38,    40,    41,    39,   123,    42,    43,    44,    50,    69,
+     105,    83,   124,    76,   136,    84,    85,   102,   103,    89,
+      45,    67,    70,    51,    54,    92,    93,    68,   137,    94,
+      55,    56,    57,   106,   150,   151,   159,    95,    63,    97,
+      98,    99,   138,    60,    61,    82,    71,    72,    87,   114,
+     115,   116,   121,   122,   141,   142,   144,   146,   147,   145,
+     148,   154,   126,   127,   130,   131,   128,   129,   132,   133,
+     135,   134,   139,   149,   143,   152,   155,   156,     0,     0,
+       0,     0,     0,     0,   161,   163,   164,   165,   167,   168,
+     166,     0,     0,     0,     0,     0,   170,   172,   173,   174,
+     175,   176,     0,     0,     0,     0,     0,     0,   178,   180,
+     181,   184,   185,   182,   183,     0,     0,     0,     0,     0,
+       0,     0,     0,   346,   348,   350,   349,   355,   351,   352,
+     353,   354,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   365,   367,   368,   369,   370,   371,
+     372,   373,   374,   375,   376,   377,   378,     0,   392,   394,
+     187,   186,   193,   196,   194,   202,   203,   206,   204,   205,
+     207,   208,   220,   221,   222,   223,   224,   244,   245,   246,
+     251,   252,   199,   253,   254,   257,   255,   256,   259,   260,
+     261,   274,   233,   234,   235,   236,   262,   277,   229,   231,
+     278,   284,   285,   286,   200,   243,   297,   298,   230,   292,
+     216,   195,   225,   275,   281,   263,     0,     0,   301,   201,
+     188,   215,   267,   189,   197,   198,   226,   227,   299,   265,
+     269,   270,   190,   302,   247,   273,   217,   232,   279,   280,
+     283,   291,   228,   295,   293,   294,   237,   242,   271,   272,
+     238,   239,   264,   287,   218,   219,   209,   210,   211,   212,
+     213,   303,   304,   305,   248,   249,   250,   258,   306,   307,
+       0,     0,     0,   266,   240,   396,   316,   320,   318,   317,
+     321,   319,     0,     0,   324,   325,   268,   282,   296,   326,
+     327,   241,   308,     0,     0,     0,     0,     0,     0,   288,
+     289,   290,   397,   214,   191,   192,   328,   329,   330,   333,
+     332,   331,   334,   335,   336,   337,   338,   339,     0,   343,
+       0,     0,   344,   356,   358,   357,   360,   361,   362,   363,
+     359,   379,   380,   381,   382,   383,   384,   385,   386,   387,
+     388,   389,   390,   395,   276,   300,   315,   398,   399,   322,
+     323,   309,   310,     0,     0,     0,   314,   340,   341,   342,
+     313,   311,   312
 };
 
   /* YYPGOTO[NTERM-NUM].  */
@@ -1252,33 +1257,33 @@ static const yytype_int16 yypgoto[] =
     -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
     -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
     -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132,
-    -132,  -132,  -132,  -132,  -132,  -132,  -132
+    -132,  -132,  -132,  -132,  -132,  -132,  -132,  -132
 };
 
   /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
-      -1,     1,    10,    11,    18,   170,    12,    19,   322,    13,
-      20,   334,    14,    21,   346,   171,   172,   173,   174,   175,
-     176,   177,   178,   179,   180,   181,   182,   183,   184,   185,
-     186,   187,   188,   189,   190,   191,   192,   193,   194,   195,
-     196,   197,   198,   199,   200,   201,   202,   203,   204,   205,
-     206,   207,   208,   209,   210,   211,   212,   213,   214,   215,
-     216,   217,   218,   219,   220,   221,   222,   223,   224,   225,
-     226,   227,   228,   229,   230,   231,   232,   233,   234,   235,
-     236,   237,   238,   239,   240,   241,   242,   243,   244,   245,
-     246,   247,   248,   249,   250,   251,   252,   253,   254,   255,
-     256,   257,   258,   259,   260,   261,   262,   263,   264,   265,
-     266,   267,   268,   269,   270,   271,   272,   273,   274,   275,
-     276,   277,   278,   279,   280,   281,   282,   283,   284,   285,
-     286,   287,   288,   289,   290,   291,   292,   293,   294,   295,
-     296,   297,   298,   299,   300,   301,   302,   303,   304,   305,
-     306,   307,   308,   309,   310,   311,   323,   324,   325,   326,
-     327,   328,   335,   336,   337,   338,   339,   347,   348,   349,
-     350,   351,   352,    15,    22,   361,   362,   363,   364,   365,
-     366,   367,   368,   369,    16,    23,   382,   383,   384,   385,
-     386,   387,   388,   389,   390,   391,   392,   393,   394,    17,
-      24,   396,   397,   312,   313,   314,   315
+      -1,     1,    10,    11,    18,   171,    12,    19,   324,    13,
+      20,   336,    14,    21,   348,   172,   173,   174,   175,   176,
+     177,   178,   179,   180,   181,   182,   183,   184,   185,   186,
+     187,   188,   189,   190,   191,   192,   193,   194,   195,   196,
+     197,   198,   199,   200,   201,   202,   203,   204,   205,   206,
+     207,   208,   209,   210,   211,   212,   213,   214,   215,   216,
+     217,   218,   219,   220,   221,   222,   223,   224,   225,   226,
+     227,   228,   229,   230,   231,   232,   233,   234,   235,   236,
+     237,   238,   239,   240,   241,   242,   243,   244,   245,   246,
+     247,   248,   249,   250,   251,   252,   253,   254,   255,   256,
+     257,   258,   259,   260,   261,   262,   263,   264,   265,   266,
+     267,   268,   269,   270,   271,   272,   273,   274,   275,   276,
+     277,   278,   279,   280,   281,   282,   283,   284,   285,   286,
+     287,   288,   289,   290,   291,   292,   293,   294,   295,   296,
+     297,   298,   299,   300,   301,   302,   303,   304,   305,   306,
+     307,   308,   309,   310,   311,   312,   313,   325,   326,   327,
+     328,   329,   330,   337,   338,   339,   340,   341,   349,   350,
+     351,   352,   353,   354,    15,    22,   363,   364,   365,   366,
+     367,   368,   369,   370,   371,    16,    23,   384,   385,   386,
+     387,   388,   389,   390,   391,   392,   393,   394,   395,   396,
+      17,    24,   398,   399,   314,   315,   316,   317
 };
 
   /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
@@ -1286,46 +1291,46 @@ static const yytype_int16 yydefgoto[] =
      number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const yytype_uint16 yytable[] =
 {
-       2,   316,   395,   317,   318,   329,   398,   399,   400,   401,
-       0,     3,   402,   330,   331,   370,   371,   372,   373,   374,
-     375,   376,   377,   378,   379,   380,   381,   353,   354,   355,
-     356,   357,   358,   359,   360,   403,   404,   405,   406,   407,
-     408,     4,   409,   410,   411,   412,   413,     5,   414,   415,
-     416,   417,   418,   419,   420,   421,   422,   423,   424,   425,
-     426,   427,   428,   429,   319,   430,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,   440,   441,   442,   443,   444,
-     445,   446,   447,   448,   449,   450,   451,   452,   453,   454,
-     455,     6,   456,   457,   320,   458,   321,   332,   459,   333,
-     460,   461,   462,   463,   464,   465,   466,     7,   467,   468,
-     469,   470,   471,   472,   473,   474,   475,   476,   477,   478,
-     479,   480,   481,   482,   483,   484,   485,   486,   487,   488,
-     489,   490,   491,   492,   493,   494,   495,   496,   497,   498,
-     499,   500,   501,   502,   503,     8,   504,     0,   505,    25,
+       2,   318,   397,   319,   320,   331,   400,   401,   402,   403,
+       0,     3,   404,   332,   333,   372,   373,   374,   375,   376,
+     377,   378,   379,   380,   381,   382,   383,   355,   356,   357,
+     358,   359,   360,   361,   362,   405,   406,   407,   408,   409,
+     410,     4,   411,   412,   413,   414,   415,     5,   416,   417,
+     418,   419,   420,   421,   422,   423,   424,   425,   426,   427,
+     428,   429,   430,   431,   321,   432,   433,   434,   435,   436,
+     437,   438,   439,   440,   441,   442,   443,   444,   445,   446,
+     447,   448,   449,   450,   451,   452,   453,   454,   455,   456,
+     457,     6,   458,   459,   322,   460,   323,   334,   461,   335,
+     462,   463,   464,   465,   466,   467,   468,     7,   469,   470,
+     471,   472,   473,   474,   475,   476,   477,   478,   479,   480,
+     481,   482,   483,   484,   485,   486,   487,   488,   489,   490,
+     491,   492,   493,   494,   495,   496,   497,   498,   499,   500,
+     501,   502,   503,   504,   505,     8,   506,     0,   507,    25,
       26,    27,    28,    29,    30,    31,    32,    33,    34,    35,
       36,    37,    38,    39,    40,    41,    42,    43,    44,    45,
-      46,    47,    48,    49,    50,    51,    52,   506,   507,   508,
-     509,    53,    54,    55,   510,   511,     9,    56,    57,    58,
+      46,    47,    48,    49,    50,    51,    52,   508,   509,   510,
+     511,    53,    54,    55,   512,   513,     9,    56,    57,    58,
       59,    60,    61,    62,    63,    64,    65,    66,    67,    68,
       69,    70,    71,    72,    73,    74,    75,    76,    77,    78,
       79,    80,    81,    82,    83,    84,    85,    86,    87,    88,
-      89,    90,    91,    92,    93,    94,    95,    96,   512,   513,
-     514,   515,   516,   340,   517,   518,   519,    97,    98,    99,
-     520,   100,   101,   102,   521,   522,   103,   104,   105,   106,
+      89,    90,    91,    92,    93,    94,    95,    96,   514,   515,
+     516,   517,   518,   342,   519,   520,   521,    97,    98,    99,
+     522,   100,   101,   102,   523,   524,   103,   104,   105,   106,
      107,   108,   109,   110,   111,   112,   113,   114,   115,   116,
-     117,   118,   119,   120,   121,   122,   123,   124,   125,   341,
-     342,   523,   524,   126,   127,   128,   129,   130,   131,   132,
-     133,   134,   525,   526,   527,   528,   529,   530,   531,   532,
-     533,   534,   535,   536,   537,   135,   136,   137,   138,   139,
+     117,   118,   119,   120,   121,   122,   123,   124,   125,   343,
+     344,   525,   526,   126,   127,   128,   129,   130,   131,   132,
+     133,   134,   527,   528,   529,   530,   531,   532,   533,   534,
+     535,   536,   537,   538,   539,   135,   136,   137,   138,   139,
      140,   141,   142,   143,   144,   145,   146,   147,   148,   149,
      150,   151,   152,   153,   154,   155,   156,   157,   158,   159,
-     160,   161,   162,   538,   163,   539,   164,   165,   166,   167,
-     168,   169,   540,   541,   542,   543,   544,   545,   546,   547,
-     548,   549,   550,   551,   552,   553,   554,   555,   556,   557,
-     558,   559,   343,   344,   560,   561,   562,   563,   564,   565,
-     566,   567,   568,   569,   570,   571,   572,   573,   574,   575,
-     576,   577,   578,   579,   580,   581,   582,   583,   584,   585,
-     586,   345,   587,   588,   589,   590,   591,   592,   593,   594,
-     595,   596,   597,   598,   599
+     160,   161,   162,   540,   163,   541,   164,   165,   166,   167,
+     168,   169,   170,   542,   543,   544,   545,   546,   547,   548,
+     549,   550,   551,   552,   553,   554,   555,   556,   557,   558,
+     559,   560,   345,   346,   561,   562,   563,   564,   565,   566,
+     567,   568,   569,   570,   571,   572,   573,   574,   575,   576,
+     577,   578,   579,   580,   581,   582,   583,   584,   585,   586,
+     587,   347,   588,   589,   590,   591,   592,   593,   594,   595,
+     596,   597,   598,   599,   600,   601,   602
 };
 
 static const yytype_int16 yycheck[] =
@@ -1363,22 +1368,22 @@ static const yytype_int16 yycheck[] =
      163,   164,   165,   166,   167,   168,   169,   170,   171,   172,
      173,   174,   175,   176,   177,   178,   179,   180,   181,   182,
      183,   184,   185,    10,   187,    10,   189,   190,   191,   192,
-     193,   194,    10,    10,    10,    10,    10,    10,    10,    10,
+     193,   194,   195,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,   159,   160,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,   188,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,    10,    10,    10,    10
+      10,    10,    10,    10,    10,    10,    10
 };
 
   /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
      symbol of state STATE-NUM.  */
 static const yytype_uint16 yystos[] =
 {
-       0,   196,     0,    11,    41,    47,    91,   107,   145,   186,
-     197,   198,   201,   204,   207,   368,   379,   394,   199,   202,
-     205,   208,   369,   380,   395,    12,    13,    14,    15,    16,
+       0,   197,     0,    11,    41,    47,    91,   107,   145,   186,
+     198,   199,   202,   205,   208,   370,   381,   396,   200,   203,
+     206,   209,   371,   382,   397,    12,    13,    14,    15,    16,
       17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
       27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
       37,    38,    39,    44,    45,    46,    50,    51,    52,    53,
@@ -1393,7 +1398,7 @@ static const yytype_uint16 yystos[] =
      163,   164,   165,   166,   167,   168,   169,   170,   171,   172,
      173,   174,   175,   176,   177,   178,   179,   180,   181,   182,
      183,   184,   185,   187,   189,   190,   191,   192,   193,   194,
-     200,   210,   211,   212,   213,   214,   215,   216,   217,   218,
+     195,   201,   211,   212,   213,   214,   215,   216,   217,   218,
      219,   220,   221,   222,   223,   224,   225,   226,   227,   228,
      229,   230,   231,   232,   233,   234,   235,   236,   237,   238,
      239,   240,   241,   242,   243,   244,   245,   246,   247,   248,
@@ -1407,15 +1412,16 @@ static const yytype_uint16 yystos[] =
      319,   320,   321,   322,   323,   324,   325,   326,   327,   328,
      329,   330,   331,   332,   333,   334,   335,   336,   337,   338,
      339,   340,   341,   342,   343,   344,   345,   346,   347,   348,
-     349,   350,   398,   399,   400,   401,    40,    42,    43,   103,
-     133,   135,   203,   351,   352,   353,   354,   355,   356,    40,
-      48,    49,   132,   134,   206,   357,   358,   359,   360,   361,
-      40,    76,    77,   159,   160,   188,   209,   362,   363,   364,
-     365,   366,   367,    92,    93,    94,    95,    96,    97,    98,
-      99,   370,   371,   372,   373,   374,   375,   376,   377,   378,
-     146,   147,   148,   149,   150,   151,   152,   153,   154,   155,
-     156,   157,   381,   382,   383,   384,   385,   386,   387,   388,
-     389,   390,   391,   392,   393,   108,   396,   397,    10,    10,
+     349,   350,   351,   352,   400,   401,   402,   403,    40,    42,
+      43,   103,   133,   135,   204,   353,   354,   355,   356,   357,
+     358,    40,    48,    49,   132,   134,   207,   359,   360,   361,
+     362,   363,    40,    76,    77,   159,   160,   188,   210,   364,
+     365,   366,   367,   368,   369,    92,    93,    94,    95,    96,
+      97,    98,    99,   372,   373,   374,   375,   376,   377,   378,
+     379,   380,   146,   147,   148,   149,   150,   151,   152,   153,
+     154,   155,   156,   157,   383,   384,   385,   386,   387,   388,
+     389,   390,   391,   392,   393,   394,   395,   108,   398,   399,
+      10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
@@ -1435,31 +1441,31 @@ static const yytype_uint16 yystos[] =
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,    10,    10,    10,    10,    10,    10,    10,    10,    10
+      10,    10,    10
 };
 
   /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_uint16 yyr1[] =
 {
-       0,   195,   196,   196,   197,   197,   197,   197,   197,   197,
-     197,   198,   199,   199,   200,   200,   200,   200,   200,   200,
-     200,   200,   200,   200,   200,   200,   200,   200,   200,   200,
-     200,   200,   200,   200,   200,   200,   200,   200,   200,   200,
-     200,   200,   200,   200,   200,   200,   200,   200,   200,   200,
-     200,   200,   200,   200,   200,   200,   200,   200,   200,   200,
-     200,   200,   200,   200,   200,   200,   200,   200,   200,   200,
-     200,   200,   200,   200,   200,   200,   200,   200,   200,   200,
-     200,   200,   200,   200,   200,   200,   200,   200,   200,   200,
-     200,   200,   200,   200,   200,   200,   200,   200,   200,   200,
-     200,   200,   200,   200,   200,   200,   200,   200,   200,   200,
-     200,   200,   200,   200,   200,   200,   200,   200,   200,   200,
-     200,   200,   200,   200,   200,   200,   200,   200,   200,   200,
-     200,   200,   200,   200,   200,   200,   200,   200,   200,   200,
-     200,   200,   200,   200,   200,   200,   200,   200,   200,   200,
-     200,   200,   200,   200,   200,   200,   200,   200,   200,   201,
-     202,   202,   203,   203,   203,   203,   203,   203,   204,   205,
-     205,   206,   206,   206,   206,   206,   207,   208,   208,   209,
-     209,   209,   209,   209,   209,   210,   211,   212,   213,   214,
+       0,   196,   197,   197,   198,   198,   198,   198,   198,   198,
+     198,   199,   200,   200,   201,   201,   201,   201,   201,   201,
+     201,   201,   201,   201,   201,   201,   201,   201,   201,   201,
+     201,   201,   201,   201,   201,   201,   201,   201,   201,   201,
+     201,   201,   201,   201,   201,   201,   201,   201,   201,   201,
+     201,   201,   201,   201,   201,   201,   201,   201,   201,   201,
+     201,   201,   201,   201,   201,   201,   201,   201,   201,   201,
+     201,   201,   201,   201,   201,   201,   201,   201,   201,   201,
+     201,   201,   201,   201,   201,   201,   201,   201,   201,   201,
+     201,   201,   201,   201,   201,   201,   201,   201,   201,   201,
+     201,   201,   201,   201,   201,   201,   201,   201,   201,   201,
+     201,   201,   201,   201,   201,   201,   201,   201,   201,   201,
+     201,   201,   201,   201,   201,   201,   201,   201,   201,   201,
+     201,   201,   201,   201,   201,   201,   201,   201,   201,   201,
+     201,   201,   201,   201,   201,   201,   201,   201,   201,   201,
+     201,   201,   201,   201,   201,   201,   201,   201,   201,   201,
+     202,   203,   203,   204,   204,   204,   204,   204,   204,   205,
+     206,   206,   207,   207,   207,   207,   207,   208,   209,   209,
+     210,   210,   210,   210,   210,   210,   211,   212,   213,   214,
      215,   216,   217,   218,   219,   220,   221,   222,   223,   224,
      225,   226,   227,   228,   229,   230,   231,   232,   233,   234,
      235,   236,   237,   238,   239,   240,   241,   242,   243,   244,
@@ -1475,12 +1481,12 @@ static const yytype_uint16 yyr1[] =
      335,   336,   337,   338,   339,   340,   341,   342,   343,   344,
      345,   346,   347,   348,   349,   350,   351,   352,   353,   354,
      355,   356,   357,   358,   359,   360,   361,   362,   363,   364,
-     365,   366,   367,   368,   369,   369,   370,   370,   370,   370,
-     370,   370,   370,   370,   371,   372,   373,   374,   375,   376,
-     377,   378,   379,   380,   380,   381,   381,   381,   381,   381,
-     381,   381,   381,   381,   381,   381,   381,   382,   383,   384,
+     365,   366,   367,   368,   369,   370,   371,   371,   372,   372,
+     372,   372,   372,   372,   372,   372,   373,   374,   375,   376,
+     377,   378,   379,   380,   381,   382,   382,   383,   383,   383,
+     383,   383,   383,   383,   383,   383,   383,   383,   383,   384,
      385,   386,   387,   388,   389,   390,   391,   392,   393,   394,
-     395,   395,   396,   397,   398,   399,   400,   401
+     395,   396,   397,   397,   398,   399,   400,   401,   402,   403
 };
 
   /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
@@ -1502,30 +1508,30 @@ static const yytype_uint8 yyr2[] =
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       2,     0,     1,     1,     1,     1,     1,     1,     1,     2,
-       0,     1,     1,     1,     1,     1,     1,     2,     0,     1,
-       1,     1,     1,     1,     1,     2,     2,     2,     2,     2,
+       1,     2,     0,     1,     1,     1,     1,     1,     1,     1,
+       2,     0,     1,     1,     1,     1,     1,     1,     2,     0,
+       1,     1,     1,     1,     1,     1,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     3,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       3,     2,     2,     2,     2,     2,     2,     2,     2,     3,
+       3,     4,     4,     4,     3,     3,     2,     2,     2,     2,
+       2,     2,     3,     3,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     3,     2,     2,     2,     2,
+       3,     3,     3,     2,     2,     1,     2,     0,     1,     1,
+       1,     1,     1,     1,     1,     1,     2,     2,     2,     2,
+       2,     2,     2,     2,     1,     2,     0,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     3,     2,
-       2,     2,     2,     2,     2,     2,     2,     3,     3,     4,
-       4,     4,     3,     3,     2,     2,     2,     2,     2,     2,
-       3,     3,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     3,     3,
-       3,     2,     2,     1,     2,     0,     1,     1,     1,     1,
-       1,     1,     1,     1,     2,     2,     2,     2,     2,     2,
-       2,     2,     1,     2,     0,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     1,
-       2,     0,     1,     2,     2,     2,     3,     3
+       2,     1,     2,     0,     1,     2,     2,     2,     3,     3
 };
 
 
@@ -2206,10 +2212,10 @@ yyreduce:
     { 
                OUTYY(("\nP(server:)\n")); 
        }
-#line 2210 "util/configparser.c" /* yacc.c:1646  */
+#line 2216 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 159:
+  case 160:
 #line 224 "./util/configparser.y" /* yacc.c:1646  */
     {
                struct config_stub* s;
@@ -2221,10 +2227,10 @@ yyreduce:
                } else 
                        yyerror("out of memory");
        }
-#line 2225 "util/configparser.c" /* yacc.c:1646  */
+#line 2231 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 168:
+  case 169:
 #line 241 "./util/configparser.y" /* yacc.c:1646  */
     {
                struct config_stub* s;
@@ -2236,10 +2242,10 @@ yyreduce:
                } else 
                        yyerror("out of memory");
        }
-#line 2240 "util/configparser.c" /* yacc.c:1646  */
+#line 2246 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 176:
+  case 177:
 #line 258 "./util/configparser.y" /* yacc.c:1646  */
     {
                struct config_view* s;
@@ -2253,10 +2259,10 @@ yyreduce:
                } else 
                        yyerror("out of memory");
        }
-#line 2257 "util/configparser.c" /* yacc.c:1646  */
+#line 2263 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 185:
+  case 186:
 #line 277 "./util/configparser.y" /* yacc.c:1646  */
     { 
                OUTYY(("P(server_num_threads:%s)\n", (yyvsp[0].str))); 
@@ -2265,10 +2271,10 @@ yyreduce:
                else cfg_parser->cfg->num_threads = atoi((yyvsp[0].str));
                free((yyvsp[0].str));
        }
-#line 2269 "util/configparser.c" /* yacc.c:1646  */
+#line 2275 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 186:
+  case 187:
 #line 286 "./util/configparser.y" /* yacc.c:1646  */
     { 
                OUTYY(("P(server_verbosity:%s)\n", (yyvsp[0].str))); 
@@ -2277,10 +2283,10 @@ yyreduce:
                else cfg_parser->cfg->verbosity = atoi((yyvsp[0].str));
                free((yyvsp[0].str));
        }
-#line 2281 "util/configparser.c" /* yacc.c:1646  */
+#line 2287 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 187:
+  case 188:
 #line 295 "./util/configparser.y" /* yacc.c:1646  */
     { 
                OUTYY(("P(server_statistics_interval:%s)\n", (yyvsp[0].str))); 
@@ -2291,10 +2297,10 @@ yyreduce:
                else cfg_parser->cfg->stat_interval = atoi((yyvsp[0].str));
                free((yyvsp[0].str));
        }
-#line 2295 "util/configparser.c" /* yacc.c:1646  */
+#line 2301 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 188:
+  case 189:
 #line 306 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_statistics_cumulative:%s)\n", (yyvsp[0].str)));
@@ -2303,10 +2309,10 @@ yyreduce:
                else cfg_parser->cfg->stat_cumulative = (strcmp((yyvsp[0].str), "yes")==0);
                free((yyvsp[0].str));
        }
-#line 2307 "util/configparser.c" /* yacc.c:1646  */
+#line 2313 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 189:
+  case 190:
 #line 315 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_extended_statistics:%s)\n", (yyvsp[0].str)));
@@ -2315,10 +2321,10 @@ yyreduce:
                else cfg_parser->cfg->stat_extended = (strcmp((yyvsp[0].str), "yes")==0);
                free((yyvsp[0].str));
        }
-#line 2319 "util/configparser.c" /* yacc.c:1646  */
+#line 2325 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 190:
+  case 191:
 #line 324 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_shm_enable:%s)\n", (yyvsp[0].str)));
@@ -2327,10 +2333,10 @@ yyreduce:
                else cfg_parser->cfg->shm_enable = (strcmp((yyvsp[0].str), "yes")==0);
                free((yyvsp[0].str));
        }
-#line 2331 "util/configparser.c" /* yacc.c:1646  */
+#line 2337 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 191:
+  case 192:
 #line 333 "./util/configparser.y" /* yacc.c:1646  */
     { 
                OUTYY(("P(server_shm_key:%s)\n", (yyvsp[0].str))); 
@@ -2341,10 +2347,10 @@ yyreduce:
                else cfg_parser->cfg->shm_key = atoi((yyvsp[0].str));
                free((yyvsp[0].str));
        }
-#line 2345 "util/configparser.c" /* yacc.c:1646  */
+#line 2351 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 192:
+  case 193:
 #line 344 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_port:%s)\n", (yyvsp[0].str)));
@@ -2353,10 +2359,10 @@ yyreduce:
                else cfg_parser->cfg->port = atoi((yyvsp[0].str));
                free((yyvsp[0].str));
        }
-#line 2357 "util/configparser.c" /* yacc.c:1646  */
+#line 2363 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 193:
+  case 194:
 #line 353 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_interface:%s)\n", (yyvsp[0].str)));
@@ -2369,10 +2375,10 @@ yyreduce:
                else
                        cfg_parser->cfg->ifs[cfg_parser->cfg->num_ifs++] = (yyvsp[0].str);
        }
-#line 2373 "util/configparser.c" /* yacc.c:1646  */
+#line 2379 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 194:
+  case 195:
 #line 366 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_outgoing_interface:%s)\n", (yyvsp[0].str)));
@@ -2387,10 +2393,10 @@ yyreduce:
                        cfg_parser->cfg->out_ifs[
                                cfg_parser->cfg->num_out_ifs++] = (yyvsp[0].str);
        }
-#line 2391 "util/configparser.c" /* yacc.c:1646  */
+#line 2397 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 195:
+  case 196:
 #line 381 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_outgoing_range:%s)\n", (yyvsp[0].str)));
@@ -2399,10 +2405,10 @@ yyreduce:
                else cfg_parser->cfg->outgoing_num_ports = atoi((yyvsp[0].str));
                free((yyvsp[0].str));
        }
-#line 2403 "util/configparser.c" /* yacc.c:1646  */
+#line 2409 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 196:
+  case 197:
 #line 390 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_outgoing_port_permit:%s)\n", (yyvsp[0].str)));
@@ -2411,10 +2417,10 @@ yyreduce:
                        yyerror("port number or range (\"low-high\") expected");
                free((yyvsp[0].str));
        }
-#line 2415 "util/configparser.c" /* yacc.c:1646  */
+#line 2421 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 197:
+  case 198:
 #line 399 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_outgoing_port_avoid:%s)\n", (yyvsp[0].str)));
@@ -2423,10 +2429,10 @@ yyreduce:
                        yyerror("port number or range (\"low-high\") expected");
                free((yyvsp[0].str));
        }
-#line 2427 "util/configparser.c" /* yacc.c:1646  */
+#line 2433 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 198:
+  case 199:
 #line 408 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_outgoing_num_tcp:%s)\n", (yyvsp[0].str)));
@@ -2435,10 +2441,10 @@ yyreduce:
                else cfg_parser->cfg->outgoing_num_tcp = atoi((yyvsp[0].str));
                free((yyvsp[0].str));
        }
-#line 2439 "util/configparser.c" /* yacc.c:1646  */
+#line 2445 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 199:
+  case 200:
 #line 417 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_incoming_num_tcp:%s)\n", (yyvsp[0].str)));
@@ -2447,10 +2453,10 @@ yyreduce:
                else cfg_parser->cfg->incoming_num_tcp = atoi((yyvsp[0].str));
                free((yyvsp[0].str));
        }
-#line 2451 "util/configparser.c" /* yacc.c:1646  */
+#line 2457 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 200:
+  case 201:
 #line 426 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_interface_automatic:%s)\n", (yyvsp[0].str)));
@@ -2459,10 +2465,10 @@ yyreduce:
                else cfg_parser->cfg->if_automatic = (strcmp((yyvsp[0].str), "yes")==0);
                free((yyvsp[0].str));
        }
-#line 2463 "util/configparser.c" /* yacc.c:1646  */
+#line 2469 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 201:
+  case 202:
 #line 435 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_do_ip4:%s)\n", (yyvsp[0].str)));
@@ -2471,10 +2477,10 @@ yyreduce:
                else cfg_parser->cfg->do_ip4 = (strcmp((yyvsp[0].str), "yes")==0);
                free((yyvsp[0].str));
        }
-#line 2475 "util/configparser.c" /* yacc.c:1646  */
+#line 2481 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 202:
+  case 203:
 #line 444 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_do_ip6:%s)\n", (yyvsp[0].str)));
@@ -2483,10 +2489,10 @@ yyreduce:
                else cfg_parser->cfg->do_ip6 = (strcmp((yyvsp[0].str), "yes")==0);
                free((yyvsp[0].str));
        }
-#line 2487 "util/configparser.c" /* yacc.c:1646  */
+#line 2493 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 203:
+  case 204:
 #line 453 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_do_udp:%s)\n", (yyvsp[0].str)));
@@ -2495,10 +2501,10 @@ yyreduce:
                else cfg_parser->cfg->do_udp = (strcmp((yyvsp[0].str), "yes")==0);
                free((yyvsp[0].str));
        }
-#line 2499 "util/configparser.c" /* yacc.c:1646  */
+#line 2505 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 204:
+  case 205:
 #line 462 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_do_tcp:%s)\n", (yyvsp[0].str)));
@@ -2507,10 +2513,10 @@ yyreduce:
                else cfg_parser->cfg->do_tcp = (strcmp((yyvsp[0].str), "yes")==0);
                free((yyvsp[0].str));
        }
-#line 2511 "util/configparser.c" /* yacc.c:1646  */
+#line 2517 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 205:
+  case 206:
 #line 471 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_prefer_ip6:%s)\n", (yyvsp[0].str)));
@@ -2519,10 +2525,10 @@ yyreduce:
                else cfg_parser->cfg->prefer_ip6 = (strcmp((yyvsp[0].str), "yes")==0);
                free((yyvsp[0].str));
        }
-#line 2523 "util/configparser.c" /* yacc.c:1646  */
+#line 2529 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 206:
+  case 207:
 #line 480 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_tcp_mss:%s)\n", (yyvsp[0].str)));
@@ -2531,10 +2537,10 @@ yyreduce:
                 else cfg_parser->cfg->tcp_mss = atoi((yyvsp[0].str));
                 free((yyvsp[0].str));
        }
-#line 2535 "util/configparser.c" /* yacc.c:1646  */
+#line 2541 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 207:
+  case 208:
 #line 489 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_outgoing_tcp_mss:%s)\n", (yyvsp[0].str)));
@@ -2543,10 +2549,10 @@ yyreduce:
                else cfg_parser->cfg->outgoing_tcp_mss = atoi((yyvsp[0].str));
                free((yyvsp[0].str));
        }
-#line 2547 "util/configparser.c" /* yacc.c:1646  */
+#line 2553 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 208:
+  case 209:
 #line 498 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_tcp_upstream:%s)\n", (yyvsp[0].str)));
@@ -2555,10 +2561,10 @@ yyreduce:
                else cfg_parser->cfg->tcp_upstream = (strcmp((yyvsp[0].str), "yes")==0);
                free((yyvsp[0].str));
        }
-#line 2559 "util/configparser.c" /* yacc.c:1646  */
+#line 2565 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 209:
+  case 210:
 #line 507 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_ssl_upstream:%s)\n", (yyvsp[0].str)));
@@ -2567,30 +2573,30 @@ yyreduce:
                else cfg_parser->cfg->ssl_upstream = (strcmp((yyvsp[0].str), "yes")==0);
                free((yyvsp[0].str));
        }
-#line 2571 "util/configparser.c" /* yacc.c:1646  */
+#line 2577 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 210:
+  case 211:
 #line 516 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_ssl_service_key:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->ssl_service_key);
                cfg_parser->cfg->ssl_service_key = (yyvsp[0].str);
        }
-#line 2581 "util/configparser.c" /* yacc.c:1646  */
+#line 2587 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 211:
+  case 212:
 #line 523 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_ssl_service_pem:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->ssl_service_pem);
                cfg_parser->cfg->ssl_service_pem = (yyvsp[0].str);
        }
-#line 2591 "util/configparser.c" /* yacc.c:1646  */
+#line 2597 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 212:
+  case 213:
 #line 530 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_ssl_port:%s)\n", (yyvsp[0].str)));
@@ -2599,10 +2605,10 @@ yyreduce:
                else cfg_parser->cfg->ssl_port = atoi((yyvsp[0].str));
                free((yyvsp[0].str));
        }
-#line 2603 "util/configparser.c" /* yacc.c:1646  */
+#line 2609 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 213:
+  case 214:
 #line 539 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_use_systemd:%s)\n", (yyvsp[0].str)));
@@ -2611,10 +2617,10 @@ yyreduce:
                else cfg_parser->cfg->use_systemd = (strcmp((yyvsp[0].str), "yes")==0);
                free((yyvsp[0].str));
        }
-#line 2615 "util/configparser.c" /* yacc.c:1646  */
+#line 2621 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 214:
+  case 215:
 #line 548 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_do_daemonize:%s)\n", (yyvsp[0].str)));
@@ -2623,10 +2629,10 @@ yyreduce:
                else cfg_parser->cfg->do_daemonize = (strcmp((yyvsp[0].str), "yes")==0);
                free((yyvsp[0].str));
        }
-#line 2627 "util/configparser.c" /* yacc.c:1646  */
+#line 2633 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 215:
+  case 216:
 #line 557 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_use_syslog:%s)\n", (yyvsp[0].str)));
@@ -2640,10 +2646,10 @@ yyreduce:
 #endif
                free((yyvsp[0].str));
        }
-#line 2644 "util/configparser.c" /* yacc.c:1646  */
+#line 2650 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 216:
+  case 217:
 #line 571 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_log_time_ascii:%s)\n", (yyvsp[0].str)));
@@ -2652,10 +2658,10 @@ yyreduce:
                else cfg_parser->cfg->log_time_ascii = (strcmp((yyvsp[0].str), "yes")==0);
                free((yyvsp[0].str));
        }
-#line 2656 "util/configparser.c" /* yacc.c:1646  */
+#line 2662 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 217:
+  case 218:
 #line 580 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_log_queries:%s)\n", (yyvsp[0].str)));
@@ -2664,10 +2670,10 @@ yyreduce:
                else cfg_parser->cfg->log_queries = (strcmp((yyvsp[0].str), "yes")==0);
                free((yyvsp[0].str));
        }
-#line 2668 "util/configparser.c" /* yacc.c:1646  */
+#line 2674 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 218:
+  case 219:
 #line 589 "./util/configparser.y" /* yacc.c:1646  */
     {
        OUTYY(("P(server_log_replies:%s)\n", (yyvsp[0].str)));
@@ -2676,30 +2682,30 @@ yyreduce:
        else cfg_parser->cfg->log_replies = (strcmp((yyvsp[0].str), "yes")==0);
        free((yyvsp[0].str));
   }
-#line 2680 "util/configparser.c" /* yacc.c:1646  */
+#line 2686 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 219:
+  case 220:
 #line 598 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_chroot:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->chrootdir);
                cfg_parser->cfg->chrootdir = (yyvsp[0].str);
        }
-#line 2690 "util/configparser.c" /* yacc.c:1646  */
+#line 2696 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 220:
+  case 221:
 #line 605 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_username:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->username);
                cfg_parser->cfg->username = (yyvsp[0].str);
        }
-#line 2700 "util/configparser.c" /* yacc.c:1646  */
+#line 2706 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 221:
+  case 222:
 #line 612 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_directory:%s)\n", (yyvsp[0].str)));
@@ -2725,10 +2731,10 @@ yyreduce:
                        }
                }
        }
-#line 2729 "util/configparser.c" /* yacc.c:1646  */
+#line 2735 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 222:
+  case 223:
 #line 638 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_logfile:%s)\n", (yyvsp[0].str)));
@@ -2736,50 +2742,50 @@ yyreduce:
                cfg_parser->cfg->logfile = (yyvsp[0].str);
                cfg_parser->cfg->use_syslog = 0;
        }
-#line 2740 "util/configparser.c" /* yacc.c:1646  */
+#line 2746 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 223:
+  case 224:
 #line 646 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_pidfile:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->pidfile);
                cfg_parser->cfg->pidfile = (yyvsp[0].str);
        }
-#line 2750 "util/configparser.c" /* yacc.c:1646  */
+#line 2756 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 224:
+  case 225:
 #line 653 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_root_hints:%s)\n", (yyvsp[0].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->root_hints, (yyvsp[0].str)))
                        yyerror("out of memory");
        }
-#line 2760 "util/configparser.c" /* yacc.c:1646  */
+#line 2766 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 225:
+  case 226:
 #line 660 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_dlv_anchor_file:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->dlv_anchor_file);
                cfg_parser->cfg->dlv_anchor_file = (yyvsp[0].str);
        }
-#line 2770 "util/configparser.c" /* yacc.c:1646  */
+#line 2776 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 226:
+  case 227:
 #line 667 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_dlv_anchor:%s)\n", (yyvsp[0].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->dlv_anchor_list, (yyvsp[0].str)))
                        yyerror("out of memory");
        }
-#line 2780 "util/configparser.c" /* yacc.c:1646  */
+#line 2786 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 227:
+  case 228:
 #line 674 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_auto_trust_anchor_file:%s)\n", (yyvsp[0].str)));
@@ -2787,10 +2793,10 @@ yyreduce:
                        auto_trust_anchor_file_list, (yyvsp[0].str)))
                        yyerror("out of memory");
        }
-#line 2791 "util/configparser.c" /* yacc.c:1646  */
+#line 2797 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 228:
+  case 229:
 #line 682 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_trust_anchor_file:%s)\n", (yyvsp[0].str)));
@@ -2798,10 +2804,10 @@ yyreduce:
                        trust_anchor_file_list, (yyvsp[0].str)))
                        yyerror("out of memory");
        }
-#line 2802 "util/configparser.c" /* yacc.c:1646  */
+#line 2808 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 229:
+  case 230:
 #line 690 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_trusted_keys_file:%s)\n", (yyvsp[0].str)));
@@ -2809,30 +2815,30 @@ yyreduce:
                        trusted_keys_file_list, (yyvsp[0].str)))
                        yyerror("out of memory");
        }
-#line 2813 "util/configparser.c" /* yacc.c:1646  */
+#line 2819 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 230:
+  case 231:
 #line 698 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_trust_anchor:%s)\n", (yyvsp[0].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->trust_anchor_list, (yyvsp[0].str)))
                        yyerror("out of memory");
        }
-#line 2823 "util/configparser.c" /* yacc.c:1646  */
+#line 2829 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 231:
+  case 232:
 #line 705 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_domain_insecure:%s)\n", (yyvsp[0].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->domain_insecure, (yyvsp[0].str)))
                        yyerror("out of memory");
        }
-#line 2833 "util/configparser.c" /* yacc.c:1646  */
+#line 2839 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 232:
+  case 233:
 #line 712 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_hide_identity:%s)\n", (yyvsp[0].str)));
@@ -2841,10 +2847,10 @@ yyreduce:
                else cfg_parser->cfg->hide_identity = (strcmp((yyvsp[0].str), "yes")==0);
                free((yyvsp[0].str));
        }
-#line 2845 "util/configparser.c" /* yacc.c:1646  */
+#line 2851 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 233:
+  case 234:
 #line 721 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_hide_version:%s)\n", (yyvsp[0].str)));
@@ -2853,30 +2859,30 @@ yyreduce:
                else cfg_parser->cfg->hide_version = (strcmp((yyvsp[0].str), "yes")==0);
                free((yyvsp[0].str));
        }
-#line 2857 "util/configparser.c" /* yacc.c:1646  */
+#line 2863 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 234:
+  case 235:
 #line 730 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_identity:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->identity);
                cfg_parser->cfg->identity = (yyvsp[0].str);
        }
-#line 2867 "util/configparser.c" /* yacc.c:1646  */
+#line 2873 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 235:
+  case 236:
 #line 737 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_version:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->version);
                cfg_parser->cfg->version = (yyvsp[0].str);
        }
-#line 2877 "util/configparser.c" /* yacc.c:1646  */
+#line 2883 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 236:
+  case 237:
 #line 744 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_so_rcvbuf:%s)\n", (yyvsp[0].str)));
@@ -2884,10 +2890,10 @@ yyreduce:
                        yyerror("buffer size expected");
                free((yyvsp[0].str));
        }
-#line 2888 "util/configparser.c" /* yacc.c:1646  */
+#line 2894 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 237:
+  case 238:
 #line 752 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_so_sndbuf:%s)\n", (yyvsp[0].str)));
@@ -2895,10 +2901,10 @@ yyreduce:
                        yyerror("buffer size expected");
                free((yyvsp[0].str));
        }
-#line 2899 "util/configparser.c" /* yacc.c:1646  */
+#line 2905 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 238:
+  case 239:
 #line 760 "./util/configparser.y" /* yacc.c:1646  */
     {
         OUTYY(("P(server_so_reuseport:%s)\n", (yyvsp[0].str)));
@@ -2908,10 +2914,10 @@ yyreduce:
             (strcmp((yyvsp[0].str), "yes")==0);
         free((yyvsp[0].str));
     }
-#line 2912 "util/configparser.c" /* yacc.c:1646  */
+#line 2918 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 239:
+  case 240:
 #line 770 "./util/configparser.y" /* yacc.c:1646  */
     {
         OUTYY(("P(server_ip_transparent:%s)\n", (yyvsp[0].str)));
@@ -2921,10 +2927,10 @@ yyreduce:
             (strcmp((yyvsp[0].str), "yes")==0);
         free((yyvsp[0].str));
     }
-#line 2925 "util/configparser.c" /* yacc.c:1646  */
+#line 2931 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 240:
+  case 241:
 #line 780 "./util/configparser.y" /* yacc.c:1646  */
     {
         OUTYY(("P(server_ip_freebind:%s)\n", (yyvsp[0].str)));
@@ -2934,10 +2940,10 @@ yyreduce:
             (strcmp((yyvsp[0].str), "yes")==0);
         free((yyvsp[0].str));
     }
-#line 2938 "util/configparser.c" /* yacc.c:1646  */
+#line 2944 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 241:
+  case 242:
 #line 790 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_edns_buffer_size:%s)\n", (yyvsp[0].str)));
@@ -2950,10 +2956,10 @@ yyreduce:
                else cfg_parser->cfg->edns_buffer_size = atoi((yyvsp[0].str));
                free((yyvsp[0].str));
        }
-#line 2954 "util/configparser.c" /* yacc.c:1646  */
+#line 2960 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 242:
+  case 243:
 #line 803 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_msg_buffer_size:%s)\n", (yyvsp[0].str)));
@@ -2964,10 +2970,10 @@ yyreduce:
                else cfg_parser->cfg->msg_buffer_size = atoi((yyvsp[0].str));
                free((yyvsp[0].str));
        }
-#line 2968 "util/configparser.c" /* yacc.c:1646  */
+#line 2974 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 243:
+  case 244:
 #line 814 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_msg_cache_size:%s)\n", (yyvsp[0].str)));
@@ -2975,10 +2981,10 @@ yyreduce:
                        yyerror("memory size expected");
                free((yyvsp[0].str));
        }
-#line 2979 "util/configparser.c" /* yacc.c:1646  */
+#line 2985 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 244:
+  case 245:
 #line 822 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_msg_cache_slabs:%s)\n", (yyvsp[0].str)));
@@ -2991,10 +2997,10 @@ yyreduce:
                }
                free((yyvsp[0].str));
        }
-#line 2995 "util/configparser.c" /* yacc.c:1646  */
+#line 3001 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 245:
+  case 246:
 #line 835 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_num_queries_per_thread:%s)\n", (yyvsp[0].str)));
@@ -3003,10 +3009,10 @@ yyreduce:
                else cfg_parser->cfg->num_queries_per_thread = atoi((yyvsp[0].str));
                free((yyvsp[0].str));
        }
-#line 3007 "util/configparser.c" /* yacc.c:1646  */
+#line 3013 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 246:
+  case 247:
 #line 844 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_jostle_timeout:%s)\n", (yyvsp[0].str)));
@@ -3015,10 +3021,10 @@ yyreduce:
                else cfg_parser->cfg->jostle_time = atoi((yyvsp[0].str));
                free((yyvsp[0].str));
        }
-#line 3019 "util/configparser.c" /* yacc.c:1646  */
+#line 3025 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 247:
+  case 248:
 #line 853 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_delay_close:%s)\n", (yyvsp[0].str)));
@@ -3027,10 +3033,10 @@ yyreduce:
                else cfg_parser->cfg->delay_close = atoi((yyvsp[0].str));
                free((yyvsp[0].str));
        }
-#line 3031 "util/configparser.c" /* yacc.c:1646  */
+#line 3037 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 248:
+  case 249:
 #line 862 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_unblock_lan_zones:%s)\n", (yyvsp[0].str)));
@@ -3040,10 +3046,10 @@ yyreduce:
                        (strcmp((yyvsp[0].str), "yes")==0);
                free((yyvsp[0].str));
        }
-#line 3044 "util/configparser.c" /* yacc.c:1646  */
+#line 3050 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 249:
+  case 250:
 #line 872 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_insecure_lan_zones:%s)\n", (yyvsp[0].str)));
@@ -3053,10 +3059,10 @@ yyreduce:
                        (strcmp((yyvsp[0].str), "yes")==0);
                free((yyvsp[0].str));
        }
-#line 3057 "util/configparser.c" /* yacc.c:1646  */
+#line 3063 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 250:
+  case 251:
 #line 882 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_rrset_cache_size:%s)\n", (yyvsp[0].str)));
@@ -3064,10 +3070,10 @@ yyreduce:
                        yyerror("memory size expected");
                free((yyvsp[0].str));
        }
-#line 3068 "util/configparser.c" /* yacc.c:1646  */
+#line 3074 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 251:
+  case 252:
 #line 890 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_rrset_cache_slabs:%s)\n", (yyvsp[0].str)));
@@ -3080,10 +3086,10 @@ yyreduce:
                }
                free((yyvsp[0].str));
        }
-#line 3084 "util/configparser.c" /* yacc.c:1646  */
+#line 3090 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 252:
+  case 253:
 #line 903 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_infra_host_ttl:%s)\n", (yyvsp[0].str)));
@@ -3092,10 +3098,10 @@ yyreduce:
                else cfg_parser->cfg->host_ttl = atoi((yyvsp[0].str));
                free((yyvsp[0].str));
        }
-#line 3096 "util/configparser.c" /* yacc.c:1646  */
+#line 3102 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 253:
+  case 254:
 #line 912 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_infra_lame_ttl:%s)\n", (yyvsp[0].str)));
@@ -3103,10 +3109,10 @@ yyreduce:
                        "removed, use infra-host-ttl)", (yyvsp[0].str));
                free((yyvsp[0].str));
        }
-#line 3107 "util/configparser.c" /* yacc.c:1646  */
+#line 3113 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 254:
+  case 255:
 #line 920 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_infra_cache_numhosts:%s)\n", (yyvsp[0].str)));
@@ -3115,10 +3121,10 @@ yyreduce:
                else cfg_parser->cfg->infra_cache_numhosts = atoi((yyvsp[0].str));
                free((yyvsp[0].str));
        }
-#line 3119 "util/configparser.c" /* yacc.c:1646  */
+#line 3125 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 255:
+  case 256:
 #line 929 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_infra_cache_lame_size:%s)\n", (yyvsp[0].str)));
@@ -3126,10 +3132,10 @@ yyreduce:
                        "(option removed, use infra-cache-numhosts)", (yyvsp[0].str));
                free((yyvsp[0].str));
        }
-#line 3130 "util/configparser.c" /* yacc.c:1646  */
+#line 3136 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 256:
+  case 257:
 #line 937 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_infra_cache_slabs:%s)\n", (yyvsp[0].str)));
@@ -3142,10 +3148,10 @@ yyreduce:
                }
                free((yyvsp[0].str));
        }
-#line 3146 "util/configparser.c" /* yacc.c:1646  */
+#line 3152 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 257:
+  case 258:
 #line 950 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_infra_cache_min_rtt:%s)\n", (yyvsp[0].str)));
@@ -3154,20 +3160,20 @@ yyreduce:
                else cfg_parser->cfg->infra_cache_min_rtt = atoi((yyvsp[0].str));
                free((yyvsp[0].str));
        }
-#line 3158 "util/configparser.c" /* yacc.c:1646  */
+#line 3164 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 258:
+  case 259:
 #line 959 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_target_fetch_policy:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->target_fetch_policy);
                cfg_parser->cfg->target_fetch_policy = (yyvsp[0].str);
        }
-#line 3168 "util/configparser.c" /* yacc.c:1646  */
+#line 3174 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 259:
+  case 260:
 #line 966 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_harden_short_bufsize:%s)\n", (yyvsp[0].str)));
@@ -3177,10 +3183,10 @@ yyreduce:
                        (strcmp((yyvsp[0].str), "yes")==0);
                free((yyvsp[0].str));
        }
-#line 3181 "util/configparser.c" /* yacc.c:1646  */
+#line 3187 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 260:
+  case 261:
 #line 976 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_harden_large_queries:%s)\n", (yyvsp[0].str)));
@@ -3190,10 +3196,10 @@ yyreduce:
                        (strcmp((yyvsp[0].str), "yes")==0);
                free((yyvsp[0].str));
        }
-#line 3194 "util/configparser.c" /* yacc.c:1646  */
+#line 3200 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 261:
+  case 262:
 #line 986 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_harden_glue:%s)\n", (yyvsp[0].str)));
@@ -3203,10 +3209,10 @@ yyreduce:
                        (strcmp((yyvsp[0].str), "yes")==0);
                free((yyvsp[0].str));
        }
-#line 3207 "util/configparser.c" /* yacc.c:1646  */
+#line 3213 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 262:
+  case 263:
 #line 996 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_harden_dnssec_stripped:%s)\n", (yyvsp[0].str)));
@@ -3216,10 +3222,10 @@ yyreduce:
                        (strcmp((yyvsp[0].str), "yes")==0);
                free((yyvsp[0].str));
        }
-#line 3220 "util/configparser.c" /* yacc.c:1646  */
+#line 3226 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 263:
+  case 264:
 #line 1006 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_harden_below_nxdomain:%s)\n", (yyvsp[0].str)));
@@ -3229,10 +3235,10 @@ yyreduce:
                        (strcmp((yyvsp[0].str), "yes")==0);
                free((yyvsp[0].str));
        }
-#line 3233 "util/configparser.c" /* yacc.c:1646  */
+#line 3239 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 264:
+  case 265:
 #line 1016 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_harden_referral_path:%s)\n", (yyvsp[0].str)));
@@ -3242,10 +3248,10 @@ yyreduce:
                        (strcmp((yyvsp[0].str), "yes")==0);
                free((yyvsp[0].str));
        }
-#line 3246 "util/configparser.c" /* yacc.c:1646  */
+#line 3252 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 265:
+  case 266:
 #line 1026 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_harden_algo_downgrade:%s)\n", (yyvsp[0].str)));
@@ -3255,10 +3261,10 @@ yyreduce:
                        (strcmp((yyvsp[0].str), "yes")==0);
                free((yyvsp[0].str));
        }
-#line 3259 "util/configparser.c" /* yacc.c:1646  */
+#line 3265 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 266:
+  case 267:
 #line 1036 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_use_caps_for_id:%s)\n", (yyvsp[0].str)));
@@ -3268,40 +3274,40 @@ yyreduce:
                        (strcmp((yyvsp[0].str), "yes")==0);
                free((yyvsp[0].str));
        }
-#line 3272 "util/configparser.c" /* yacc.c:1646  */
+#line 3278 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 267:
+  case 268:
 #line 1046 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_caps_whitelist:%s)\n", (yyvsp[0].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->caps_whitelist, (yyvsp[0].str)))
                        yyerror("out of memory");
        }
-#line 3282 "util/configparser.c" /* yacc.c:1646  */
+#line 3288 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 268:
+  case 269:
 #line 1053 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_private_address:%s)\n", (yyvsp[0].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->private_address, (yyvsp[0].str)))
                        yyerror("out of memory");
        }
-#line 3292 "util/configparser.c" /* yacc.c:1646  */
+#line 3298 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 269:
+  case 270:
 #line 1060 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_private_domain:%s)\n", (yyvsp[0].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->private_domain, (yyvsp[0].str)))
                        yyerror("out of memory");
        }
-#line 3302 "util/configparser.c" /* yacc.c:1646  */
+#line 3308 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 270:
+  case 271:
 #line 1067 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_prefetch:%s)\n", (yyvsp[0].str)));
@@ -3310,10 +3316,10 @@ yyreduce:
                else cfg_parser->cfg->prefetch = (strcmp((yyvsp[0].str), "yes")==0);
                free((yyvsp[0].str));
        }
-#line 3314 "util/configparser.c" /* yacc.c:1646  */
+#line 3320 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 271:
+  case 272:
 #line 1076 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_prefetch_key:%s)\n", (yyvsp[0].str)));
@@ -3322,10 +3328,10 @@ yyreduce:
                else cfg_parser->cfg->prefetch_key = (strcmp((yyvsp[0].str), "yes")==0);
                free((yyvsp[0].str));
        }
-#line 3326 "util/configparser.c" /* yacc.c:1646  */
+#line 3332 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 272:
+  case 273:
 #line 1085 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_unwanted_reply_threshold:%s)\n", (yyvsp[0].str)));
@@ -3334,20 +3340,20 @@ yyreduce:
                else cfg_parser->cfg->unwanted_threshold = atoi((yyvsp[0].str));
                free((yyvsp[0].str));
        }
-#line 3338 "util/configparser.c" /* yacc.c:1646  */
+#line 3344 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 273:
+  case 274:
 #line 1094 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_do_not_query_address:%s)\n", (yyvsp[0].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->donotqueryaddrs, (yyvsp[0].str)))
                        yyerror("out of memory");
        }
-#line 3348 "util/configparser.c" /* yacc.c:1646  */
+#line 3354 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 274:
+  case 275:
 #line 1101 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_do_not_query_localhost:%s)\n", (yyvsp[0].str)));
@@ -3357,10 +3363,10 @@ yyreduce:
                        (strcmp((yyvsp[0].str), "yes")==0);
                free((yyvsp[0].str));
        }
-#line 3361 "util/configparser.c" /* yacc.c:1646  */
+#line 3367 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 275:
+  case 276:
 #line 1111 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_access_control:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
@@ -3377,20 +3383,20 @@ yyreduce:
                                fatal_exit("out of memory adding acl");
                }
        }
-#line 3381 "util/configparser.c" /* yacc.c:1646  */
+#line 3387 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 276:
+  case 277:
 #line 1128 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_module_conf:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->module_conf);
                cfg_parser->cfg->module_conf = (yyvsp[0].str);
        }
-#line 3391 "util/configparser.c" /* yacc.c:1646  */
+#line 3397 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 277:
+  case 278:
 #line 1135 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_val_override_date:%s)\n", (yyvsp[0].str)));
@@ -3408,10 +3414,10 @@ yyreduce:
                }
                free((yyvsp[0].str));
        }
-#line 3412 "util/configparser.c" /* yacc.c:1646  */
+#line 3418 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 278:
+  case 279:
 #line 1153 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_val_sig_skew_min:%s)\n", (yyvsp[0].str)));
@@ -3424,10 +3430,10 @@ yyreduce:
                }
                free((yyvsp[0].str));
        }
-#line 3428 "util/configparser.c" /* yacc.c:1646  */
+#line 3434 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 279:
+  case 280:
 #line 1166 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_val_sig_skew_max:%s)\n", (yyvsp[0].str)));
@@ -3440,10 +3446,10 @@ yyreduce:
                }
                free((yyvsp[0].str));
        }
-#line 3444 "util/configparser.c" /* yacc.c:1646  */
+#line 3450 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 280:
+  case 281:
 #line 1179 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_cache_max_ttl:%s)\n", (yyvsp[0].str)));
@@ -3452,10 +3458,10 @@ yyreduce:
                else cfg_parser->cfg->max_ttl = atoi((yyvsp[0].str));
                free((yyvsp[0].str));
        }
-#line 3456 "util/configparser.c" /* yacc.c:1646  */
+#line 3462 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 281:
+  case 282:
 #line 1188 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_cache_max_negative_ttl:%s)\n", (yyvsp[0].str)));
@@ -3464,10 +3470,10 @@ yyreduce:
                else cfg_parser->cfg->max_negative_ttl = atoi((yyvsp[0].str));
                free((yyvsp[0].str));
        }
-#line 3468 "util/configparser.c" /* yacc.c:1646  */
+#line 3474 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 282:
+  case 283:
 #line 1197 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_cache_min_ttl:%s)\n", (yyvsp[0].str)));
@@ -3476,10 +3482,10 @@ yyreduce:
                else cfg_parser->cfg->min_ttl = atoi((yyvsp[0].str));
                free((yyvsp[0].str));
        }
-#line 3480 "util/configparser.c" /* yacc.c:1646  */
+#line 3486 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 283:
+  case 284:
 #line 1206 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_bogus_ttl:%s)\n", (yyvsp[0].str)));
@@ -3488,10 +3494,10 @@ yyreduce:
                else cfg_parser->cfg->bogus_ttl = atoi((yyvsp[0].str));
                free((yyvsp[0].str));
        }
-#line 3492 "util/configparser.c" /* yacc.c:1646  */
+#line 3498 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 284:
+  case 285:
 #line 1215 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_val_clean_additional:%s)\n", (yyvsp[0].str)));
@@ -3501,10 +3507,10 @@ yyreduce:
                        (strcmp((yyvsp[0].str), "yes")==0);
                free((yyvsp[0].str));
        }
-#line 3505 "util/configparser.c" /* yacc.c:1646  */
+#line 3511 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 285:
+  case 286:
 #line 1225 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_val_permissive_mode:%s)\n", (yyvsp[0].str)));
@@ -3514,10 +3520,10 @@ yyreduce:
                        (strcmp((yyvsp[0].str), "yes")==0);
                free((yyvsp[0].str));
        }
-#line 3518 "util/configparser.c" /* yacc.c:1646  */
+#line 3524 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 286:
+  case 287:
 #line 1235 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_ignore_cd_flag:%s)\n", (yyvsp[0].str)));
@@ -3526,10 +3532,10 @@ yyreduce:
                else cfg_parser->cfg->ignore_cd = (strcmp((yyvsp[0].str), "yes")==0);
                free((yyvsp[0].str));
        }
-#line 3530 "util/configparser.c" /* yacc.c:1646  */
+#line 3536 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 287:
+  case 288:
 #line 1244 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_serve_expired:%s)\n", (yyvsp[0].str)));
@@ -3538,10 +3544,10 @@ yyreduce:
                else cfg_parser->cfg->serve_expired = (strcmp((yyvsp[0].str), "yes")==0);
                free((yyvsp[0].str));
        }
-#line 3542 "util/configparser.c" /* yacc.c:1646  */
+#line 3548 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 288:
+  case 289:
 #line 1253 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_fake_dsa:%s)\n", (yyvsp[0].str)));
@@ -3554,11 +3560,27 @@ yyreduce:
 #endif
                free((yyvsp[0].str));
        }
-#line 3558 "util/configparser.c" /* yacc.c:1646  */
+#line 3564 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 289:
+  case 290:
 #line 1266 "./util/configparser.y" /* yacc.c:1646  */
+    {
+               OUTYY(("P(server_fake_sha1:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
+                       yyerror("expected yes or no.");
+#ifdef HAVE_SSL
+               else fake_sha1 = (strcmp((yyvsp[0].str), "yes")==0);
+               if(fake_sha1)
+                       log_warn("test option fake_sha1 is enabled");
+#endif
+               free((yyvsp[0].str));
+       }
+#line 3580 "util/configparser.c" /* yacc.c:1646  */
+    break;
+
+  case 291:
+#line 1279 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_val_log_level:%s)\n", (yyvsp[0].str)));
                if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3566,21 +3588,21 @@ yyreduce:
                else cfg_parser->cfg->val_log_level = atoi((yyvsp[0].str));
                free((yyvsp[0].str));
        }
-#line 3570 "util/configparser.c" /* yacc.c:1646  */
+#line 3592 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 290:
-#line 1275 "./util/configparser.y" /* yacc.c:1646  */
+  case 292:
+#line 1288 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_val_nsec3_keysize_iterations:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->val_nsec3_key_iterations);
                cfg_parser->cfg->val_nsec3_key_iterations = (yyvsp[0].str);
        }
-#line 3580 "util/configparser.c" /* yacc.c:1646  */
+#line 3602 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 291:
-#line 1282 "./util/configparser.y" /* yacc.c:1646  */
+  case 293:
+#line 1295 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_add_holddown:%s)\n", (yyvsp[0].str)));
                if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3588,11 +3610,11 @@ yyreduce:
                else cfg_parser->cfg->add_holddown = atoi((yyvsp[0].str));
                free((yyvsp[0].str));
        }
-#line 3592 "util/configparser.c" /* yacc.c:1646  */
+#line 3614 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 292:
-#line 1291 "./util/configparser.y" /* yacc.c:1646  */
+  case 294:
+#line 1304 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_del_holddown:%s)\n", (yyvsp[0].str)));
                if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3600,11 +3622,11 @@ yyreduce:
                else cfg_parser->cfg->del_holddown = atoi((yyvsp[0].str));
                free((yyvsp[0].str));
        }
-#line 3604 "util/configparser.c" /* yacc.c:1646  */
+#line 3626 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 293:
-#line 1300 "./util/configparser.y" /* yacc.c:1646  */
+  case 295:
+#line 1313 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_keep_missing:%s)\n", (yyvsp[0].str)));
                if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3612,11 +3634,11 @@ yyreduce:
                else cfg_parser->cfg->keep_missing = atoi((yyvsp[0].str));
                free((yyvsp[0].str));
        }
-#line 3616 "util/configparser.c" /* yacc.c:1646  */
+#line 3638 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 294:
-#line 1309 "./util/configparser.y" /* yacc.c:1646  */
+  case 296:
+#line 1322 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_permit_small_holddown:%s)\n", (yyvsp[0].str)));
                if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3625,22 +3647,22 @@ yyreduce:
                        (strcmp((yyvsp[0].str), "yes")==0);
                free((yyvsp[0].str));
        }
-#line 3629 "util/configparser.c" /* yacc.c:1646  */
+#line 3651 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 295:
-#line 1318 "./util/configparser.y" /* yacc.c:1646  */
+  case 297:
+#line 1331 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_key_cache_size:%s)\n", (yyvsp[0].str)));
                if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->key_cache_size))
                        yyerror("memory size expected");
                free((yyvsp[0].str));
        }
-#line 3640 "util/configparser.c" /* yacc.c:1646  */
+#line 3662 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 296:
-#line 1326 "./util/configparser.y" /* yacc.c:1646  */
+  case 298:
+#line 1339 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_key_cache_slabs:%s)\n", (yyvsp[0].str)));
                if(atoi((yyvsp[0].str)) == 0)
@@ -3652,22 +3674,22 @@ yyreduce:
                }
                free((yyvsp[0].str));
        }
-#line 3656 "util/configparser.c" /* yacc.c:1646  */
+#line 3678 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 297:
-#line 1339 "./util/configparser.y" /* yacc.c:1646  */
+  case 299:
+#line 1352 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_neg_cache_size:%s)\n", (yyvsp[0].str)));
                if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->neg_cache_size))
                        yyerror("memory size expected");
                free((yyvsp[0].str));
        }
-#line 3667 "util/configparser.c" /* yacc.c:1646  */
+#line 3689 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 298:
-#line 1347 "./util/configparser.y" /* yacc.c:1646  */
+  case 300:
+#line 1360 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_local_zone:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
                if(strcmp((yyvsp[0].str), "static")!=0 && strcmp((yyvsp[0].str), "deny")!=0 &&
@@ -3694,21 +3716,21 @@ yyreduce:
                                fatal_exit("out of memory adding local-zone");
                }
        }
-#line 3698 "util/configparser.c" /* yacc.c:1646  */
+#line 3720 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 299:
-#line 1375 "./util/configparser.y" /* yacc.c:1646  */
+  case 301:
+#line 1388 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_local_data:%s)\n", (yyvsp[0].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->local_data, (yyvsp[0].str)))
                        fatal_exit("out of memory adding local-data");
        }
-#line 3708 "util/configparser.c" /* yacc.c:1646  */
+#line 3730 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 300:
-#line 1382 "./util/configparser.y" /* yacc.c:1646  */
+  case 302:
+#line 1395 "./util/configparser.y" /* yacc.c:1646  */
     {
                char* ptr;
                OUTYY(("P(server_local_data_ptr:%s)\n", (yyvsp[0].str)));
@@ -3722,11 +3744,11 @@ yyreduce:
                        yyerror("local-data-ptr could not be reversed");
                }
        }
-#line 3726 "util/configparser.c" /* yacc.c:1646  */
+#line 3748 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 301:
-#line 1397 "./util/configparser.y" /* yacc.c:1646  */
+  case 303:
+#line 1410 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_minimal_responses:%s)\n", (yyvsp[0].str)));
                if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3735,11 +3757,11 @@ yyreduce:
                        (strcmp((yyvsp[0].str), "yes")==0);
                free((yyvsp[0].str));
        }
-#line 3739 "util/configparser.c" /* yacc.c:1646  */
+#line 3761 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 302:
-#line 1407 "./util/configparser.y" /* yacc.c:1646  */
+  case 304:
+#line 1420 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_rrset_roundrobin:%s)\n", (yyvsp[0].str)));
                if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3748,31 +3770,31 @@ yyreduce:
                        (strcmp((yyvsp[0].str), "yes")==0);
                free((yyvsp[0].str));
        }
-#line 3752 "util/configparser.c" /* yacc.c:1646  */
+#line 3774 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 303:
-#line 1417 "./util/configparser.y" /* yacc.c:1646  */
+  case 305:
+#line 1430 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_max_udp_size:%s)\n", (yyvsp[0].str)));
                cfg_parser->cfg->max_udp_size = atoi((yyvsp[0].str));
                free((yyvsp[0].str));
        }
-#line 3762 "util/configparser.c" /* yacc.c:1646  */
+#line 3784 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 304:
-#line 1424 "./util/configparser.y" /* yacc.c:1646  */
+  case 306:
+#line 1437 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(dns64_prefix:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->dns64_prefix);
                cfg_parser->cfg->dns64_prefix = (yyvsp[0].str);
        }
-#line 3772 "util/configparser.c" /* yacc.c:1646  */
+#line 3794 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 305:
-#line 1431 "./util/configparser.y" /* yacc.c:1646  */
+  case 307:
+#line 1444 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_dns64_synthall:%s)\n", (yyvsp[0].str)));
                if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3780,11 +3802,11 @@ yyreduce:
                else cfg_parser->cfg->dns64_synthall = (strcmp((yyvsp[0].str), "yes")==0);
                free((yyvsp[0].str));
        }
-#line 3784 "util/configparser.c" /* yacc.c:1646  */
+#line 3806 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 306:
-#line 1440 "./util/configparser.y" /* yacc.c:1646  */
+  case 308:
+#line 1453 "./util/configparser.y" /* yacc.c:1646  */
     {
                char* p, *s = (yyvsp[0].str);
                OUTYY(("P(server_define_tag:%s)\n", (yyvsp[0].str)));
@@ -3797,11 +3819,11 @@ yyreduce:
                }
                free((yyvsp[0].str));
        }
-#line 3801 "util/configparser.c" /* yacc.c:1646  */
+#line 3823 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 307:
-#line 1454 "./util/configparser.y" /* yacc.c:1646  */
+  case 309:
+#line 1467 "./util/configparser.y" /* yacc.c:1646  */
     {
                size_t len = 0;
                uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
@@ -3819,11 +3841,11 @@ yyreduce:
                        }
                }
        }
-#line 3823 "util/configparser.c" /* yacc.c:1646  */
+#line 3845 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 308:
-#line 1473 "./util/configparser.y" /* yacc.c:1646  */
+  case 310:
+#line 1486 "./util/configparser.y" /* yacc.c:1646  */
     {
                size_t len = 0;
                uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
@@ -3841,11 +3863,11 @@ yyreduce:
                        }
                }
        }
-#line 3845 "util/configparser.c" /* yacc.c:1646  */
+#line 3867 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 309:
-#line 1492 "./util/configparser.y" /* yacc.c:1646  */
+  case 311:
+#line 1505 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_access_control_tag_action:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str)));
                if(!cfg_str3list_insert(&cfg_parser->cfg->acl_tag_actions,
@@ -3856,11 +3878,11 @@ yyreduce:
                        free((yyvsp[0].str));
                }
        }
-#line 3860 "util/configparser.c" /* yacc.c:1646  */
+#line 3882 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 310:
-#line 1504 "./util/configparser.y" /* yacc.c:1646  */
+  case 312:
+#line 1517 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_access_control_tag_data:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str)));
                if(!cfg_str3list_insert(&cfg_parser->cfg->acl_tag_datas,
@@ -3871,11 +3893,11 @@ yyreduce:
                        free((yyvsp[0].str));
                }
        }
-#line 3875 "util/configparser.c" /* yacc.c:1646  */
+#line 3897 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 311:
-#line 1516 "./util/configparser.y" /* yacc.c:1646  */
+  case 313:
+#line 1529 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_local_zone_override:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str)));
                if(!cfg_str3list_insert(&cfg_parser->cfg->local_zone_overrides,
@@ -3886,11 +3908,11 @@ yyreduce:
                        free((yyvsp[0].str));
                }
        }
-#line 3890 "util/configparser.c" /* yacc.c:1646  */
+#line 3912 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 312:
-#line 1528 "./util/configparser.y" /* yacc.c:1646  */
+  case 314:
+#line 1541 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_access_control_view:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
                if(!cfg_str2list_insert(&cfg_parser->cfg->acl_view,
@@ -3900,11 +3922,11 @@ yyreduce:
                        free((yyvsp[0].str));
                }
        }
-#line 3904 "util/configparser.c" /* yacc.c:1646  */
+#line 3926 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 313:
-#line 1539 "./util/configparser.y" /* yacc.c:1646  */
+  case 315:
+#line 1552 "./util/configparser.y" /* yacc.c:1646  */
     {
                size_t len = 0;
                uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
@@ -3922,11 +3944,11 @@ yyreduce:
                        }
                }
        }
-#line 3926 "util/configparser.c" /* yacc.c:1646  */
+#line 3948 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 314:
-#line 1558 "./util/configparser.y" /* yacc.c:1646  */
+  case 316:
+#line 1571 "./util/configparser.y" /* yacc.c:1646  */
     { 
                OUTYY(("P(server_ip_ratelimit:%s)\n", (yyvsp[0].str))); 
                if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3934,11 +3956,11 @@ yyreduce:
                else cfg_parser->cfg->ip_ratelimit = atoi((yyvsp[0].str));
                free((yyvsp[0].str));
        }
-#line 3938 "util/configparser.c" /* yacc.c:1646  */
+#line 3960 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 315:
-#line 1568 "./util/configparser.y" /* yacc.c:1646  */
+  case 317:
+#line 1581 "./util/configparser.y" /* yacc.c:1646  */
     { 
                OUTYY(("P(server_ratelimit:%s)\n", (yyvsp[0].str))); 
                if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3946,33 +3968,33 @@ yyreduce:
                else cfg_parser->cfg->ratelimit = atoi((yyvsp[0].str));
                free((yyvsp[0].str));
        }
-#line 3950 "util/configparser.c" /* yacc.c:1646  */
+#line 3972 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 316:
-#line 1577 "./util/configparser.y" /* yacc.c:1646  */
+  case 318:
+#line 1590 "./util/configparser.y" /* yacc.c:1646  */
     {
        OUTYY(("P(server_ip_ratelimit_size:%s)\n", (yyvsp[0].str)));
        if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->ip_ratelimit_size))
                yyerror("memory size expected");
        free((yyvsp[0].str));
   }
-#line 3961 "util/configparser.c" /* yacc.c:1646  */
+#line 3983 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 317:
-#line 1585 "./util/configparser.y" /* yacc.c:1646  */
+  case 319:
+#line 1598 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_ratelimit_size:%s)\n", (yyvsp[0].str)));
                if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->ratelimit_size))
                        yyerror("memory size expected");
                free((yyvsp[0].str));
        }
-#line 3972 "util/configparser.c" /* yacc.c:1646  */
+#line 3994 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 318:
-#line 1593 "./util/configparser.y" /* yacc.c:1646  */
+  case 320:
+#line 1606 "./util/configparser.y" /* yacc.c:1646  */
     {
        OUTYY(("P(server_ip_ratelimit_slabs:%s)\n", (yyvsp[0].str)));
        if(atoi((yyvsp[0].str)) == 0)
@@ -3984,11 +4006,11 @@ yyreduce:
        }
        free((yyvsp[0].str));
   }
-#line 3988 "util/configparser.c" /* yacc.c:1646  */
+#line 4010 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 319:
-#line 1606 "./util/configparser.y" /* yacc.c:1646  */
+  case 321:
+#line 1619 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_ratelimit_slabs:%s)\n", (yyvsp[0].str)));
                if(atoi((yyvsp[0].str)) == 0)
@@ -4000,11 +4022,11 @@ yyreduce:
                }
                free((yyvsp[0].str));
        }
-#line 4004 "util/configparser.c" /* yacc.c:1646  */
+#line 4026 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 320:
-#line 1619 "./util/configparser.y" /* yacc.c:1646  */
+  case 322:
+#line 1632 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_ratelimit_for_domain:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
                if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) {
@@ -4016,11 +4038,11 @@ yyreduce:
                                        "ratelimit-for-domain");
                }
        }
-#line 4020 "util/configparser.c" /* yacc.c:1646  */
+#line 4042 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 321:
-#line 1632 "./util/configparser.y" /* yacc.c:1646  */
+  case 323:
+#line 1645 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_ratelimit_below_domain:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
                if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) {
@@ -4032,11 +4054,11 @@ yyreduce:
                                        "ratelimit-below-domain");
                }
        }
-#line 4036 "util/configparser.c" /* yacc.c:1646  */
+#line 4058 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 322:
-#line 1645 "./util/configparser.y" /* yacc.c:1646  */
+  case 324:
+#line 1658 "./util/configparser.y" /* yacc.c:1646  */
     { 
        OUTYY(("P(server_ip_ratelimit_factor:%s)\n", (yyvsp[0].str))); 
        if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4044,11 +4066,11 @@ yyreduce:
        else cfg_parser->cfg->ip_ratelimit_factor = atoi((yyvsp[0].str));
        free((yyvsp[0].str));
        }
-#line 4048 "util/configparser.c" /* yacc.c:1646  */
+#line 4070 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 323:
-#line 1654 "./util/configparser.y" /* yacc.c:1646  */
+  case 325:
+#line 1667 "./util/configparser.y" /* yacc.c:1646  */
     { 
                OUTYY(("P(server_ratelimit_factor:%s)\n", (yyvsp[0].str))); 
                if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4056,11 +4078,11 @@ yyreduce:
                else cfg_parser->cfg->ratelimit_factor = atoi((yyvsp[0].str));
                free((yyvsp[0].str));
        }
-#line 4060 "util/configparser.c" /* yacc.c:1646  */
+#line 4082 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 324:
-#line 1663 "./util/configparser.y" /* yacc.c:1646  */
+  case 326:
+#line 1676 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_qname_minimisation:%s)\n", (yyvsp[0].str)));
                if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4069,11 +4091,11 @@ yyreduce:
                        (strcmp((yyvsp[0].str), "yes")==0);
                free((yyvsp[0].str));
        }
-#line 4073 "util/configparser.c" /* yacc.c:1646  */
+#line 4095 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 325:
-#line 1673 "./util/configparser.y" /* yacc.c:1646  */
+  case 327:
+#line 1686 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_qname_minimisation_strict:%s)\n", (yyvsp[0].str)));
                if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4082,11 +4104,11 @@ yyreduce:
                        (strcmp((yyvsp[0].str), "yes")==0);
                free((yyvsp[0].str));
        }
-#line 4086 "util/configparser.c" /* yacc.c:1646  */
+#line 4108 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 326:
-#line 1683 "./util/configparser.y" /* yacc.c:1646  */
+  case 328:
+#line 1696 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
                if(cfg_parser->cfg->stubs->name)
@@ -4095,31 +4117,31 @@ yyreduce:
                free(cfg_parser->cfg->stubs->name);
                cfg_parser->cfg->stubs->name = (yyvsp[0].str);
        }
-#line 4099 "util/configparser.c" /* yacc.c:1646  */
+#line 4121 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 327:
-#line 1693 "./util/configparser.y" /* yacc.c:1646  */
+  case 329:
+#line 1706 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(stub-host:%s)\n", (yyvsp[0].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->hosts, (yyvsp[0].str)))
                        yyerror("out of memory");
        }
-#line 4109 "util/configparser.c" /* yacc.c:1646  */
+#line 4131 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 328:
-#line 1700 "./util/configparser.y" /* yacc.c:1646  */
+  case 330:
+#line 1713 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(stub-addr:%s)\n", (yyvsp[0].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->addrs, (yyvsp[0].str)))
                        yyerror("out of memory");
        }
-#line 4119 "util/configparser.c" /* yacc.c:1646  */
+#line 4141 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 329:
-#line 1707 "./util/configparser.y" /* yacc.c:1646  */
+  case 331:
+#line 1720 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(stub-first:%s)\n", (yyvsp[0].str)));
                if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4127,11 +4149,11 @@ yyreduce:
                else cfg_parser->cfg->stubs->isfirst=(strcmp((yyvsp[0].str), "yes")==0);
                free((yyvsp[0].str));
        }
-#line 4131 "util/configparser.c" /* yacc.c:1646  */
+#line 4153 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 330:
-#line 1716 "./util/configparser.y" /* yacc.c:1646  */
+  case 332:
+#line 1729 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(stub-ssl-upstream:%s)\n", (yyvsp[0].str)));
                if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4140,11 +4162,11 @@ yyreduce:
                        (strcmp((yyvsp[0].str), "yes")==0);
                free((yyvsp[0].str));
        }
-#line 4144 "util/configparser.c" /* yacc.c:1646  */
+#line 4166 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 331:
-#line 1726 "./util/configparser.y" /* yacc.c:1646  */
+  case 333:
+#line 1739 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(stub-prime:%s)\n", (yyvsp[0].str)));
                if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4153,11 +4175,11 @@ yyreduce:
                        (strcmp((yyvsp[0].str), "yes")==0);
                free((yyvsp[0].str));
        }
-#line 4157 "util/configparser.c" /* yacc.c:1646  */
+#line 4179 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 332:
-#line 1736 "./util/configparser.y" /* yacc.c:1646  */
+  case 334:
+#line 1749 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
                if(cfg_parser->cfg->forwards->name)
@@ -4166,31 +4188,31 @@ yyreduce:
                free(cfg_parser->cfg->forwards->name);
                cfg_parser->cfg->forwards->name = (yyvsp[0].str);
        }
-#line 4170 "util/configparser.c" /* yacc.c:1646  */
+#line 4192 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 333:
-#line 1746 "./util/configparser.y" /* yacc.c:1646  */
+  case 335:
+#line 1759 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(forward-host:%s)\n", (yyvsp[0].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->hosts, (yyvsp[0].str)))
                        yyerror("out of memory");
        }
-#line 4180 "util/configparser.c" /* yacc.c:1646  */
+#line 4202 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 334:
-#line 1753 "./util/configparser.y" /* yacc.c:1646  */
+  case 336:
+#line 1766 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(forward-addr:%s)\n", (yyvsp[0].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->addrs, (yyvsp[0].str)))
                        yyerror("out of memory");
        }
-#line 4190 "util/configparser.c" /* yacc.c:1646  */
+#line 4212 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 335:
-#line 1760 "./util/configparser.y" /* yacc.c:1646  */
+  case 337:
+#line 1773 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(forward-first:%s)\n", (yyvsp[0].str)));
                if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4198,11 +4220,11 @@ yyreduce:
                else cfg_parser->cfg->forwards->isfirst=(strcmp((yyvsp[0].str), "yes")==0);
                free((yyvsp[0].str));
        }
-#line 4202 "util/configparser.c" /* yacc.c:1646  */
+#line 4224 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 336:
-#line 1769 "./util/configparser.y" /* yacc.c:1646  */
+  case 338:
+#line 1782 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(forward-ssl-upstream:%s)\n", (yyvsp[0].str)));
                if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4211,11 +4233,11 @@ yyreduce:
                        (strcmp((yyvsp[0].str), "yes")==0);
                free((yyvsp[0].str));
        }
-#line 4215 "util/configparser.c" /* yacc.c:1646  */
+#line 4237 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 337:
-#line 1779 "./util/configparser.y" /* yacc.c:1646  */
+  case 339:
+#line 1792 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
                if(cfg_parser->cfg->views->name)
@@ -4224,11 +4246,11 @@ yyreduce:
                free(cfg_parser->cfg->views->name);
                cfg_parser->cfg->views->name = (yyvsp[0].str);
        }
-#line 4228 "util/configparser.c" /* yacc.c:1646  */
+#line 4250 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 338:
-#line 1789 "./util/configparser.y" /* yacc.c:1646  */
+  case 340:
+#line 1802 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(view_local_zone:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
                if(strcmp((yyvsp[0].str), "static")!=0 && strcmp((yyvsp[0].str), "deny")!=0 &&
@@ -4256,11 +4278,11 @@ yyreduce:
                                fatal_exit("out of memory adding local-zone");
                }
        }
-#line 4260 "util/configparser.c" /* yacc.c:1646  */
+#line 4282 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 339:
-#line 1818 "./util/configparser.y" /* yacc.c:1646  */
+  case 341:
+#line 1831 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(view_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
                validate_respip_action((yyvsp[0].str));
@@ -4269,22 +4291,22 @@ yyreduce:
                        fatal_exit("out of memory adding per-view "
                                "response-ip action");
        }
-#line 4273 "util/configparser.c" /* yacc.c:1646  */
+#line 4295 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 340:
-#line 1828 "./util/configparser.y" /* yacc.c:1646  */
+  case 342:
+#line 1841 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(view_response_ip_data:%s)\n", (yyvsp[-1].str)));
                if(!cfg_str2list_insert(
                        &cfg_parser->cfg->views->respip_data, (yyvsp[-1].str), (yyvsp[0].str)))
                        fatal_exit("out of memory adding response-ip-data");
        }
-#line 4284 "util/configparser.c" /* yacc.c:1646  */
+#line 4306 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 341:
-#line 1836 "./util/configparser.y" /* yacc.c:1646  */
+  case 343:
+#line 1849 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(view_local_data:%s)\n", (yyvsp[0].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->views->local_data, (yyvsp[0].str))) {
@@ -4292,11 +4314,11 @@ yyreduce:
                        free((yyvsp[0].str));
                }
        }
-#line 4296 "util/configparser.c" /* yacc.c:1646  */
+#line 4318 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 342:
-#line 1845 "./util/configparser.y" /* yacc.c:1646  */
+  case 344:
+#line 1858 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(view-first:%s)\n", (yyvsp[0].str)));
                if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4304,19 +4326,19 @@ yyreduce:
                else cfg_parser->cfg->views->isfirst=(strcmp((yyvsp[0].str), "yes")==0);
                free((yyvsp[0].str));
        }
-#line 4308 "util/configparser.c" /* yacc.c:1646  */
+#line 4330 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 343:
-#line 1854 "./util/configparser.y" /* yacc.c:1646  */
+  case 345:
+#line 1867 "./util/configparser.y" /* yacc.c:1646  */
     { 
                OUTYY(("\nP(remote-control:)\n")); 
        }
-#line 4316 "util/configparser.c" /* yacc.c:1646  */
+#line 4338 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 354:
-#line 1865 "./util/configparser.y" /* yacc.c:1646  */
+  case 356:
+#line 1878 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(control_enable:%s)\n", (yyvsp[0].str)));
                if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4325,11 +4347,11 @@ yyreduce:
                        (strcmp((yyvsp[0].str), "yes")==0);
                free((yyvsp[0].str));
        }
-#line 4329 "util/configparser.c" /* yacc.c:1646  */
+#line 4351 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 355:
-#line 1875 "./util/configparser.y" /* yacc.c:1646  */
+  case 357:
+#line 1888 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(control_port:%s)\n", (yyvsp[0].str)));
                if(atoi((yyvsp[0].str)) == 0)
@@ -4337,21 +4359,21 @@ yyreduce:
                else cfg_parser->cfg->control_port = atoi((yyvsp[0].str));
                free((yyvsp[0].str));
        }
-#line 4341 "util/configparser.c" /* yacc.c:1646  */
+#line 4363 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 356:
-#line 1884 "./util/configparser.y" /* yacc.c:1646  */
+  case 358:
+#line 1897 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(control_interface:%s)\n", (yyvsp[0].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->control_ifs, (yyvsp[0].str)))
                        yyerror("out of memory");
        }
-#line 4351 "util/configparser.c" /* yacc.c:1646  */
+#line 4373 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 357:
-#line 1891 "./util/configparser.y" /* yacc.c:1646  */
+  case 359:
+#line 1904 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(control_use_cert:%s)\n", (yyvsp[0].str)));
                if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4360,122 +4382,122 @@ yyreduce:
                        (strcmp((yyvsp[0].str), "yes")==0);
                free((yyvsp[0].str));
        }
-#line 4364 "util/configparser.c" /* yacc.c:1646  */
+#line 4386 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 358:
-#line 1901 "./util/configparser.y" /* yacc.c:1646  */
+  case 360:
+#line 1914 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(rc_server_key_file:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->server_key_file);
                cfg_parser->cfg->server_key_file = (yyvsp[0].str);
        }
-#line 4374 "util/configparser.c" /* yacc.c:1646  */
+#line 4396 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 359:
-#line 1908 "./util/configparser.y" /* yacc.c:1646  */
+  case 361:
+#line 1921 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(rc_server_cert_file:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->server_cert_file);
                cfg_parser->cfg->server_cert_file = (yyvsp[0].str);
        }
-#line 4384 "util/configparser.c" /* yacc.c:1646  */
+#line 4406 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 360:
-#line 1915 "./util/configparser.y" /* yacc.c:1646  */
+  case 362:
+#line 1928 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(rc_control_key_file:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->control_key_file);
                cfg_parser->cfg->control_key_file = (yyvsp[0].str);
        }
-#line 4394 "util/configparser.c" /* yacc.c:1646  */
+#line 4416 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 361:
-#line 1922 "./util/configparser.y" /* yacc.c:1646  */
+  case 363:
+#line 1935 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(rc_control_cert_file:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->control_cert_file);
                cfg_parser->cfg->control_cert_file = (yyvsp[0].str);
        }
-#line 4404 "util/configparser.c" /* yacc.c:1646  */
+#line 4426 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 362:
-#line 1929 "./util/configparser.y" /* yacc.c:1646  */
+  case 364:
+#line 1942 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("\nP(dnstap:)\n"));
        }
-#line 4412 "util/configparser.c" /* yacc.c:1646  */
+#line 4434 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 377:
-#line 1946 "./util/configparser.y" /* yacc.c:1646  */
+  case 379:
+#line 1959 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(dt_dnstap_enable:%s)\n", (yyvsp[0].str)));
                if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
                else cfg_parser->cfg->dnstap = (strcmp((yyvsp[0].str), "yes")==0);
        }
-#line 4423 "util/configparser.c" /* yacc.c:1646  */
+#line 4445 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 378:
-#line 1954 "./util/configparser.y" /* yacc.c:1646  */
+  case 380:
+#line 1967 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(dt_dnstap_socket_path:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->dnstap_socket_path);
                cfg_parser->cfg->dnstap_socket_path = (yyvsp[0].str);
        }
-#line 4433 "util/configparser.c" /* yacc.c:1646  */
+#line 4455 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 379:
-#line 1961 "./util/configparser.y" /* yacc.c:1646  */
+  case 381:
+#line 1974 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(dt_dnstap_send_identity:%s)\n", (yyvsp[0].str)));
                if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
                else cfg_parser->cfg->dnstap_send_identity = (strcmp((yyvsp[0].str), "yes")==0);
        }
-#line 4444 "util/configparser.c" /* yacc.c:1646  */
+#line 4466 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 380:
-#line 1969 "./util/configparser.y" /* yacc.c:1646  */
+  case 382:
+#line 1982 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(dt_dnstap_send_version:%s)\n", (yyvsp[0].str)));
                if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
                else cfg_parser->cfg->dnstap_send_version = (strcmp((yyvsp[0].str), "yes")==0);
        }
-#line 4455 "util/configparser.c" /* yacc.c:1646  */
+#line 4477 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 381:
-#line 1977 "./util/configparser.y" /* yacc.c:1646  */
+  case 383:
+#line 1990 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(dt_dnstap_identity:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->dnstap_identity);
                cfg_parser->cfg->dnstap_identity = (yyvsp[0].str);
        }
-#line 4465 "util/configparser.c" /* yacc.c:1646  */
+#line 4487 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 382:
-#line 1984 "./util/configparser.y" /* yacc.c:1646  */
+  case 384:
+#line 1997 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(dt_dnstap_version:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->dnstap_version);
                cfg_parser->cfg->dnstap_version = (yyvsp[0].str);
        }
-#line 4475 "util/configparser.c" /* yacc.c:1646  */
+#line 4497 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 383:
-#line 1991 "./util/configparser.y" /* yacc.c:1646  */
+  case 385:
+#line 2004 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(dt_dnstap_log_resolver_query_messages:%s)\n", (yyvsp[0].str)));
                if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4483,11 +4505,11 @@ yyreduce:
                else cfg_parser->cfg->dnstap_log_resolver_query_messages =
                        (strcmp((yyvsp[0].str), "yes")==0);
        }
-#line 4487 "util/configparser.c" /* yacc.c:1646  */
+#line 4509 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 384:
-#line 2000 "./util/configparser.y" /* yacc.c:1646  */
+  case 386:
+#line 2013 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(dt_dnstap_log_resolver_response_messages:%s)\n", (yyvsp[0].str)));
                if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4495,11 +4517,11 @@ yyreduce:
                else cfg_parser->cfg->dnstap_log_resolver_response_messages =
                        (strcmp((yyvsp[0].str), "yes")==0);
        }
-#line 4499 "util/configparser.c" /* yacc.c:1646  */
+#line 4521 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 385:
-#line 2009 "./util/configparser.y" /* yacc.c:1646  */
+  case 387:
+#line 2022 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(dt_dnstap_log_client_query_messages:%s)\n", (yyvsp[0].str)));
                if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4507,11 +4529,11 @@ yyreduce:
                else cfg_parser->cfg->dnstap_log_client_query_messages =
                        (strcmp((yyvsp[0].str), "yes")==0);
        }
-#line 4511 "util/configparser.c" /* yacc.c:1646  */
+#line 4533 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 386:
-#line 2018 "./util/configparser.y" /* yacc.c:1646  */
+  case 388:
+#line 2031 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(dt_dnstap_log_client_response_messages:%s)\n", (yyvsp[0].str)));
                if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4519,11 +4541,11 @@ yyreduce:
                else cfg_parser->cfg->dnstap_log_client_response_messages =
                        (strcmp((yyvsp[0].str), "yes")==0);
        }
-#line 4523 "util/configparser.c" /* yacc.c:1646  */
+#line 4545 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 387:
-#line 2027 "./util/configparser.y" /* yacc.c:1646  */
+  case 389:
+#line 2040 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(dt_dnstap_log_forwarder_query_messages:%s)\n", (yyvsp[0].str)));
                if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4531,11 +4553,11 @@ yyreduce:
                else cfg_parser->cfg->dnstap_log_forwarder_query_messages =
                        (strcmp((yyvsp[0].str), "yes")==0);
        }
-#line 4535 "util/configparser.c" /* yacc.c:1646  */
+#line 4557 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 388:
-#line 2036 "./util/configparser.y" /* yacc.c:1646  */
+  case 390:
+#line 2049 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(dt_dnstap_log_forwarder_response_messages:%s)\n", (yyvsp[0].str)));
                if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4543,29 +4565,29 @@ yyreduce:
                else cfg_parser->cfg->dnstap_log_forwarder_response_messages =
                        (strcmp((yyvsp[0].str), "yes")==0);
        }
-#line 4547 "util/configparser.c" /* yacc.c:1646  */
+#line 4569 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 389:
-#line 2045 "./util/configparser.y" /* yacc.c:1646  */
+  case 391:
+#line 2058 "./util/configparser.y" /* yacc.c:1646  */
     { 
                OUTYY(("\nP(python:)\n")); 
        }
-#line 4555 "util/configparser.c" /* yacc.c:1646  */
+#line 4577 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 393:
-#line 2054 "./util/configparser.y" /* yacc.c:1646  */
+  case 395:
+#line 2067 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(python-script:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->python_script);
                cfg_parser->cfg->python_script = (yyvsp[0].str);
        }
-#line 4565 "util/configparser.c" /* yacc.c:1646  */
+#line 4587 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 394:
-#line 2060 "./util/configparser.y" /* yacc.c:1646  */
+  case 396:
+#line 2073 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(disable_dnssec_lame_check:%s)\n", (yyvsp[0].str)));
                if (strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4574,21 +4596,21 @@ yyreduce:
                        (strcmp((yyvsp[0].str), "yes")==0);
                free((yyvsp[0].str));
        }
-#line 4578 "util/configparser.c" /* yacc.c:1646  */
+#line 4600 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 395:
-#line 2070 "./util/configparser.y" /* yacc.c:1646  */
+  case 397:
+#line 2083 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_log_identity:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->log_identity);
                cfg_parser->cfg->log_identity = (yyvsp[0].str);
        }
-#line 4588 "util/configparser.c" /* yacc.c:1646  */
+#line 4610 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 396:
-#line 2077 "./util/configparser.y" /* yacc.c:1646  */
+  case 398:
+#line 2090 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
                validate_respip_action((yyvsp[0].str));
@@ -4596,22 +4618,22 @@ yyreduce:
                        (yyvsp[-1].str), (yyvsp[0].str)))
                        fatal_exit("out of memory adding response-ip");
        }
-#line 4600 "util/configparser.c" /* yacc.c:1646  */
+#line 4622 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 397:
-#line 2086 "./util/configparser.y" /* yacc.c:1646  */
+  case 399:
+#line 2099 "./util/configparser.y" /* yacc.c:1646  */
     {
                OUTYY(("P(server_response_ip_data:%s)\n", (yyvsp[-1].str)));
                        if(!cfg_str2list_insert(&cfg_parser->cfg->respip_data,
                                (yyvsp[-1].str), (yyvsp[0].str)))
                                fatal_exit("out of memory adding response-ip-data");
        }
-#line 4611 "util/configparser.c" /* yacc.c:1646  */
+#line 4633 "util/configparser.c" /* yacc.c:1646  */
     break;
 
 
-#line 4615 "util/configparser.c" /* yacc.c:1646  */
+#line 4637 "util/configparser.c" /* yacc.c:1646  */
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
@@ -4839,7 +4861,7 @@ yyreturn:
 #endif
   return yyresult;
 }
-#line 2093 "./util/configparser.y" /* yacc.c:1906  */
+#line 2106 "./util/configparser.y" /* yacc.c:1906  */
 
 
 /* parse helper routines could be here */

diff --git a/util/configparser.h b/util/configparser.h
index 08542392b06c93d7fa04fbb91554b052682fec28..c3706847f42b6e30859d3ad498826c7935882c53 100644 (file)
--- a/util/configparser.h
+++ b/util/configparser.h
@@ -233,10 +233,11 @@ extern int yydebug;
     VAR_VIEW_FIRST = 443,
     VAR_SERVE_EXPIRED = 444,
     VAR_FAKE_DSA = 445,
-    VAR_LOG_IDENTITY = 446,
-    VAR_USE_SYSTEMD = 447,
-    VAR_SHM_ENABLE = 448,
-    VAR_SHM_KEY = 449
+    VAR_FAKE_SHA1 = 446,
+    VAR_LOG_IDENTITY = 447,
+    VAR_USE_SYSTEMD = 448,
+    VAR_SHM_ENABLE = 449,
+    VAR_SHM_KEY = 450
   };
 #endif
 /* Tokens.  */
@@ -428,10 +429,11 @@ extern int yydebug;
 #define VAR_VIEW_FIRST 443
 #define VAR_SERVE_EXPIRED 444
 #define VAR_FAKE_DSA 445
-#define VAR_LOG_IDENTITY 446
-#define VAR_USE_SYSTEMD 447
-#define VAR_SHM_ENABLE 448
-#define VAR_SHM_KEY 449
+#define VAR_FAKE_SHA1 446
+#define VAR_LOG_IDENTITY 447
+#define VAR_USE_SYSTEMD 448
+#define VAR_SHM_ENABLE 449
+#define VAR_SHM_KEY 450
 
 /* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
@@ -442,7 +444,7 @@ union YYSTYPE
 
        char*   str;
 
-#line 446 "util/configparser.h" /* yacc.c:1909  */
+#line 448 "util/configparser.h" /* yacc.c:1909  */
 };
 
 typedef union YYSTYPE YYSTYPE;

diff --git a/util/configparser.y b/util/configparser.y
index 16c97004f629db3bfee237aa6f2692c60047f01f..f9ed8593fe2361ec720dd2194bacf93646a711b0 100644 (file)
--- a/util/configparser.y
+++ b/util/configparser.y
@@ -136,7 +136,7 @@ extern struct config_parser_state* cfg_parser;
 %token VAR_DEFINE_TAG VAR_LOCAL_ZONE_TAG VAR_ACCESS_CONTROL_TAG
 %token VAR_LOCAL_ZONE_OVERRIDE VAR_ACCESS_CONTROL_TAG_ACTION
 %token VAR_ACCESS_CONTROL_TAG_DATA VAR_VIEW VAR_ACCESS_CONTROL_VIEW
-%token VAR_VIEW_FIRST VAR_SERVE_EXPIRED VAR_FAKE_DSA
+%token VAR_VIEW_FIRST VAR_SERVE_EXPIRED VAR_FAKE_DSA VAR_FAKE_SHA1
 %token VAR_LOG_IDENTITY
 %token VAR_USE_SYSTEMD VAR_SHM_ENABLE VAR_SHM_KEY
 
@@ -218,7 +218,7 @@ content_server: server_num_threads | server_verbosity | server_port |
        server_qname_minimisation_strict | server_serve_expired |
        server_fake_dsa | server_log_identity | server_use_systemd |
        server_response_ip_tag | server_response_ip | server_response_ip_data |
-       server_shm_enable | server_shm_key
+       server_shm_enable | server_shm_key | server_fake_sha1
        ;
 stubstart: VAR_STUB_ZONE
        {
@@ -1262,6 +1262,19 @@ server_fake_dsa: VAR_FAKE_DSA STRING_ARG
                free($2);
        }
        ;
+server_fake_sha1: VAR_FAKE_SHA1 STRING_ARG
+       {
+               OUTYY(("P(server_fake_sha1:%s)\n", $2));
+               if(strcmp($2, "yes") != 0 && strcmp($2, "no") != 0)
+                       yyerror("expected yes or no.");
+#ifdef HAVE_SSL
+               else fake_sha1 = (strcmp($2, "yes")==0);
+               if(fake_sha1)
+                       log_warn("test option fake_sha1 is enabled");
+#endif
+               free($2);
+       }
+       ;
 server_val_log_level: VAR_VAL_LOG_LEVEL STRING_ARG
        {
                OUTYY(("P(server_val_log_level:%s)\n", $2));

diff --git a/validator/val_secalgo.c b/validator/val_secalgo.c
index 302820fc2f97a9bfb34e1c257d2a5d2675eba3e5..be88ff438660c2efe70dc58cfa8099a49ef83214 100644 (file)
--- a/validator/val_secalgo.c
+++ b/validator/val_secalgo.c
@@ -74,6 +74,8 @@
 
 /** fake DSA support for unit tests */
 int fake_dsa = 0;
+/** fake SHA1 support for unit tests */
+int fake_sha1 = 0;
 
 /* return size of digest if supported, or 0 otherwise */
 size_t
@@ -116,9 +118,12 @@ size_t
 ds_digest_size_supported(int algo)
 {
        switch(algo) {
-#ifdef HAVE_EVP_SHA1
                case LDNS_SHA1:
+#if defined(HAVE_EVP_SHA1) && defined(USE_SHA1)
                        return SHA_DIGEST_LENGTH;
+#else
+                       if(fake_sha1) return 20;
+                       return 0;
 #endif
 #ifdef HAVE_EVP_SHA256
                case LDNS_SHA256:
@@ -158,7 +163,7 @@ secalgo_ds_digest(int algo, unsigned char* buf, size_t len,
        unsigned char* res)
 {
        switch(algo) {
-#ifdef HAVE_EVP_SHA1
+#if defined(HAVE_EVP_SHA1) && defined(USE_SHA1)
                case LDNS_SHA1:
                        (void)SHA1(buf, len, res);
                        return 1;
@@ -197,14 +202,22 @@ dnskey_algo_id_is_supported(int id)
                return 0;
        case LDNS_DSA:
        case LDNS_DSA_NSEC3:
-#ifdef USE_DSA
+#if defined(USE_DSA) && defined(USE_SHA1)
                return 1;
 #else
-               if(fake_dsa) return 1;
+               if(fake_dsa || fake_sha1) return 1;
                return 0;
 #endif
+
        case LDNS_RSASHA1:
        case LDNS_RSASHA1_NSEC3:
+#ifdef USE_SHA1
+               return 1;
+#else
+               if(fake_sha1) return 1;
+               return 0;
+#endif
+
 #if defined(HAVE_EVP_SHA256) && defined(USE_SHA2)
        case LDNS_RSASHA256:
 #endif
@@ -215,7 +228,10 @@ dnskey_algo_id_is_supported(int id)
        case LDNS_ECDSAP256SHA256:
        case LDNS_ECDSAP384SHA384:
 #endif
+#if (defined(HAVE_EVP_SHA256) && defined(USE_SHA2)) || (defined(HAVE_EVP_SHA512) && defined(USE_SHA2)) || defined(USE_ECDSA)
                return 1;
+#endif
+
 #ifdef USE_GOST
        case LDNS_ECC_GOST:
                /* we support GOST if it can be loaded */
@@ -392,13 +408,13 @@ static int
 setup_key_digest(int algo, EVP_PKEY** evp_key, const EVP_MD** digest_type, 
        unsigned char* key, size_t keylen)
 {
-#ifdef USE_DSA
+#if defined(USE_DSA) && defined(USE_SHA1)
        DSA* dsa;
 #endif
        RSA* rsa;
 
        switch(algo) {
-#ifdef USE_DSA
+#if defined(USE_DSA) && defined(USE_SHA1)
                case LDNS_DSA:
                case LDNS_DSA_NSEC3:
                        *evp_key = EVP_PKEY_new();
@@ -424,9 +440,13 @@ setup_key_digest(int algo, EVP_PKEY** evp_key, const EVP_MD** digest_type,
 #endif
 
                        break;
-#endif /* USE_DSA */
+#endif /* USE_DSA && USE_SHA1 */
+
+#if defined(USE_SHA1) || (defined(HAVE_EVP_SHA256) && defined(USE_SHA2)) || (defined(HAVE_EVP_SHA512) && defined(USE_SHA2))
+#ifdef USE_SHA1
                case LDNS_RSASHA1:
                case LDNS_RSASHA1_NSEC3:
+#endif
 #if defined(HAVE_EVP_SHA256) && defined(USE_SHA2)
                case LDNS_RSASHA256:
 #endif
@@ -461,9 +481,14 @@ setup_key_digest(int algo, EVP_PKEY** evp_key, const EVP_MD** digest_type,
                                *digest_type = EVP_sha512();
                        else
 #endif
+#ifdef USE_SHA1
                                *digest_type = EVP_sha1();
-
+#else
+                               { verbose(VERB_QUERY, "no digest available"); return 0; }
+#endif
                        break;
+#endif /* defined(USE_SHA1) || (defined(HAVE_EVP_SHA256) && defined(USE_SHA2)) || (defined(HAVE_EVP_SHA512) && defined(USE_SHA2)) */
+
                case LDNS_RSAMD5:
                        *evp_key = EVP_PKEY_new();
                        if(!*evp_key) {
@@ -562,7 +587,11 @@ verify_canonrrset(sldns_buffer* buf, int algo, unsigned char* sigblock,
        EVP_PKEY *evp_key = NULL;
 
 #ifndef USE_DSA
-       if((algo == LDNS_DSA || algo == LDNS_DSA_NSEC3) && fake_dsa)
+       if((algo == LDNS_DSA || algo == LDNS_DSA_NSEC3) &&(fake_dsa||fake_sha1))
+               return sec_status_secure;
+#endif
+#ifndef USE_SHA1
+       if(fake_sha1 && (algo == LDNS_DSA || algo == LDNS_DSA_NSEC3 || algo == LDNS_RSASHA1 || algo == LDNS_RSASHA1_NSEC3))
                return sec_status_secure;
 #endif
        
@@ -706,8 +735,10 @@ ds_digest_size_supported(int algo)
 {
        /* uses libNSS */
        switch(algo) {
+#ifdef USE_SHA1
                case LDNS_SHA1:
                        return SHA1_LENGTH;
+#endif
 #ifdef USE_SHA2
                case LDNS_SHA256:
                        return SHA256_LENGTH;
@@ -729,9 +760,11 @@ secalgo_ds_digest(int algo, unsigned char* buf, size_t len,
 {
        /* uses libNSS */
        switch(algo) {
+#ifdef USE_SHA1
                case LDNS_SHA1:
                        return HASH_HashBuf(HASH_AlgSHA1, res, buf, len)
                                == SECSuccess;
+#endif
 #if defined(USE_SHA2)
                case LDNS_SHA256:
                        return HASH_HashBuf(HASH_AlgSHA256, res, buf, len)
@@ -759,12 +792,15 @@ dnskey_algo_id_is_supported(int id)
        case LDNS_RSAMD5:
                /* RFC 6725 deprecates RSAMD5 */
                return 0;
-#ifdef USE_DSA
+#if defined(USE_SHA1) || defined(USE_SHA2)
+#if defined(USE_DSA) && defined(USE_SHA1)
        case LDNS_DSA:
        case LDNS_DSA_NSEC3:
 #endif
+#ifdef USE_SHA1
        case LDNS_RSASHA1:
        case LDNS_RSASHA1_NSEC3:
+#endif
 #ifdef USE_SHA2
        case LDNS_RSASHA256:
 #endif
@@ -772,6 +808,8 @@ dnskey_algo_id_is_supported(int id)
        case LDNS_RSASHA512:
 #endif
                return 1;
+#endif /* SHA1 or SHA2 */
+
 #ifdef USE_ECDSA
        case LDNS_ECDSAP256SHA256:
        case LDNS_ECDSAP384SHA384:
@@ -1003,7 +1041,9 @@ nss_setup_key_digest(int algo, SECKEYPublicKey** pubkey, HASH_HashType* htype,
        */
 
        switch(algo) {
-#ifdef USE_DSA
+
+#if defined(USE_SHA1) || defined(USE_SHA2)
+#if defined(USE_DSA) && defined(USE_SHA1)
                case LDNS_DSA:
                case LDNS_DSA_NSEC3:
                        *pubkey = nss_buf2dsa(key, keylen);
@@ -1015,8 +1055,10 @@ nss_setup_key_digest(int algo, SECKEYPublicKey** pubkey, HASH_HashType* htype,
                        /* no prefix for DSA verification */
                        break;
 #endif
+#ifdef USE_SHA1
                case LDNS_RSASHA1:
                case LDNS_RSASHA1_NSEC3:
+#endif
 #ifdef USE_SHA2
                case LDNS_RSASHA256:
 #endif
@@ -1043,13 +1085,22 @@ nss_setup_key_digest(int algo, SECKEYPublicKey** pubkey, HASH_HashType* htype,
                                *prefixlen = sizeof(p_sha512);
                        } else
 #endif
+#ifdef USE_SHA1
                        {
                                *htype = HASH_AlgSHA1;
                                *prefix = p_sha1;
                                *prefixlen = sizeof(p_sha1);
                        }
+#else
+                       {
+                               verbose(VERB_QUERY, "verify: no digest algo");
+                               return 0;
+                       }
+#endif
 
                        break;
+#endif /* SHA1 or SHA2 */
+
                case LDNS_RSAMD5:
                        *pubkey = nss_buf2rsa(key, keylen);
                        if(!*pubkey) {
@@ -1131,7 +1182,7 @@ verify_canonrrset(sldns_buffer* buf, int algo, unsigned char* sigblock,
                return sec_status_bogus;
        }
 
-#ifdef USE_DSA
+#if defined(USE_DSA) && defined(USE_SHA1)
        /* need to convert DSA, ECDSA signatures? */
        if((algo == LDNS_DSA || algo == LDNS_DSA_NSEC3)) {
                if(sigblock_len == 1+2*SHA1_LENGTH) {
@@ -1312,7 +1363,12 @@ ds_digest_size_supported(int algo)
 {
        switch(algo) {
                case LDNS_SHA1:
+#ifdef USE_SHA1
                        return SHA1_DIGEST_SIZE;
+#else
+                       if(fake_sha1) return 20;
+                       return 0;
+#endif
 #ifdef USE_SHA2
                case LDNS_SHA256:
                        return SHA256_DIGEST_SIZE;
@@ -1334,8 +1390,10 @@ secalgo_ds_digest(int algo, unsigned char* buf, size_t len,
        unsigned char* res)
 {
        switch(algo) {
+#ifdef USE_SHA1
                case LDNS_SHA1:
                        return _digest_nettle(SHA1_DIGEST_SIZE, buf, len, res);
+#endif
 #if defined(USE_SHA2)
                case LDNS_SHA256:
                        return _digest_nettle(SHA256_DIGEST_SIZE, buf, len, res);
@@ -1359,12 +1417,14 @@ dnskey_algo_id_is_supported(int id)
 {
        /* uses libnettle */
        switch(id) {
-#ifdef USE_DSA
+#if defined(USE_DSA) && defined(USE_SHA1)
        case LDNS_DSA:
        case LDNS_DSA_NSEC3:
 #endif
+#ifdef USE_SHA1
        case LDNS_RSASHA1:
        case LDNS_RSASHA1_NSEC3:
+#endif
 #ifdef USE_SHA2
        case LDNS_RSASHA256:
        case LDNS_RSASHA512:
@@ -1381,7 +1441,7 @@ dnskey_algo_id_is_supported(int id)
        }
 }
 
-#ifdef USE_DSA
+#if defined(USE_DSA) && defined(USE_SHA1)
 static char *
 _verify_nettle_dsa(sldns_buffer* buf, unsigned char* sigblock,
        unsigned int sigblock_len, unsigned char* key, unsigned int keylen)
@@ -1641,7 +1701,7 @@ verify_canonrrset(sldns_buffer* buf, int algo, unsigned char* sigblock,
        }
 
        switch(algo) {
-#ifdef USE_DSA
+#if defined(USE_DSA) && defined(USE_SHA1)
        case LDNS_DSA:
        case LDNS_DSA_NSEC3:
                *reason = _verify_nettle_dsa(buf, sigblock, sigblock_len, key, keylen);
@@ -1651,9 +1711,11 @@ verify_canonrrset(sldns_buffer* buf, int algo, unsigned char* sigblock,
                        return sec_status_secure;
 #endif /* USE_DSA */
 
+#ifdef USE_SHA1
        case LDNS_RSASHA1:
        case LDNS_RSASHA1_NSEC3:
                digest_size = (digest_size ? digest_size : SHA1_DIGEST_SIZE);
+#endif
 #ifdef USE_SHA2
        case LDNS_RSASHA256:
                digest_size = (digest_size ? digest_size : SHA256_DIGEST_SIZE);

diff --git a/validator/val_sigcrypt.c b/validator/val_sigcrypt.c
index b0b2e970ff259d7102e5d3018ecf1d85e240ec61..25278a8f3ac0fd0500622143cfd0d49a100dde0f 100644 (file)
--- a/validator/val_sigcrypt.c
+++ b/validator/val_sigcrypt.c
@@ -51,6 +51,7 @@
 #include "util/module.h"
 #include "util/net_help.h"
 #include "util/regional.h"
+#include "util/config_file.h"
 #include "sldns/keyraw.h"
 #include "sldns/sbuffer.h"
 #include "sldns/parseutil.h"
@@ -318,12 +319,17 @@ int ds_digest_match_dnskey(struct module_env* env,
        size_t dslen;
        uint8_t* digest; /* generated digest */
        size_t digestlen = ds_digest_size_algo(ds_rrset, ds_idx);
-       
+
        if(digestlen == 0) {
                verbose(VERB_QUERY, "DS fail: not supported, or DS RR "
                        "format error");
                return 0; /* not supported, or DS RR format error */
        }
+#ifndef USE_SHA1
+       if(fake_sha1 && ds_get_digest_algo(ds_rrset, ds_idx)==LDNS_SHA1)
+               return 1;
+#endif
+       
        /* check digest length in DS with length from hash function */
        ds_get_sigdata(ds_rrset, ds_idx, &ds, &dslen);
        if(!ds || dslen != digestlen) {