oss-fuzz: Improve interaction with fuzzing tools and add new tests in fuzz/ directory

diff --git a/Makefile.in b/Makefile.in
index 22bba8b90b8e4d7139b48f87e73849263800e9d6..d12d839f712884b31cf038b045e7c530f4041f59 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -14,7 +14,7 @@ top_builddir =  @top_builddir@
 
 VERSION=@BIND9_VERSION@
 
-SUBDIRS =      make unit lib bin doc
+SUBDIRS =      make unit lib fuzz bin doc
 TARGETS =
 PREREQS =      bind.keys.h
 
@@ -90,6 +90,7 @@ force-test: test-force
 
 test-force:
        status=0; \
+       (cd fuzz && ${MAKE} check) || status=1; \
        (cd bin/tests && ${MAKE} ${MAKEDEFS} test) || status=1; \
        (test -f ${top_builddir}/unit/unittest.sh && \
                $(SHELL) ${top_builddir}/unit/unittest.sh) || status=1; \

diff --git a/bin/dig/dig.c b/bin/dig/dig.c
index fbb0336396b7ff7c288d68b58dc42d13af2e7284..4249d308d2398440aded029cf44746439cb4c1e1 100644 (file)
--- a/bin/dig/dig.c
+++ b/bin/dig/dig.c
@@ -1008,7 +1008,7 @@ plus_option(char *option, bool is_batchfile,
                                                code = NULL;
                                                if (value != NULL) {
                                                        code = strtok_r(value,
-                                                                       ":",
+                                                                       ":",
                                                                        &last);
                                                }
                                                if (code == NULL) {

diff --git a/bin/named/fuzz.c b/bin/named/fuzz.c
index 04e1cc8cd0c7cae927c94156b76e2b09f1f2b159..5907877c2d4eb54d0d315021acb94fceed4eb088 100644 (file)
--- a/bin/named/fuzz.c
+++ b/bin/named/fuzz.c
@@ -36,10 +36,6 @@
 #include <unistd.h>
 #include <pthread.h>
 
-#ifndef __AFL_LOOP
-#error To use American Fuzzy Lop you have to set CC to afl-clang-fast!!!
-#endif
-
 /*
  * We are using pthreads directly because we might be using it with
  * unthreaded version of BIND, where all thread functions are
@@ -61,7 +57,6 @@ fuzz_thread_client(void *arg) {
        char *port;
        struct sockaddr_in servaddr;
        int sockfd;
-       int loop;
        void *buf;
 
        UNUSED(arg);
@@ -103,14 +98,18 @@ fuzz_thread_client(void *arg) {
         * Processing fuzzed packets 100,000 times before shutting down
         * the app.
         */
-       for (loop = 0; loop < 100000; loop++) {
+#ifdef __AFL_LOOP
+       for (int loop = 0; loop < 100000; loop++) {
+#else
+       {
+#endif
                ssize_t length;
                ssize_t sent;
 
                length = read(0, buf, 65536);
                if (length <= 0) {
                        usleep(1000000);
-                       continue;
+                       goto next;
                }
 
                /*
@@ -130,7 +129,7 @@ fuzz_thread_client(void *arg) {
                                return (NULL);
                        }
                        raise(SIGSTOP);
-                       continue;
+                       goto next;
                }
 
                RUNTIME_CHECK(pthread_mutex_lock(&mutex) == 0);
@@ -151,6 +150,7 @@ fuzz_thread_client(void *arg) {
                        pthread_cond_wait(&cond, &mutex);
 
                RUNTIME_CHECK(pthread_mutex_unlock(&mutex) == 0);
+       next: ;
        }
 
        free(buf);
@@ -586,6 +586,7 @@ fuzz_thread_resolver(void *arg) {
        named_server_flushonshutdown(named_g_server, false);
        isc_app_shutdown();
 
+#ifdef __AFL_LOOP
        /*
         * This is here just for the signature, that's how AFL detects
         * if it's a 'persistent mode' binary. It has to occur somewhere
@@ -594,6 +595,7 @@ fuzz_thread_resolver(void *arg) {
         * in persistent mode if it's present.
         */
        __AFL_LOOP(0);
+#endif
 
        return (NULL);
 }

diff --git a/configure b/configure
index 1b6e7980cb2c99e789c56492aa510f1e2746c036..548e569f8a554c16d0b9a21ef1b67d57c8369671 100755 (executable)
--- a/configure
+++ b/configure
@@ -952,7 +952,7 @@ enable_buffer_useinline
 enable_warn_shadow
 enable_warn_error
 enable_developer
-enable_afl
+enable_fuzzing
 with_python
 with_python_install_dir
 enable_kqueue
@@ -1657,7 +1657,9 @@ Optional Features:
   --enable-warn-shadow    turn on -Wshadow when compiling
   --enable-warn-error     turn on -Werror when compiling
   --enable-developer      enable developer build settings
-  --enable-afl            enable American Fuzzy Lop test harness [default=no]
+  --enable-fuzzing=<afl|libfuzzer>
+                          Enable fuzzing using American Fuzzy Lop or libFuzzer
+                          (default=no)
   --enable-kqueue         use BSD kqueue when available [default=yes]
   --enable-epoll          use Linux epoll when available [default=auto]
   --enable-devpoll        use /dev/poll when available [default=yes]
@@ -12082,14 +12084,67 @@ yes)
 esac
 
 
-# American Fuzzy Lop
-# Check whether --enable-afl was given.
-if test "${enable_afl+set}" = set; then :
-  enableval=$enable_afl;
+# Check whether --enable-fuzzing was given.
+if test "${enable_fuzzing+set}" = set; then :
+  enableval=$enable_fuzzing;
+else
+  enable_fuzzing=no
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable fuzzing mode" >&5
+$as_echo_n "checking whether to enable fuzzing mode... " >&6; }
+case $enable_fuzzing in #(
+  no) :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; } ;; #(
+  afl) :
+
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: using AFL" >&5
+$as_echo "using AFL" >&6; }
+
 $as_echo "#define ENABLE_AFL 1" >>confdefs.h
 
+         CFLAGS="$CFLAGS -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION=1"
+         LIBS="$LIBS -lpthread" ;; #(
+  libfuzzer) :
+
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: using libFuzzer" >&5
+$as_echo "using libFuzzer" >&6; }
+         CFLAGS="$CFLAGS -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION=1 -fsanitize=fuzzer,address,undefined"
+         LDFLAGS="$LDFLAGS -fsanitize=fuzzer,address,undefined" ;; #(
+  *) :
+    as_fn_error $? "You need to explicitly select the fuzzer" "$LINENO" 5 ;; #(
+  *) :
+     ;;
+esac
+
+if test "$enable_fuzzing" = "afl"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking \"for AFL enabled compiler\"" >&5
+$as_echo_n "checking \"for AFL enabled compiler\"... " >&6; }
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __AFL_COMPILER
+                                          #error AFL compiler required
+                                          #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  as_fn_error $? "set CC=afl-<gcc|clang> when --enable-fuzzing=afl is used" "$LINENO" 5
 fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
+fi
 
 #
 # Make very sure that these are the first files processed by
@@ -23663,7 +23718,7 @@ ac_config_commands="$ac_config_commands chmod"
 # elsewhere if there's a good reason for doing so.
 #
 
-ac_config_files="$ac_config_files make/Makefile make/mkdep Makefile bin/Makefile bin/check/Makefile bin/confgen/Makefile bin/confgen/unix/Makefile bin/delv/Makefile bin/dig/Makefile bin/dnssec/Makefile bin/named/Makefile bin/named/unix/Makefile bin/nsupdate/Makefile bin/pkcs11/Makefile bin/python/Makefile bin/python/isc/Makefile bin/python/isc/utils.py bin/python/isc/tests/Makefile bin/python/dnssec-checkds.py bin/python/dnssec-coverage.py bin/python/dnssec-keymgr.py bin/python/isc/__init__.py bin/python/isc/checkds.py bin/python/isc/coverage.py bin/python/isc/dnskey.py bin/python/isc/eventlist.py bin/python/isc/keydict.py bin/python/isc/keyevent.py bin/python/isc/keymgr.py bin/python/isc/keyseries.py bin/python/isc/keyzone.py bin/python/isc/policy.py bin/python/isc/rndc.py bin/python/isc/tests/dnskey_test.py bin/python/isc/tests/policy_test.py bin/rndc/Makefile bin/tests/Makefile bin/tests/headerdep_test.sh bin/tests/optional/Makefile bin/tests/pkcs11/Makefile bin/tests/pkcs11/benchmarks/Makefile bin/tests/system/Makefile bin/tests/system/conf.sh bin/tests/system/dlz/prereq.sh bin/tests/system/dlzexternal/Makefile bin/tests/system/dlzexternal/ns1/dlzs.conf bin/tests/system/dyndb/Makefile bin/tests/system/dyndb/driver/Makefile bin/tests/system/inline/checkdsa.sh bin/tests/system/pipelined/Makefile bin/tests/system/rndc/Makefile bin/tests/system/rpz/Makefile bin/tests/system/rsabigexponent/Makefile bin/tests/system/tkey/Makefile bin/tests/virtual-time/Makefile bin/tests/virtual-time/conf.sh bin/tools/Makefile contrib/scripts/check-secure-delegation.pl contrib/scripts/zone-edit.sh doc/Makefile doc/arm/Makefile doc/arm/noteversion.xml doc/arm/pkgversion.xml doc/arm/releaseinfo.xml doc/doxygen/Doxyfile doc/doxygen/Makefile doc/doxygen/doxygen-input-filter doc/misc/Makefile doc/tex/Makefile doc/tex/armstyle.sty doc/xsl/Makefile doc/xsl/isc-docbook-chunk.xsl doc/xsl/isc-docbook-html.xsl doc/xsl/isc-manpage.xsl doc/xsl/isc-notes-html.xsl isc-config.sh lib/Makefile lib/bind9/Makefile lib/bind9/include/Makefile lib/bind9/include/bind9/Makefile lib/dns/Makefile lib/dns/include/Makefile lib/dns/include/dns/Makefile lib/dns/include/dst/Makefile lib/dns/tests/Makefile lib/irs/Makefile lib/irs/include/Makefile lib/irs/include/irs/Makefile lib/irs/include/irs/netdb.h lib/irs/include/irs/platform.h lib/irs/tests/Makefile lib/isc/$arch/Makefile lib/isc/$arch/include/Makefile lib/isc/$arch/include/isc/Makefile lib/isc/pthreads/Makefile lib/isc/pthreads/include/Makefile lib/isc/pthreads/include/isc/Makefile lib/isc/Makefile lib/isc/include/Makefile lib/isc/include/isc/Makefile lib/isc/include/isc/platform.h lib/isc/include/pk11/Makefile lib/isc/include/pkcs11/Makefile lib/isc/tests/Makefile lib/isc/nls/Makefile lib/isc/unix/Makefile lib/isc/unix/include/Makefile lib/isc/unix/include/isc/Makefile lib/isc/unix/include/pkcs11/Makefile lib/isccc/Makefile lib/isccc/include/Makefile lib/isccc/include/isccc/Makefile lib/isccfg/Makefile lib/isccfg/include/Makefile lib/isccfg/include/isccfg/Makefile lib/isccfg/tests/Makefile lib/ns/Makefile lib/ns/include/Makefile lib/ns/include/ns/Makefile lib/ns/tests/Makefile lib/samples/Makefile lib/samples/Makefile-postinstall unit/Makefile unit/unittest.sh"
+ac_config_files="$ac_config_files make/Makefile make/mkdep Makefile bin/Makefile bin/check/Makefile bin/confgen/Makefile bin/confgen/unix/Makefile bin/delv/Makefile bin/dig/Makefile bin/dnssec/Makefile bin/named/Makefile bin/named/unix/Makefile bin/nsupdate/Makefile bin/pkcs11/Makefile bin/python/Makefile bin/python/isc/Makefile bin/python/isc/utils.py bin/python/isc/tests/Makefile bin/python/dnssec-checkds.py bin/python/dnssec-coverage.py bin/python/dnssec-keymgr.py bin/python/isc/__init__.py bin/python/isc/checkds.py bin/python/isc/coverage.py bin/python/isc/dnskey.py bin/python/isc/eventlist.py bin/python/isc/keydict.py bin/python/isc/keyevent.py bin/python/isc/keymgr.py bin/python/isc/keyseries.py bin/python/isc/keyzone.py bin/python/isc/policy.py bin/python/isc/rndc.py bin/python/isc/tests/dnskey_test.py bin/python/isc/tests/policy_test.py bin/rndc/Makefile bin/tests/Makefile bin/tests/headerdep_test.sh bin/tests/optional/Makefile bin/tests/pkcs11/Makefile bin/tests/pkcs11/benchmarks/Makefile bin/tests/system/Makefile bin/tests/system/conf.sh bin/tests/system/dlz/prereq.sh bin/tests/system/dlzexternal/Makefile bin/tests/system/dlzexternal/ns1/dlzs.conf bin/tests/system/dyndb/Makefile bin/tests/system/dyndb/driver/Makefile bin/tests/system/inline/checkdsa.sh bin/tests/system/pipelined/Makefile bin/tests/system/rndc/Makefile bin/tests/system/rpz/Makefile bin/tests/system/rsabigexponent/Makefile bin/tests/system/tkey/Makefile bin/tests/virtual-time/Makefile bin/tests/virtual-time/conf.sh bin/tools/Makefile contrib/scripts/check-secure-delegation.pl contrib/scripts/zone-edit.sh doc/Makefile doc/arm/Makefile doc/arm/noteversion.xml doc/arm/pkgversion.xml doc/arm/releaseinfo.xml doc/doxygen/Doxyfile doc/doxygen/Makefile doc/doxygen/doxygen-input-filter doc/misc/Makefile doc/tex/Makefile doc/tex/armstyle.sty doc/xsl/Makefile doc/xsl/isc-docbook-chunk.xsl doc/xsl/isc-docbook-html.xsl doc/xsl/isc-manpage.xsl doc/xsl/isc-notes-html.xsl isc-config.sh lib/Makefile lib/bind9/Makefile lib/bind9/include/Makefile lib/bind9/include/bind9/Makefile lib/dns/Makefile lib/dns/include/Makefile lib/dns/include/dns/Makefile lib/dns/include/dst/Makefile lib/dns/tests/Makefile lib/irs/Makefile lib/irs/include/Makefile lib/irs/include/irs/Makefile lib/irs/include/irs/netdb.h lib/irs/include/irs/platform.h lib/irs/tests/Makefile lib/isc/$arch/Makefile lib/isc/$arch/include/Makefile lib/isc/$arch/include/isc/Makefile lib/isc/pthreads/Makefile lib/isc/pthreads/include/Makefile lib/isc/pthreads/include/isc/Makefile lib/isc/Makefile lib/isc/include/Makefile lib/isc/include/isc/Makefile lib/isc/include/isc/platform.h lib/isc/include/pk11/Makefile lib/isc/include/pkcs11/Makefile lib/isc/tests/Makefile lib/isc/nls/Makefile lib/isc/unix/Makefile lib/isc/unix/include/Makefile lib/isc/unix/include/isc/Makefile lib/isc/unix/include/pkcs11/Makefile lib/isccc/Makefile lib/isccc/include/Makefile lib/isccc/include/isccc/Makefile lib/isccfg/Makefile lib/isccfg/include/Makefile lib/isccfg/include/isccfg/Makefile lib/isccfg/tests/Makefile lib/ns/Makefile lib/ns/include/Makefile lib/ns/include/ns/Makefile lib/ns/tests/Makefile lib/samples/Makefile lib/samples/Makefile-postinstall unit/Makefile unit/unittest.sh fuzz/Makefile"
 
 
 #
@@ -24789,6 +24844,7 @@ do
     "lib/samples/Makefile-postinstall") CONFIG_FILES="$CONFIG_FILES lib/samples/Makefile-postinstall" ;;
     "unit/Makefile") CONFIG_FILES="$CONFIG_FILES unit/Makefile" ;;
     "unit/unittest.sh") CONFIG_FILES="$CONFIG_FILES unit/unittest.sh" ;;
+    "fuzz/Makefile") CONFIG_FILES="$CONFIG_FILES fuzz/Makefile" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac

diff --git a/configure.in b/configure.in
index f386acb9a1da1288895a057399046941f0b7f15a..da283583a8c07ead95a017f4385e656b39361924 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -98,13 +98,37 @@ yes)
 esac
 AC_SUBST(XTARGETS)
 
-# American Fuzzy Lop
-AC_ARG_ENABLE(afl,
-             AS_HELP_STRING([--enable-afl],
-                            [enable American Fuzzy Lop test harness
-                               [default=no]]),
-             [AC_DEFINE([ENABLE_AFL], [1],
-                        [Define to enable American Fuzzy Lop test harness])])
+AC_ARG_ENABLE([fuzzing],
+             [AS_HELP_STRING([--enable-fuzzing=<afl|libfuzzer>],
+                             [Enable fuzzing using American Fuzzy Lop or libFuzzer (default=no)])],
+             [],
+             [enable_fuzzing=no])
+
+AC_MSG_CHECKING([whether to enable fuzzing mode])
+AS_CASE([$enable_fuzzing],
+       [no],[AC_MSG_RESULT([no])],
+       [afl],[
+         AC_MSG_RESULT([using AFL])
+         AC_DEFINE([ENABLE_AFL], [1],
+                   [Define to enable American Fuzzy Lop test harness])
+         CFLAGS="$CFLAGS -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION=1"
+         LIBS="$LIBS -lpthread"],
+       [libfuzzer],[
+         AC_MSG_RESULT([using libFuzzer])
+         CFLAGS="$CFLAGS -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION=1 -fsanitize=fuzzer,address,undefined"
+         LDFLAGS="$LDFLAGS -fsanitize=fuzzer,address,undefined"],
+       [*],[AC_MSG_ERROR([You need to explicitly select the fuzzer])])
+
+AS_IF([test "$enable_fuzzing" = "afl"],
+      [AC_MSG_CHECKING("for AFL enabled compiler")
+       AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],
+                                         [#ifndef __AFL_COMPILER
+                                          #error AFL compiler required
+                                          #endif
+                                         ])],
+                        [AC_MSG_RESULT([yes])],
+                        [AC_MSG_ERROR([set CC=afl-<gcc|clang> when --enable-fuzzing=afl is used])])
+      ])
 
 #
 # Make very sure that these are the first files processed by
@@ -4332,6 +4356,7 @@ AC_CONFIG_FILES([
        lib/samples/Makefile-postinstall
        unit/Makefile
        unit/unittest.sh
+       fuzz/Makefile
 ])
 
 #

diff --git a/fuzz/.gitignore b/fuzz/.gitignore
new file mode 100644 (file)
index 0000000..5148e33
--- /dev/null
+++ b/fuzz/.gitignore
@@ -0,0 +1,3 @@
+/*.dSYM/
+dns_name_fromtext_target
+/*.out/

diff --git a/fuzz/FUZZING.md b/fuzz/FUZZING.md
new file mode 100644 (file)
index 0000000..cccf41f
--- /dev/null
+++ b/fuzz/FUZZING.md
@@ -0,0 +1,24 @@
+= Fuzzing
+
+The tests in this directory can be operated in three modes:
+
+* non-fuzzing - the test just runs over all input located in `<test_name>.in/`
+  directory by compiling with mock main.c that walks through the directory and
+  runs `LLVMFuzzerTestOneInput()` over the input files
+* AFL - `./configure --with-fuzzing=afl` will either feed the stdin to
+  `LLVMFuzzerTestOneInput()` or run the `__AFL_LOOP(10000)` if compiled with
+  `afl-clang-fast`
+* LibFuzzer - `./configure --with-fuzzing=libfuzzer` will disable `main.c`
+  completely and it uses the standard LibFuzzer mechanims to feed
+  `LLVMFuzzerTestOneInput` with the fuzzer
+
+== Test Cases
+
+Each test case should be called descriptively and the executable target must
+link `testcase.o` and `main.o` and the `test_case.c` must have a function
+`LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)`.
+
+== Adding more fuzzers
+
+To add a different fuzzer, `main.c` must be modified to include `main()` function
+for a specific fuzzer (or no function as is case with LibFuzzer).

diff --git a/fuzz/Makefile.in b/fuzz/Makefile.in
new file mode 100644 (file)
index 0000000..ccefcf3
--- /dev/null
+++ b/fuzz/Makefile.in
@@ -0,0 +1,39 @@
+srcdir =       @srcdir@
+VPATH =                @srcdir@
+top_srcdir =   @top_srcdir@
+abs_srcdir =   @abs_srcdir@
+
+@BIND9_MAKE_INCLUDES@
+
+CINCLUDES =    -I. -I.. ${DNS_INCLUDES} ${ISC_INCLUDES} \
+               @OPENSSL_INCLUDES@
+CDEFINES =     -DFUZZDIR=\"$(abs_srcdir)\"
+
+ISCLIBS =      ../lib/isc/libisc.@A@ @OPENSSL_LIBS@
+ISCDEPLIBS =   ../lib/isc/libisc.@A@
+DNSLIBS =      ../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
+DNSDEPLIBS =   ../lib/dns/libdns.@A@
+
+LIBS =         @LIBS@
+
+OBJS =         main.@O@
+SRCS =         main.c dns_name_fromtext_target.c
+
+SUBDIRS =
+TARGETS =      dns_name_fromtext_target@EXEEXT@
+
+@BIND9_MAKE_RULES@
+
+dns_name_fromtext_target@EXEEXT@: dns_name_fromtext_target.@O@ main.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
+       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
+               dns_name_fromtext_target.@O@ main.@O@ ${DNSLIBS} ${ISCLIBS} ${LIBS}
+
+check: ${TARGETS}
+       for fuzzer in ${TARGETS}; do \
+               ./$${fuzzer} \
+       done
+
+oss-fuzz: ${TARGETS}
+
+clean distclean::
+       rm -f ${TARGETS}

diff --git a/fuzz/dns_name_fromtext_target.c b/fuzz/dns_name_fromtext_target.c
new file mode 100644 (file)
index 0000000..9fe52bf
--- /dev/null
+++ b/fuzz/dns_name_fromtext_target.c
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
+ */
+
+#include <stddef.h>
+#include <stdint.h>
+#include <isc/buffer.h>
+#include <isc/util.h>
+#include <dns/fixedname.h>
+#include <dns/name.h>
+
+int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size);
+
+int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
+{
+    isc_buffer_t buf;
+    isc_result_t result;
+    dns_fixedname_t origin;
+    char *de_const;
+
+    if (size < 5) {
+           return 0;
+    }
+
+    dns_fixedname_init(&origin);
+    DE_CONST(data, de_const);
+    isc_buffer_init(&buf, (void *)de_const, size);
+    isc_buffer_add(&buf, size);
+    result = dns_name_fromtext(dns_fixedname_name(&origin), &buf, dns_rootname, 0, NULL);
+    UNUSED(result);
+    return 0;
+}

diff --git a/fuzz/dns_name_fromtext_target.in/example.com b/fuzz/dns_name_fromtext_target.in/example.com
new file mode 100644 (file)
index 0000000..de54ac6
--- /dev/null
+++ b/fuzz/dns_name_fromtext_target.in/example.com
@@ -0,0 +1 @@
+example.com

diff --git a/fuzz/fuzz.h b/fuzz/fuzz.h
new file mode 100644 (file)
index 0000000..500e3ed
--- /dev/null
+++ b/fuzz/fuzz.h
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
+ */
+
+#include <config.h>
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+
+#include <isc/lang.h>
+#include <isc/mem.h>
+#include <isc/once.h>
+#include <isc/types.h>
+#include <isc/util.h>
+
+#include <dst/dst.h>
+
+ISC_LANG_BEGINDECLS
+
+int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size);
+
+static isc_mem_t *mctx = NULL;
+
+static void __attribute__((constructor)) init(void) {
+       RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS);
+       RUNTIME_CHECK(dst_lib_init(mctx, NULL) == ISC_R_SUCCESS);
+}
+
+static void __attribute__((destructor)) deinit(void)
+{
+       dst_lib_destroy();
+       isc_mem_destroy(&mctx);
+}
+
+ISC_LANG_ENDDECLS

diff --git a/fuzz/main.c b/fuzz/main.c
new file mode 100644 (file)
index 0000000..b6aef95
--- /dev/null
+++ b/fuzz/main.c
@@ -0,0 +1,140 @@
+/*
+ * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
+ */
+
+#include <config.h>
+
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <sys/stat.h>
+
+#include "fuzz.h"
+
+#ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
+
+#include <dirent.h>
+
+static void test_all_from(const char *dirname)
+{
+       DIR *dirp;
+       struct dirent *dp;
+
+       dirp = opendir(dirname);
+       if (dirp == NULL) {
+               return;
+       }
+
+       while ((dp = readdir(dirp)) != NULL) {
+               char filename[strlen(dirname) + strlen(dp->d_name) + 2];
+               int fd;
+               struct stat st;
+               char *data;
+               ssize_t n;
+
+               if (dp->d_name[0] == '.') {
+                       continue;
+               }
+               snprintf(filename, sizeof(filename), "%s/%s",
+                        dirname, dp->d_name);
+
+               if ((fd = open(filename, O_RDONLY)) == -1) {
+                       fprintf(stderr, "Failed to open %s: %s\n", filename,
+                               strerror(errno));
+                       continue;
+               }
+
+               if (fstat(fd, &st) != 0) {
+                       fprintf(stderr, "Failed to stat %s: %s\n", filename,
+                               strerror(errno));
+                       goto closefd;
+               }
+
+               data = malloc(st.st_size);
+               n = read(fd, data, st.st_size);
+               if (n == st.st_size) {
+                       printf("testing %zd bytes from %s\n",
+                              n, filename);
+                       fflush(stdout);
+                       LLVMFuzzerTestOneInput((const uint8_t *)data, n);
+                       fflush(stderr);
+               } else {
+                       if (n < 0) {
+                               fprintf(stderr,
+                                       "Failed to read %zd bytes from %s: %s\n",
+                                       (ssize_t) st.st_size, filename,
+                                       strerror(errno));
+                       } else {
+                               fprintf(stderr,
+                                       "Failed to read %zd bytes from %s"
+                                       ", got %zd\n",
+                                       (ssize_t) st.st_size, filename,
+                                       n);
+                       }
+               }
+               free(data);
+       closefd:
+               close(fd);
+       }
+
+       closedir(dirp);
+}
+
+int main(int argc, char **argv)
+{
+       char corpusdir[PATH_MAX];
+       const char *target = strrchr(argv[0], '/');
+
+       UNUSED(argc);
+       UNUSED(argv);
+
+       target = target ? target + 1 : argv[0];
+       if (strncmp(target, "lt-", 3) == 0) {
+               target += 3;
+       }
+
+       snprintf(corpusdir, sizeof(corpusdir), FUZZDIR "/%s.in", target);
+
+       test_all_from(corpusdir);
+
+       return 0;
+}
+
+#elif __AFL_COMPILER
+
+int main(int argc, char **argv)
+{
+       int ret;
+       unsigned char buf[64 * 1024];
+
+       UNUSED(argc);
+       UNUSED(argv);
+
+#ifdef __AFL_LOOP
+       while (__AFL_LOOP(10000)) { // only works with afl-clang-fast
+#else
+       {
+#endif
+               ret = fread(buf, 1, sizeof(buf), stdin);
+               if (ret < 0) {
+                       return 0;
+               }
+
+               LLVMFuzzerTestOneInput(buf, ret);
+       }
+
+       return 0;
+}
+
+#endif /* FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION */

diff --git a/lib/isc/random.c b/lib/isc/random.c
index f07c70735d8527f7764ed7db2cec0f3de6a5ee79..63b84cd46f6b95c773a684316b3f6e7db80f4f2a 100644 (file)
--- a/lib/isc/random.c
+++ b/lib/isc/random.c
@@ -66,7 +66,11 @@ static isc_once_t isc_random_once = ISC_ONCE_INIT;
 
 static void
 isc_random_initialize(void) {
+#if FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
+       memset(seed, 0, sizeof(seed));
+#else
        isc_entropy_get(seed, sizeof(seed));
+#endif
 }
 
 uint8_t

diff --git a/util/copyrights b/util/copyrights
index b66f04dcb34570546160736ecc678f3c94599ac0..5aecc894262d71f1ac4a588fc3a14eea01040fcf 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -1,28 +1,18 @@
 ./.gitattributes                               X       2015,2017,2018
 ./.gitlab-ci.yml                               X       2018
-./.gitlab/issue_templates/Bug.md               X       2018
-./.gitlab/issue_templates/Feature_Request.md   X       2018
 ./Atffile                                      X       2011,2018
 ./CHANGES                                      X       2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./CONTRIBUTING                                 X       2017,2018
-./CONTRIBUTING.md                              MKD     2017,2018
 ./COPYRIGHT                                    TXT.TOP 1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./HISTORY                                      X       2010,2013,2016,2017,2018
-./HISTORY.md                                   MKD     2017,2018
 ./Kyuafile                                     X       2017,2018
 ./LICENSE                                      X       2016,2018
-./Makefile.in                                  MAKE    1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017,2018
 ./OPTIONS                                      X       2017,2018
-./OPTIONS.md                                   MKD     2017,2018
 ./PLATFORMS                                    X       2018
-./PLATFORMS.md                                 MKD     2018
 ./README                                       X       1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./README.md                                    MKD     2017,2018
 ./acconfig.h                                   C       1999,2000,2001,2002,2003,2004,2005,2007,2008,2012,2014,2016,2018
 ./aclocal.m4                                   X       1999,2000,2001,2012,2014,2018
 ./autogen.sh                                   SH      2015,2016,2018
-./bin/Makefile.in                              MAKE    1998,1999,2000,2001,2004,2007,2009,2012,2013,2014,2016,2018
-./bin/check/Makefile.in                                MAKE    2000,2001,2002,2003,2004,2005,2006,2007,2009,2012,2014,2015,2016,2017,2018
 ./bin/check/check-tool.c                       C       2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/check/check-tool.h                       C       2000,2001,2002,2004,2005,2007,2010,2011,2013,2014,2016,2018
 ./bin/check/named-checkconf.8                  MAN     DOCBOOK
@@ -42,7 +32,6 @@
 ./bin/check/win32/checkzone.vcxproj.filters.in X       2013,2015,2018
 ./bin/check/win32/checkzone.vcxproj.in         X       2013,2014,2015,2016,2017,2018
 ./bin/check/win32/checkzone.vcxproj.user       X       2013,2018
-./bin/confgen/Makefile.in                      MAKE    2009,2012,2014,2015,2016,2017,2018
 ./bin/confgen/ddns-confgen.8                   MAN     DOCBOOK
 ./bin/confgen/ddns-confgen.c                   C       2009,2011,2014,2016,2018
 ./bin/confgen/ddns-confgen.docbook             SGML    2009,2014,2015,2016,2018
@@ -54,7 +43,6 @@
 ./bin/confgen/rndc-confgen.c                   C       2001,2003,2004,2005,2007,2008,2009,2011,2013,2014,2016,2017,2018
 ./bin/confgen/rndc-confgen.docbook             SGML    2001,2003,2004,2005,2007,2009,2013,2014,2015,2016,2017,2018
 ./bin/confgen/rndc-confgen.html                        HTML    DOCBOOK
-./bin/confgen/unix/Makefile.in                 MAKE    2009,2012,2016,2018
 ./bin/confgen/unix/os.c                                C       2009,2016,2018
 ./bin/confgen/util.c                           C       2009,2015,2016,2018
 ./bin/confgen/util.h                           C       2009,2016,2018
@@ -68,7 +56,6 @@
 ./bin/confgen/win32/rndcconfgen.vcxproj.filters.in     X       2013,2015,2018
 ./bin/confgen/win32/rndcconfgen.vcxproj.in     X       2013,2015,2016,2017,2018
 ./bin/confgen/win32/rndcconfgen.vcxproj.user   X       2013,2018
-./bin/delv/Makefile.in                         MAKE    2014,2015,2016,2017,2018
 ./bin/delv/delv.1                              MAN     DOCBOOK
 ./bin/delv/delv.c                              C       2014,2015,2016,2017,2018
 ./bin/delv/delv.docbook                                SGML    2014,2015,2016,2017,2018
@@ -76,7 +63,6 @@
 ./bin/delv/win32/delv.vcxproj.filters.in       X       2014,2015,2018
 ./bin/delv/win32/delv.vcxproj.in               X       2014,2015,2016,2017,2018
 ./bin/delv/win32/delv.vcxproj.user             X       2014,2018
-./bin/dig/Makefile.in                          MAKE    2000,2001,2002,2004,2005,2007,2009,2012,2013,2014,2015,2016,2017,2018
 ./bin/dig/dig.1                                        MAN     DOCBOOK
 ./bin/dig/dig.c                                        C       2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/dig/dig.docbook                          SGML    2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2013,2014,2015,2016,2017,2018
@@ -103,7 +89,6 @@
 ./bin/dig/win32/nslookup.vcxproj.filters.in    X       2013,2015,2018
 ./bin/dig/win32/nslookup.vcxproj.in            X       2013,2014,2015,2016,2017,2018
 ./bin/dig/win32/nslookup.vcxproj.user          X       2013,2018
-./bin/dnssec/Makefile.in                       MAKE    2000,2001,2002,2004,2005,2007,2008,2009,2012,2013,2014,2015,2016,2017,2018
 ./bin/dnssec/dnssec-cds.8                      MAN     DOCBOOK
 ./bin/dnssec/dnssec-cds.c                      C       2017,2018
 ./bin/dnssec/dnssec-cds.docbook                        SGML    2017,2018
@@ -169,7 +154,6 @@
 ./bin/dnssec/win32/verify.vcxproj.filters.in   X       2013,2015,2018
 ./bin/dnssec/win32/verify.vcxproj.in           X       2013,2014,2015,2016,2017,2018
 ./bin/dnssec/win32/verify.vcxproj.user         X       2013,2018
-./bin/named/Makefile.in                                MAKE    1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/named/bind9.xsl                          SGML    2006,2007,2008,2009,2012,2013,2014,2015,2016,2017,2018
 ./bin/named/bind9.xsl.h                                X       2007,2008,2009,2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/named/builtin.c                          C       2001,2002,2003,2004,2005,2007,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
@@ -209,7 +193,6 @@
 ./bin/named/statschannel.c                     C       2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/named/tkeyconf.c                         C       1999,2000,2001,2004,2005,2006,2007,2009,2010,2012,2014,2016,2017,2018
 ./bin/named/tsigconf.c                         C       1999,2000,2001,2004,2005,2006,2007,2009,2011,2012,2016,2017,2018
-./bin/named/unix/Makefile.in                   MAKE    1999,2000,2001,2004,2007,2009,2011,2012,2016,2018
 ./bin/named/unix/dlz_dlopen_driver.c           C       2011,2012,2013,2014,2016,2017,2018
 ./bin/named/unix/include/named/os.h            C       1999,2000,2001,2002,2004,2005,2007,2008,2009,2014,2016,2017,2018
 ./bin/named/unix/os.c                          C       1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2013,2014,2015,2016,2017,2018
@@ -222,7 +205,6 @@
 ./bin/named/win32/ntservice.c                  C       1999,2000,2001,2002,2004,2006,2007,2009,2011,2013,2014,2015,2016,2017,2018
 ./bin/named/win32/os.c                         C       1999,2000,2001,2002,2004,2005,2007,2008,2009,2012,2013,2014,2015,2016,2017,2018
 ./bin/named/zoneconf.c                         C       1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./bin/nsupdate/Makefile.in                     MAKE    2000,2001,2002,2004,2006,2007,2008,2009,2012,2013,2014,2015,2016,2017,2018
 ./bin/nsupdate/nsupdate.1                      MAN     DOCBOOK
 ./bin/nsupdate/nsupdate.c                      C       2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/nsupdate/nsupdate.docbook                        SGML    2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2014,2015,2016,2017,2018
@@ -230,7 +212,6 @@
 ./bin/nsupdate/win32/nsupdate.vcxproj.filters.in       X       2013,2015,2018
 ./bin/nsupdate/win32/nsupdate.vcxproj.in       X       2013,2014,2015,2016,2017,2018
 ./bin/nsupdate/win32/nsupdate.vcxproj.user     X       2013,2018
-./bin/pkcs11/Makefile.in                       MAKE    2009,2012,2014,2015,2016,2017,2018
 ./bin/pkcs11/pkcs11-destroy.8                  MAN     DOCBOOK
 ./bin/pkcs11/pkcs11-destroy.c                  X       2009,2010,2014,2015,2018
 ./bin/pkcs11/pkcs11-destroy.docbook            SGML    2009,2014,2015,2016,2018
@@ -259,7 +240,6 @@
 ./bin/pkcs11/win32/pk11tokens.vcxproj.filters.in       X       2014,2015,2018
 ./bin/pkcs11/win32/pk11tokens.vcxproj.in       X       2014,2015,2016,2017,2018
 ./bin/pkcs11/win32/pk11tokens.vcxproj.user     X       2014,2018
-./bin/python/Makefile.in                       MAKE    2012,2013,2014,2016,2017,2018
 ./bin/python/dnssec-checkds.8                  MAN     DOCBOOK
 ./bin/python/dnssec-checkds.docbook            SGML    2012,2013,2014,2015,2016,2017,2018
 ./bin/python/dnssec-checkds.html               HTML    DOCBOOK
@@ -272,7 +252,6 @@
 ./bin/python/dnssec-keymgr.docbook             SGML    2016,2017,2018
 ./bin/python/dnssec-keymgr.html                        HTML    DOCBOOK
 ./bin/python/dnssec-keymgr.py.in               PYTHON-BIN      2016,2017,2018
-./bin/python/isc/Makefile.in                   MAKE    2016,2018
 ./bin/python/isc/__init__.py.in                        PYTHON  2016,2018
 ./bin/python/isc/checkds.py.in                 PYTHON  2012,2013,2014,2015,2016,2017,2018
 ./bin/python/isc/coverage.py.in                        PYTHON  2013,2014,2015,2016,2017,2018
@@ -285,7 +264,6 @@
 ./bin/python/isc/keyzone.py.in                 PYTHON  2013,2014,2015,2016,2018
 ./bin/python/isc/policy.py.in                  PYTHON  2016,2017,2018
 ./bin/python/isc/rndc.py.in                    PYTHON  2016,2018
-./bin/python/isc/tests/Makefile.in             MAKE    2016,2018
 ./bin/python/isc/tests/dnskey_test.py.in       PYTHON  2016,2018
 ./bin/python/isc/tests/policy_test.py.in       PYTHON  2016,2017,2018
 ./bin/python/isc/tests/test-policies/01-keysize.pol    CONF-C  2016,2018
@@ -297,7 +275,6 @@
 ./bin/python/isc/tests/testdata/Kexample.com.+007+35529.private        X       2016,2018
 ./bin/python/isc/utils.py.in                   PYTHON  2016,2018
 ./bin/python/setup.py                          PYTHON  2016,2018
-./bin/rndc/Makefile.in                         MAKE    2000,2001,2002,2004,2007,2009,2012,2014,2015,2016,2017,2018
 ./bin/rndc/include/rndc/os.h                   C       2001,2004,2005,2007,2009,2016,2018
 ./bin/rndc/rndc.8                              MAN     DOCBOOK
 ./bin/rndc/rndc.c                              C       2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
@@ -315,7 +292,6 @@
 ./bin/rndc/win32/rndcutil.vcxproj.filters.in   X       2013,2015,2018
 ./bin/rndc/win32/rndcutil.vcxproj.in           X       2013,2015,2016,2017,2018
 ./bin/rndc/win32/rndcutil.vcxproj.user         X       2013,2018
-./bin/tests/Makefile.in                                MAKE    1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/bigtest/README                     TXT.BRIEF       2013,2016,2018
 ./bin/tests/bigtest/buildzones.sh              SH      2013,2016,2018
 ./bin/tests/bigtest/rndc.key                   X       2013,2018
@@ -328,7 +304,6 @@
 ./bin/tests/named.conf                         CONF-C  1999,2000,2001,2004,2007,2011,2015,2016,2018
 ./bin/tests/optional/Kchild.example.+003+04017.key     X       2000,2001,2018
 ./bin/tests/optional/Kchild.example.+003+04017.private X       2000,2001,2018
-./bin/tests/optional/Makefile.in               MAKE    2018
 ./bin/tests/optional/adb_test.c                        C       1999,2000,2001,2004,2005,2007,2009,2011,2012,2013,2015,2016,2018
 ./bin/tests/optional/backtrace_test.c          C       2009,2013,2015,2016,2018
 ./bin/tests/optional/byaddr_test.c             C       2000,2001,2002,2004,2005,2007,2012,2015,2016,2018
@@ -360,9 +335,7 @@
 ./bin/tests/optional/task_test.c               C       1998,1999,2000,2001,2004,2007,2013,2014,2015,2016,2018
 ./bin/tests/optional/timer_test.c              C       1998,1999,2000,2001,2004,2007,2013,2014,2015,2016,2018
 ./bin/tests/optional/zone_test.c               C       1999,2000,2001,2002,2004,2005,2007,2009,2012,2014,2015,2016,2018
-./bin/tests/pkcs11/Makefile.in                 MAKE    2014,2016,2018
 ./bin/tests/pkcs11/README                      X       2014,2016,2018
-./bin/tests/pkcs11/benchmarks/Makefile.in      MAKE    2014,2016,2017,2018
 ./bin/tests/pkcs11/benchmarks/create.c         C       2014,2016,2018
 ./bin/tests/pkcs11/benchmarks/find.c           C       2014,2015,2016,2018
 ./bin/tests/pkcs11/benchmarks/genrsa.c         C       2014,2015,2016,2018
@@ -379,7 +352,6 @@
 ./bin/tests/startperf/mkzonefile.pl            PERL    2011,2012,2016,2018
 ./bin/tests/startperf/setup.sh                 SH      2011,2012,2016,2018
 ./bin/tests/startperf/smallzone.db             ZONE    2011,2016,2018
-./bin/tests/system/Makefile.in                 MAKE    2000,2001,2004,2007,2008,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/system/README                      TXT.BRIEF       2000,2001,2004,2010,2011,2013,2015,2016,2017,2018
 ./bin/tests/system/acl/clean.sh                        SH      2008,2012,2014,2015,2016,2017,2018
 ./bin/tests/system/acl/ns2/named1.conf.in      CONF-C  2008,2016,2018
@@ -939,7 +911,6 @@
 ./bin/tests/system/dlz/prereq.sh.in            SH      2011,2012,2016,2018
 ./bin/tests/system/dlz/setup.sh                        SH      2018
 ./bin/tests/system/dlz/tests.sh                        SH      2010,2011,2012,2013,2015,2016,2018
-./bin/tests/system/dlzexternal/Makefile.in     MAKE    2011,2012,2014,2015,2016,2017,2018
 ./bin/tests/system/dlzexternal/clean.sh                SH      2010,2012,2014,2015,2016,2018
 ./bin/tests/system/dlzexternal/driver.c                C       2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/system/dlzexternal/driver.h                C       2011,2016,2018
@@ -1160,11 +1131,9 @@
 ./bin/tests/system/dupsigs/ns1/signing.test.db.in      ZONE    2018
 ./bin/tests/system/dupsigs/setup.sh            SH      2018
 ./bin/tests/system/dupsigs/tests.sh            SH      2018
-./bin/tests/system/dyndb/Makefile.in           MAKE    2015,2016,2018
 ./bin/tests/system/dyndb/clean.sh              SH      2015,2016,2018
 ./bin/tests/system/dyndb/driver/AUTHORS                X       2015,2018
 ./bin/tests/system/dyndb/driver/COPYING                X       2015,2016,2018
-./bin/tests/system/dyndb/driver/Makefile.in    MAKE    2015,2016,2017,2018
 ./bin/tests/system/dyndb/driver/README         X       2015,2018
 ./bin/tests/system/dyndb/driver/db.c           X       2015,2016,2017,2018
 ./bin/tests/system/dyndb/driver/db.h           X       2015,2016,2018
@@ -1669,7 +1638,6 @@
 ./bin/tests/system/pending/ns4/named.conf.in   CONF-C  2009,2016,2018
 ./bin/tests/system/pending/setup.sh            SH      2009,2012,2014,2016,2017,2018
 ./bin/tests/system/pending/tests.sh            SH      2009,2010,2012,2015,2016,2018
-./bin/tests/system/pipelined/Makefile.in       MAKE    2014,2015,2016,2018
 ./bin/tests/system/pipelined/clean.sh          SH      2014,2015,2016,2018
 ./bin/tests/system/pipelined/input             X       2014,2015,2018
 ./bin/tests/system/pipelined/inputb            X       2014,2015,2018
@@ -1784,7 +1752,6 @@
 ./bin/tests/system/resolver/prereq.sh          SH      2000,2001,2004,2007,2012,2014,2016,2018
 ./bin/tests/system/resolver/setup.sh           SH      2010,2011,2012,2013,2014,2016,2017,2018
 ./bin/tests/system/resolver/tests.sh           SH      2000,2001,2004,2007,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./bin/tests/system/rndc/Makefile.in            MAKE    2014,2015,2016,2017,2018
 ./bin/tests/system/rndc/clean.sh               SH      2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/system/rndc/gencheck.c             C       2014,2015,2016,2018
 ./bin/tests/system/rndc/ns2/incl.db            ZONE    2013,2016,2018
@@ -1810,7 +1777,6 @@
 ./bin/tests/system/rootkeysentinel/ns4/named.conf.in   CONF-C  2018
 ./bin/tests/system/rootkeysentinel/setup.sh    SH      2018
 ./bin/tests/system/rootkeysentinel/tests.sh    SH      2018
-./bin/tests/system/rpz/Makefile.in             MAKE    2017,2018
 ./bin/tests/system/rpz/ckdnsrps.sh             SH      2017,2018
 ./bin/tests/system/rpz/clean.sh                        SH      2011,2012,2013,2014,2016,2017,2018
 ./bin/tests/system/rpz/dnsrps.c                        C       2017,2018
@@ -1949,7 +1915,6 @@
 ./bin/tests/system/rrsetorder/ns5/named.conf.in        CONF-C  2018
 ./bin/tests/system/rrsetorder/setup.sh         SH      2018
 ./bin/tests/system/rrsetorder/tests.sh         SH      2006,2007,2008,2011,2012,2014,2015,2016,2017,2018
-./bin/tests/system/rsabigexponent/Makefile.in  MAKE    2012,2014,2015,2016,2017,2018
 ./bin/tests/system/rsabigexponent/bigkey.c     C       2012,2014,2015,2016,2017,2018
 ./bin/tests/system/rsabigexponent/clean.sh     SH      2012,2014,2016,2018
 ./bin/tests/system/rsabigexponent/conf/bad01.conf      CONF-C  2012,2016,2018
@@ -2149,7 +2114,6 @@
 ./bin/tests/system/testsock.pl                 PERL    2000,2001,2004,2007,2010,2011,2012,2013,2016,2018
 ./bin/tests/system/testsock6.pl                        PERL    2010,2012,2014,2016,2018
 ./bin/tests/system/testsummary.sh              SH      2018
-./bin/tests/system/tkey/Makefile.in            MAKE    2001,2002,2004,2007,2009,2012,2014,2015,2016,2017,2018
 ./bin/tests/system/tkey/clean.sh               SH      2001,2004,2007,2011,2012,2013,2014,2015,2016,2018
 ./bin/tests/system/tkey/keycreate.c            C       2001,2004,2005,2007,2009,2011,2012,2014,2015,2016,2017,2018
 ./bin/tests/system/tkey/keydelete.c            C       2001,2004,2005,2007,2009,2010,2011,2014,2015,2016,2017,2018
@@ -2334,7 +2298,6 @@
 ./bin/tests/testdata/wire/wire_test.data2      X       1999,2000,2001,2018
 ./bin/tests/testdata/wire/wire_test.data3      X       1999,2000,2001,2018
 ./bin/tests/testdata/wire/wire_test.data4      X       1999,2000,2001,2018
-./bin/tests/virtual-time/Makefile.in           MAKE    2010,2012,2016,2018
 ./bin/tests/virtual-time/README                        TXT.BRIEF       2010,2016,2018
 ./bin/tests/virtual-time/autosign-ksk/clean.sh SH      2010,2012,2015,2016,2018
 ./bin/tests/virtual-time/autosign-ksk/ns1/example.db.in        ZONE    2010,2016,2018
@@ -2398,7 +2361,6 @@
 ./bin/tests/win32/timer_test.vcxproj.in                X       2013,2015,2016,2017,2018
 ./bin/tests/win32/timer_test.vcxproj.user      X       2013,2018
 ./bin/tests/wire_test.c                                C       1999,2000,2001,2004,2005,2007,2015,2016,2018
-./bin/tools/Makefile.in                                MAKE    2009,2010,2012,2013,2014,2015,2016,2017,2018
 ./bin/tools/arpaname.1                         MAN     DOCBOOK
 ./bin/tools/arpaname.c                         C       2009,2015,2016,2018
 ./bin/tools/arpaname.docbook                   SGML    2009,2014,2015,2016,2018
@@ -2468,8 +2430,6 @@
 ./config.h.win32                               C       1999,2000,2001,2004,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017,2018
 ./config.sub                                   X       1998,1999,2000,2001,2004,2013,2018
 ./config.threads.in                            X       2005,2006,2010,2011,2012,2013,2018
-./configure                                    X       1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./configure.in                                 SH      1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./conftools/perllib/dnsconf/DNSConf-macros.h   C       2000,2001,2004,2007,2016,2018
 ./conftools/perllib/dnsconf/DNSConf.i          C       2000,2001,2004,2007,2016,2018
 ./conftools/perllib/dnsconf/Makefile.PL                PERL    2000,2001,2004,2007,2012,2016,2018
@@ -2478,7 +2438,6 @@
 ./contrib/README                               X       2014,2015,2016,2017,2018
 ./contrib/dane/mkdane.sh                       X       2012,2018
 ./contrib/dane/tlsa6698.pem                    X       2012,2018
-./contrib/dlz/bin/dlzbdb/Makefile.in           X       2005,2007,2009,2011,2012,2015,2016,2017,2018
 ./contrib/dlz/bin/dlzbdb/dlzbdb.c              X       2005,2016,2018
 ./contrib/dlz/config.dlz.in                    X       2005,2006,2008,2010,2011,2014,2016,2017,2018
 ./contrib/dlz/drivers/dlz_bdb_driver.c         X       2005,2008,2010,2011,2012,2016,2017,2018
@@ -2514,7 +2473,6 @@
 ./contrib/dlz/example/win32/dxdriver.dsw       X       2011,2018
 ./contrib/dlz/example/win32/dxdriver.mak       X       2018
 ./contrib/dlz/modules/bdbhpt/Makefile          X       2013,2018
-./contrib/dlz/modules/bdbhpt/README.md         X       2013,2015,2018
 ./contrib/dlz/modules/bdbhpt/dlz_bdbhpt_dynamic.c      X       2013,2015,2018
 ./contrib/dlz/modules/bdbhpt/testing/README    X       2015,2018
 ./contrib/dlz/modules/bdbhpt/testing/bdbhpt-populate.pl        X       2013,2018
@@ -2536,13 +2494,11 @@
 ./contrib/dlz/modules/ldap/testing/example.ldif        X       2013,2018
 ./contrib/dlz/modules/ldap/testing/named.conf  X       2013,2018
 ./contrib/dlz/modules/ldap/testing/slapd.conf  X       2013,2018
-./contrib/dlz/modules/mysql/Makefile.in                X       2013,2017,2018
 ./contrib/dlz/modules/mysql/dlz_mysql_dynamic.c        X       2013,2016,2018
 ./contrib/dlz/modules/mysql/testing/README     X       2013,2018
 ./contrib/dlz/modules/mysql/testing/dlz.data   X       2013,2017,2018
 ./contrib/dlz/modules/mysql/testing/dlz.schema X       2013,2018
 ./contrib/dlz/modules/mysql/testing/named.conf X       2013,2018
-./contrib/dlz/modules/mysqldyn/Makefile.in     X       2014,2015,2017,2018
 ./contrib/dlz/modules/mysqldyn/README          X       2014,2018
 ./contrib/dlz/modules/mysqldyn/dlz_mysqldyn_mod.c      X       2014,2015,2018
 ./contrib/dlz/modules/mysqldyn/testing/README  X       2014,2018
@@ -2567,7 +2523,6 @@
 ./contrib/dlz/modules/wildcard/README          X       2013,2018
 ./contrib/dlz/modules/wildcard/dlz_wildcard_dynamic.c  X       2013,2015,2016,2018
 ./contrib/dlz/modules/wildcard/testing/named.conf      X       2013,2018
-./contrib/dnsperf-2.1.0.0-1/Makefile.in                X       2016,2018
 ./contrib/dnsperf-2.1.0.0-1/README             X       2016,2018
 ./contrib/dnsperf-2.1.0.0-1/RELEASE_NOTES      X       2016,2018
 ./contrib/dnsperf-2.1.0.0-1/aclocal.m4         X       2016,2018
@@ -2604,18 +2559,15 @@
 ./contrib/dnsperf-2.1.0.0-1/util.h             X       2016,2018
 ./contrib/dnsperf-2.1.0.0-1/version.h          X       2016,2018
 ./contrib/dnsperf-patches/0001-Add-support-for-sending-EDNS-CLIENT-SUBNET-option-in.patch      X       2016,2018
-./contrib/dnspriv/README.md                    MKD     2017,2018
 ./contrib/dnspriv/named.conf                   CONF-C  2017,2018
 ./contrib/dnspriv/nginx.conf                   SH      2017,2018
 ./contrib/kasp/README                          X       2016,2018
 ./contrib/kasp/kasp.xml                                X       2016,2018
 ./contrib/kasp/kasp2policy.py                  X       2016,2018
 ./contrib/kasp/policy.good                     X       2016,2018
-./contrib/perftcpdns/Makefile.in               MAKE    2014,2016,2018
 ./contrib/perftcpdns/configure                 X       2014,2018
 ./contrib/perftcpdns/configure.in              SH      2014,2016,2018
 ./contrib/perftcpdns/perftcpdns.c              C       2013,2014,2016,2018
-./contrib/queryperf/Makefile.in                        X       2001,2004,2018
 ./contrib/queryperf/README                     X       2001,2018
 ./contrib/queryperf/config.h.in                        X       2007,2018
 ./contrib/queryperf/configure                  X       2001,2002,2004,2007,2012,2018
@@ -2658,7 +2610,6 @@
 ./contrib/sdb/tcl/tcldb.h                      C       2000,2001,2004,2007,2016,2018
 ./contrib/sdb/time/timedb.c                    C       2000,2001,2004,2007,2011,2014,2016,2018
 ./contrib/sdb/time/timedb.h                    C       2000,2001,2004,2007,2016,2018
-./doc/Makefile.in                              MAKE    2000,2001,2004,2005,2006,2007,2012,2015,2016,2018
 ./doc/arm/Bv9ARM-book.xml                      SGML    2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./doc/arm/Bv9ARM.ch01.html                     X       2000,2001,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./doc/arm/Bv9ARM.ch02.html                     X       2000,2001,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
@@ -2675,7 +2626,6 @@
 ./doc/arm/Bv9ARM.conf                          X       2015,2018
 ./doc/arm/Bv9ARM.html                          X       2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./doc/arm/Bv9ARM.pdf                           X       2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./doc/arm/Makefile.in                          MAKE    2001,2002,2004,2005,2006,2007,2009,2012,2014,2015,2016,2018
 ./doc/arm/README-SGML                          TXT.BRIEF       2000,2001,2004,2015,2016,2018
 ./doc/arm/acl.grammar.xml                      SGML    2018
 ./doc/arm/catz.xml                             SGML    2016,2017,2018
@@ -2775,21 +2725,17 @@
 ./doc/dev/autoconf                             TXT.BRIEF       2001,2002,2004,2016,2018
 ./doc/dev/coding.html                          HTML    1999,2000,2001,2002,2004,2007,2016,2018
 ./doc/dev/cvs-usage                            TXT.BRIEF       2000,2001,2004,2016,2018
-./doc/dev/dev.md                               MKD     2017,2018
 ./doc/dev/magic_numbers                                TXT.BRIEF       1999,2000,2001,2002,2004,2016,2018
 ./doc/dev/rdata.md                             MKD     1999,2000,2001,2004,2007,2016,2017,2018
 ./doc/dev/release                              TXT.BRIEF       2000,2001,2002,2003,2004,2005,2006,2007,2009,2014,2016,2018
 ./doc/dev/results                              TXT.BRIEF       1999,2000,2001,2004,2016,2018
-./doc/dev/style.md                             MKD     2017,2018
 ./doc/dev/tests                                        TXT.BRIEF       2000,2001,2004,2016,2018
 ./doc/dev/unexpected                           TXT.BRIEF       1999,2000,2001,2004,2016,2018
 ./doc/doxygen/Doxyfile.in                      X       2006,2017,2018
-./doc/doxygen/Makefile.in                      MAKE    2006,2007,2012,2015,2016,2018
 ./doc/doxygen/doxygen-input-filter.in          PERL    2006,2007,2012,2016,2018
 ./doc/doxygen/isc-footer.html                  HTML    2006,2007,2016,2018
 ./doc/doxygen/isc-header.html                  HTML    2006,2007,2016,2018
 ./doc/doxygen/mainpage                         X       2006,2018
-./doc/misc/Makefile.in                         MAKE    2001,2004,2007,2009,2012,2016,2017,2018
 ./doc/misc/delegation-only.zoneopt             X       2018
 ./doc/misc/dnssec                              TXT.BRIEF       2000,2001,2002,2004,2016,2018
 ./doc/misc/docbook-grammars.pl                 PERL    2018
@@ -2813,10 +2759,8 @@
 ./doc/misc/static-stub.zoneopt                 X       2018
 ./doc/misc/stub.zoneopt                                X       2018
 ./doc/misc/tcp-fast-open                       TXT.BRIEF       2016,2017,2018
-./doc/tex/Makefile.in                          MAKE    2015,2016,2018
 ./doc/tex/armstyle.sty.in                      X       2015,2018
 ./doc/tex/notestyle.sty                                X       2015,2018
-./doc/xsl/Makefile.in                          MAKE    2005,2007,2012,2014,2015,2016,2018
 ./doc/xsl/arm-param.xsl                                SGML    2015,2016,2018
 ./doc/xsl/copyright.xsl                                SGML    2005,2007,2009,2015,2016,2018
 ./doc/xsl/graphics/caution.eps                 X       2015,2018
@@ -2841,6 +2785,9 @@
 ./docutil/patch-db2latex-duplicate-template-bug        X       2007,2018
 ./docutil/patch-db2latex-nested-param-bug      X       2007,2018
 ./docutil/patch-db2latex-xsltproc-title-bug    X       2007,2018
+./fuzz/dns_name_fromtext_target.c              C       2018
+./fuzz/fuzz.h                                  C       2018
+./fuzz/main.c                                  C       2018
 ./install-sh                                   X       1998,1999,2000,2001,2018
 ./isc-config.sh.1                              MAN     DOCBOOK
 ./isc-config.sh.docbook                                SGML    2009,2014,2015,2016,2017,2018
@@ -2848,13 +2795,9 @@
 ./isc-config.sh.in                             SH      2000,2001,2003,2004,2007,2012,2013,2015,2016,2017,2018
 ./lib/Atffile                                  X       2011,2014,2016,2017,2018
 ./lib/Kyuafile                                 X       2017,2018
-./lib/Makefile.in                              MAKE    1998,1999,2000,2001,2003,2004,2007,2012,2013,2014,2016,2017,2018
-./lib/bind9/Makefile.in                                MAKE    2001,2004,2007,2009,2012,2014,2015,2016,2017,2018
 ./lib/bind9/api                                        X       2001,2006,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/bind9/check.c                            C       2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/bind9/getaddresses.c                     C       2001,2002,2004,2005,2007,2014,2015,2016,2017,2018
-./lib/bind9/include/Makefile.in                        MAKE    2001,2004,2007,2012,2016,2018
-./lib/bind9/include/bind9/Makefile.in          MAKE    2001,2004,2007,2012,2015,2016,2018
 ./lib/bind9/include/bind9/check.h              C       2001,2004,2005,2006,2007,2016,2018
 ./lib/bind9/include/bind9/getaddresses.h       C       2001,2004,2005,2006,2007,2009,2016,2017,2018
 ./lib/bind9/include/bind9/version.h            C       2001,2004,2005,2006,2007,2016,2018
@@ -2867,7 +2810,6 @@
 ./lib/bind9/win32/version.c                    C       1998,1999,2000,2001,2004,2007,2016,2018
 ./lib/dns/Atffile                              X       2011,2018
 ./lib/dns/Kyuafile                             X       2017,2018
-./lib/dns/Makefile.in                          MAKE    1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/dns/acl.c                                        C       1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2013,2014,2016,2017,2018
 ./lib/dns/adb.c                                        C       1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/dns/api                                  X       1999,2000,2001,2006,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
@@ -2911,8 +2853,6 @@
 ./lib/dns/gssapi_link.c                                C       2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016,2018
 ./lib/dns/gssapictx.c                          C       2000,2001,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/dns/hmac_link.c                          C.NAI   1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./lib/dns/include/Makefile.in                  MAKE    1998,1999,2000,2001,2004,2007,2012,2016,2018
-./lib/dns/include/dns/Makefile.in              MAKE    1998,1999,2000,2001,2002,2003,2004,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/dns/include/dns/acl.h                    C       1999,2000,2001,2002,2004,2005,2006,2007,2009,2011,2013,2014,2016,2017,2018
 ./lib/dns/include/dns/adb.h                    C       1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2011,2013,2014,2015,2016,2018
 ./lib/dns/include/dns/badcache.h               C       2014,2016,2018
@@ -3010,7 +2950,6 @@
 ./lib/dns/include/dns/zonekey.h                        C       2001,2004,2005,2006,2007,2016,2018
 ./lib/dns/include/dns/zoneverify.h             C       2018
 ./lib/dns/include/dns/zt.h                     C       1999,2000,2001,2002,2004,2005,2006,2007,2011,2016,2017,2018
-./lib/dns/include/dst/Makefile.in              MAKE    1998,1999,2000,2001,2004,2007,2012,2015,2016,2018
 ./lib/dns/include/dst/dst.h                    C       2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/dns/include/dst/gssapi.h                 C       2000,2001,2004,2005,2006,2007,2009,2010,2011,2013,2016,2017,2018
 ./lib/dns/include/dst/lib.h                    C       1999,2000,2001,2004,2005,2006,2007,2016,2018
@@ -3239,7 +3178,6 @@
 ./lib/dns/tests/Kdh.+002+18602.key             X       2014,2018
 ./lib/dns/tests/Krsa.+005+29235.key            X       2016,2018
 ./lib/dns/tests/Kyuafile                       X       2017,2018
-./lib/dns/tests/Makefile.in                    MAKE    2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/dns/tests/acl_test.c                     C       2016,2018
 ./lib/dns/tests/db_test.c                      C       2013,2015,2016,2017,2018
 ./lib/dns/tests/dbdiff_test.c                  C       2011,2012,2016,2017,2018
@@ -3351,15 +3289,12 @@
 ./lib/dns/zt.c                                 C       1999,2000,2001,2002,2004,2005,2006,2007,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/irs/Atffile                              X       2016,2018
 ./lib/irs/Kyuafile                             X       2017,2018
-./lib/irs/Makefile.in                          MAKE    2009,2012,2014,2015,2016,2017,2018
 ./lib/irs/api                                  X       2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/irs/context.c                            C       2009,2014,2016,2018
 ./lib/irs/dnsconf.c                            C       2009,2012,2016,2018
 ./lib/irs/gai_strerror.c                       C       2009,2014,2016,2018
 ./lib/irs/getaddrinfo.c                                C       2009,2012,2013,2014,2015,2016,2017,2018
 ./lib/irs/getnameinfo.c                                C       2009,2011,2012,2013,2014,2016,2017,2018
-./lib/irs/include/Makefile.in                  MAKE    2009,2012,2016,2018
-./lib/irs/include/irs/Makefile.in              MAKE    2009,2012,2014,2016,2018
 ./lib/irs/include/irs/context.h                        C       2009,2016,2018
 ./lib/irs/include/irs/dnsconf.h                        C       2009,2016,2018
 ./lib/irs/include/irs/netdb.h.in               C       2009,2016,2017,2018
@@ -3370,7 +3305,6 @@
 ./lib/irs/resconf.c                            C       2009,2011,2012,2014,2015,2016,2017,2018
 ./lib/irs/tests/Atffile                                X       2016,2017,2018
 ./lib/irs/tests/Kyuafile                       X       2017,2018
-./lib/irs/tests/Makefile.in                    MAKE    2016,2017,2018
 ./lib/irs/tests/resconf_test.c                 C       2016,2018
 ./lib/irs/tests/testdata/domain.conf           CONF-SH 2016,2018
 ./lib/irs/tests/testdata/nameserver-v4.conf    CONF-SH 2016,2018
@@ -3390,9 +3324,6 @@
 ./lib/irs/tests/testdata/unknown.conf          CONF-SH 2016,2018
 ./lib/irs/version.c                            C       2009,2016,2018
 ./lib/irs/win32/DLLMain.c                      C       2014,2016,2018
-./lib/irs/win32/Makefile.in                    MAKE    2014,2016,2018
-./lib/irs/win32/include/Makefile.in            MAKE    2014,2016,2018
-./lib/irs/win32/include/irs/Makefile.in                MAKE    2014,2016,2018
 ./lib/irs/win32/include/irs/netdb.h            C       2014,2016,2017,2018
 ./lib/irs/win32/include/irs/platform.h         C       2014,2016,2018
 ./lib/irs/win32/libirs.def                     X       2014,2018
@@ -3402,11 +3333,7 @@
 ./lib/irs/win32/version.c                      C       2014,2016,2018
 ./lib/isc/Atffile                              X       2011,2018
 ./lib/isc/Kyuafile                             X       2017,2018
-./lib/isc/Makefile.in                          MAKE    1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/isc/aes.c                                        C       2014,2016,2017,2018
-./lib/isc/alpha/Makefile.in                    MAKE    2007,2012,2016,2018
-./lib/isc/alpha/include/Makefile.in            MAKE    2007,2012,2016,2018
-./lib/isc/alpha/include/isc/Makefile.in                MAKE    2007,2012,2015,2016,2018
 ./lib/isc/alpha/include/isc/atomic.h           C       2005,2007,2009,2016,2018
 ./lib/isc/api                                  X       1999,2000,2001,2006,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/isc/app_api.c                            C       2009,2013,2014,2015,2016,2018
@@ -3433,12 +3360,7 @@
 ./lib/isc/hmacsha.c                            C       2005,2006,2007,2009,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/isc/ht.c                                 C       2016,2017,2018
 ./lib/isc/httpd.c                              C       2006,2007,2008,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./lib/isc/ia64/Makefile.in                     MAKE    2007,2012,2016,2018
-./lib/isc/ia64/include/Makefile.in             MAKE    2007,2012,2016,2018
-./lib/isc/ia64/include/isc/Makefile.in         MAKE    2007,2012,2015,2016,2018
 ./lib/isc/ia64/include/isc/atomic.h            C       2006,2007,2009,2012,2016,2018
-./lib/isc/include/Makefile.in                  MAKE    1998,1999,2000,2001,2004,2007,2012,2014,2016,2018
-./lib/isc/include/isc/Makefile.in              MAKE    1998,1999,2000,2001,2003,2004,2005,2006,2007,2008,2009,2012,2013,2014,2015,2016,2017,2018
 ./lib/isc/include/isc/aes.h                    C       2014,2016,2018
 ./lib/isc/include/isc/app.h                    C       1999,2000,2001,2004,2005,2006,2007,2009,2013,2014,2015,2016,2018
 ./lib/isc/include/isc/assertions.h             C       1997,1998,1999,2000,2001,2004,2005,2006,2007,2008,2009,2016,2017,2018
@@ -3525,13 +3447,11 @@
 ./lib/isc/include/isc/util.h                   C       1998,1999,2000,2001,2004,2005,2006,2007,2010,2011,2012,2015,2016,2017,2018
 ./lib/isc/include/isc/version.h                        C       2001,2004,2005,2006,2007,2016,2018
 ./lib/isc/include/isc/xml.h                    C       2006,2007,2016,2018
-./lib/isc/include/pk11/Makefile.in             MAKE    2014,2015,2016,2018
 ./lib/isc/include/pk11/constants.h             C       2014,2016,2017,2018
 ./lib/isc/include/pk11/internal.h              C       2014,2016,2018
 ./lib/isc/include/pk11/pk11.h                  C       2014,2016,2018
 ./lib/isc/include/pk11/result.h                        C       2014,2016,2018
 ./lib/isc/include/pk11/site.h                  C       2016,2017,2018
-./lib/isc/include/pkcs11/Makefile.in           MAKE    2014,2015,2016,2017,2018
 ./lib/isc/include/pkcs11/eddsa.h               C       2017,2018
 ./lib/isc/include/pkcs11/pkcs11.h              X       2014,2016,2018
 ./lib/isc/include/pkcs11/pkcs11f.h             X       2014,2016,2018
@@ -3545,18 +3465,11 @@
 ./lib/isc/log.c                                        C       1999,2000,2001,2002,2003,2004,2005,2006,2007,2009,2011,2012,2013,2014,2016,2017,2018
 ./lib/isc/md5.c                                        C       2000,2001,2004,2005,2007,2009,2014,2015,2016,2017,2018
 ./lib/isc/mem.c                                        C       1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2012,2013,2014,2015,2016,2017,2018
-./lib/isc/mips/Makefile.in                     MAKE    2007,2012,2016,2018
-./lib/isc/mips/include/Makefile.in             MAKE    2007,2012,2016,2018
-./lib/isc/mips/include/isc/Makefile.in         MAKE    2007,2012,2015,2016,2018
 ./lib/isc/mips/include/isc/atomic.h            C       2005,2007,2016,2018
 ./lib/isc/mutexblock.c                         C       1999,2000,2001,2004,2005,2007,2011,2012,2016,2018
 ./lib/isc/netaddr.c                            C       1999,2000,2001,2002,2004,2005,2007,2010,2011,2012,2014,2015,2016,2017,2018
 ./lib/isc/netscope.c                           C       2002,2004,2005,2006,2007,2016,2018
-./lib/isc/nls/Makefile.in                      MAKE    1999,2000,2001,2004,2007,2009,2012,2016,2018
 ./lib/isc/nls/msgcat.c                         C       1999,2000,2001,2004,2005,2007,2016,2018
-./lib/isc/noatomic/Makefile.in                 MAKE    2007,2012,2016,2018
-./lib/isc/noatomic/include/Makefile.in         MAKE    2007,2012,2016,2018
-./lib/isc/noatomic/include/isc/Makefile.in     MAKE    2007,2012,2015,2016,2018
 ./lib/isc/noatomic/include/isc/atomic.h                C       2005,2007,2016,2018
 ./lib/isc/nonce.c                              C       2018
 ./lib/isc/openssl_shim.c                       C       2018
@@ -3566,15 +3479,9 @@
 ./lib/isc/pk11_result.c                                C       2014,2015,2016,2018
 ./lib/isc/pool.c                               C       2013,2015,2016,2018
 ./lib/isc/portset.c                            C       2008,2016,2017,2018
-./lib/isc/powerpc/Makefile.in                  MAKE    2007,2012,2016,2018
-./lib/isc/powerpc/include/Makefile.in          MAKE    2007,2012,2016,2018
-./lib/isc/powerpc/include/isc/Makefile.in      MAKE    2007,2012,2015,2016,2018
 ./lib/isc/powerpc/include/isc/atomic.h         C       2005,2007,2009,2011,2012,2016,2017,2018
 ./lib/isc/print.c                              C       1999,2000,2001,2003,2004,2005,2006,2007,2008,2010,2014,2015,2016,2017,2018
-./lib/isc/pthreads/Makefile.in                 MAKE    1998,1999,2000,2001,2004,2007,2009,2012,2016,2018
 ./lib/isc/pthreads/condition.c                 C       1998,1999,2000,2001,2004,2005,2007,2012,2016,2018
-./lib/isc/pthreads/include/Makefile.in         MAKE    1998,1999,2000,2001,2004,2007,2012,2016,2018
-./lib/isc/pthreads/include/isc/Makefile.in     MAKE    1998,1999,2000,2001,2004,2007,2012,2015,2016,2018
 ./lib/isc/pthreads/include/isc/condition.h     C       1998,1999,2000,2001,2004,2005,2007,2016,2018
 ./lib/isc/pthreads/include/isc/mutex.h         C       1998,1999,2000,2001,2002,2004,2005,2007,2016,2018
 ./lib/isc/pthreads/include/isc/once.h          C       1999,2000,2001,2004,2005,2007,2016,2018
@@ -3596,9 +3503,6 @@
 ./lib/isc/sha2.c                               C       2005,2006,2007,2009,2011,2012,2014,2016,2017,2018
 ./lib/isc/sockaddr.c                           C       1999,2000,2001,2002,2003,2004,2005,2006,2007,2010,2011,2012,2014,2015,2016,2017,2018
 ./lib/isc/socket_api.c                         C       2009,2011,2012,2013,2014,2015,2016,2018
-./lib/isc/sparc64/Makefile.in                  MAKE    2007,2012,2016,2018
-./lib/isc/sparc64/include/Makefile.in          MAKE    2007,2012,2016,2018
-./lib/isc/sparc64/include/isc/Makefile.in      MAKE    2007,2012,2015,2016,2018
 ./lib/isc/sparc64/include/isc/atomic.h         C       2005,2007,2013,2016,2018
 ./lib/isc/stats.c                              C       2009,2012,2013,2014,2015,2016,2017,2018
 ./lib/isc/string.c                             C       1999,2000,2001,2003,2004,2005,2006,2007,2011,2012,2014,2015,2016,2018
@@ -3608,7 +3512,6 @@
 ./lib/isc/taskpool.c                           C       1999,2000,2001,2004,2005,2007,2011,2012,2013,2016,2018
 ./lib/isc/tests/Atffile                                X       2011,2017,2018
 ./lib/isc/tests/Kyuafile                       X       2017,2018
-./lib/isc/tests/Makefile.in                    MAKE    2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/isc/tests/aes_test.c                     C       2014,2016,2018
 ./lib/isc/tests/atomic_test.c                  C       2018
 ./lib/isc/tests/buffer_test.c                  C       2014,2015,2016,2017,2018
@@ -3644,7 +3547,6 @@
 ./lib/isc/timer.c                              C       1998,1999,2000,2001,2002,2004,2005,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/isc/timer_p.h                            C       2000,2001,2004,2005,2007,2009,2016,2017,2018
 ./lib/isc/tm.c                                 C       2014,2016,2018
-./lib/isc/unix/Makefile.in                     MAKE    1998,1999,2000,2001,2004,2007,2009,2012,2014,2015,2016,2017,2018
 ./lib/isc/unix/app.c                           C       1999,2000,2001,2002,2003,2004,2005,2007,2008,2009,2013,2014,2015,2016,2017,2018
 ./lib/isc/unix/dir.c                           C       1999,2000,2001,2004,2005,2007,2008,2009,2011,2012,2016,2017,2018
 ./lib/isc/unix/errno.c                         C       2016,2018
@@ -3655,8 +3557,6 @@
 ./lib/isc/unix/ifiter_getifaddrs.c             C       2003,2004,2005,2007,2008,2009,2014,2016,2018
 ./lib/isc/unix/ifiter_ioctl.c                  C       1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2014,2015,2016,2017,2018
 ./lib/isc/unix/ifiter_sysctl.c                 C       1999,2000,2001,2002,2003,2004,2005,2007,2014,2015,2016,2018
-./lib/isc/unix/include/Makefile.in             MAKE    1998,1999,2000,2001,2004,2007,2012,2014,2016,2018
-./lib/isc/unix/include/isc/Makefile.in         MAKE    1998,1999,2000,2001,2004,2007,2012,2013,2014,2015,2016,2018
 ./lib/isc/unix/include/isc/dir.h               C       1999,2000,2001,2004,2005,2007,2016,2018
 ./lib/isc/unix/include/isc/keyboard.h          C       2000,2001,2004,2005,2007,2016,2018
 ./lib/isc/unix/include/isc/net.h               C       1999,2000,2001,2002,2003,2004,2005,2007,2008,2012,2013,2014,2016,2017,2018
@@ -3667,7 +3567,6 @@
 ./lib/isc/unix/include/isc/strerror.h          C       2001,2004,2005,2007,2008,2016,2018
 ./lib/isc/unix/include/isc/syslog.h            C       1999,2000,2001,2004,2005,2007,2016,2018
 ./lib/isc/unix/include/isc/time.h              C       1998,1999,2000,2001,2004,2005,2006,2007,2008,2009,2012,2014,2015,2016,2017,2018
-./lib/isc/unix/include/pkcs11/Makefile.in      MAKE    2014,2016,2018
 ./lib/isc/unix/include/pkcs11/cryptoki.h       X       2014,2018
 ./lib/isc/unix/interfaceiter.c                 C       1999,2000,2001,2002,2003,2004,2005,2007,2008,2014,2016,2017,2018
 ./lib/isc/unix/ipv6.c                          C       1999,2000,2001,2004,2005,2006,2007,2016,2018
@@ -3686,7 +3585,6 @@
 ./lib/isc/unix/time.c                          C       1998,1999,2000,2001,2003,2004,2005,2006,2007,2008,2011,2012,2014,2015,2016,2017,2018
 ./lib/isc/version.c                            C       1998,1999,2000,2001,2004,2005,2007,2016,2018
 ./lib/isc/win32/DLLMain.c                      C       2001,2004,2007,2016,2018
-./lib/isc/win32/Makefile.in                    MAKE    1999,2000,2001,2004,2007,2009,2012,2014,2015,2016,2018
 ./lib/isc/win32/app.c                          C       1999,2000,2001,2004,2007,2009,2013,2014,2016,2018
 ./lib/isc/win32/condition.c                    C       1998,1999,2000,2001,2004,2006,2007,2016,2018
 ./lib/isc/win32/dir.c                          C       1999,2000,2001,2004,2007,2008,2009,2011,2012,2013,2016,2017,2018
@@ -3695,8 +3593,6 @@
 ./lib/isc/win32/errno2result.h                 C       2000,2001,2004,2005,2007,2016,2018
 ./lib/isc/win32/file.c                         C       2000,2001,2002,2004,2007,2009,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/isc/win32/fsaccess.c                     C       2000,2001,2002,2004,2007,2013,2016,2017,2018
-./lib/isc/win32/include/Makefile.in            MAKE    1999,2000,2001,2004,2007,2012,2014,2016,2018
-./lib/isc/win32/include/isc/Makefile.in                MAKE    1999,2000,2001,2004,2007,2012,2013,2014,2015,2016,2018
 ./lib/isc/win32/include/isc/atomic.h           C       2013,2015,2016,2018
 ./lib/isc/win32/include/isc/bind_registry.h    C       2001,2004,2007,2016,2018
 ./lib/isc/win32/include/isc/bindevt.h          C       2001,2004,2007,2016,2018
@@ -3719,7 +3615,6 @@
 ./lib/isc/win32/include/isc/thread.h           C       1998,1999,2000,2001,2004,2005,2007,2009,2013,2016,2017,2018
 ./lib/isc/win32/include/isc/time.h             C       1998,1999,2000,2001,2004,2006,2007,2008,2009,2012,2014,2015,2016,2017,2018
 ./lib/isc/win32/include/isc/win32os.h          C       2002,2004,2007,2009,2015,2016,2018
-./lib/isc/win32/include/pkcs11/Makefile.in     MAKE    2014,2016,2018
 ./lib/isc/win32/include/pkcs11/cryptoki.h      X       2014,2018
 ./lib/isc/win32/interfaceiter.c                        C       1999,2000,2001,2004,2007,2008,2009,2013,2014,2015,2016,2018
 ./lib/isc/win32/ipv6.c                         C       1999,2000,2001,2004,2007,2016,2018
@@ -3750,23 +3645,14 @@
 ./lib/isc/win32/unistd.h                       C       2000,2001,2004,2007,2008,2009,2016,2018
 ./lib/isc/win32/version.c                      C       1998,1999,2000,2001,2004,2007,2016,2018
 ./lib/isc/win32/win32os.c                      C       2002,2004,2007,2013,2014,2015,2016,2018
-./lib/isc/x86_32/Makefile.in                   MAKE    2007,2012,2016,2018
-./lib/isc/x86_32/include/Makefile.in           MAKE    2007,2012,2016,2018
-./lib/isc/x86_32/include/isc/Makefile.in       MAKE    2007,2012,2015,2016,2018
 ./lib/isc/x86_32/include/isc/atomic.h          C       2005,2007,2008,2015,2016,2017,2018
-./lib/isc/x86_64/Makefile.in                   MAKE    2007,2012,2016,2018
-./lib/isc/x86_64/include/Makefile.in           MAKE    2007,2012,2016,2018
-./lib/isc/x86_64/include/isc/Makefile.in       MAKE    2007,2012,2015,2016,2018
 ./lib/isc/x86_64/include/isc/atomic.h          C       2005,2007,2008,2015,2016,2017,2018
 ./lib/isc/xoshiro128starstar.c                 C.PORTION       2018
-./lib/isccc/Makefile.in                                MAKE    2001,2003,2004,2007,2009,2011,2012,2014,2015,2016,2017,2018
 ./lib/isccc/alist.c                            C.NOM   2001,2004,2005,2007,2015,2016,2018
 ./lib/isccc/api                                        X       2001,2006,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/isccc/base64.c                           C.NOM   2001,2004,2005,2007,2013,2016,2018
 ./lib/isccc/cc.c                               C.NOM   2001,2002,2003,2004,2005,2006,2007,2012,2013,2014,2015,2016,2018
 ./lib/isccc/ccmsg.c                            C.NOM   2001,2004,2005,2007,2016,2018
-./lib/isccc/include/Makefile.in                        MAKE    2001,2004,2007,2012,2016,2018
-./lib/isccc/include/isccc/Makefile.in          MAKE    2001,2004,2007,2012,2015,2016,2018
 ./lib/isccc/include/isccc/alist.h              C.NOM   2001,2004,2005,2006,2007,2016,2018
 ./lib/isccc/include/isccc/base64.h             C.NOM   2001,2004,2005,2006,2007,2016,2018
 ./lib/isccc/include/isccc/cc.h                 C.NOM   2001,2004,2005,2006,2007,2013,2014,2016,2018
@@ -3793,12 +3679,9 @@
 ./lib/isccc/win32/version.c                    C       2001,2004,2007,2016,2018
 ./lib/isccfg/Atffile                           X       2016,2018
 ./lib/isccfg/Kyuafile                          X       2017,2018
-./lib/isccfg/Makefile.in                       MAKE    2001,2002,2003,2004,2005,2007,2009,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/isccfg/aclconf.c                         C       1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/isccfg/api                               X       2001,2006,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/isccfg/dnsconf.c                         C       2009,2016,2018
-./lib/isccfg/include/Makefile.in               MAKE    2001,2004,2007,2012,2016,2018
-./lib/isccfg/include/isccfg/Makefile.in                MAKE    2001,2002,2004,2005,2007,2012,2014,2015,2016,2018
 ./lib/isccfg/include/isccfg/aclconf.h          C       1999,2000,2001,2004,2005,2006,2007,2010,2011,2012,2013,2014,2016,2018
 ./lib/isccfg/include/isccfg/cfg.h              C       2000,2001,2002,2004,2005,2006,2007,2010,2013,2014,2015,2016,2018
 ./lib/isccfg/include/isccfg/dnsconf.h          C       2009,2016,2018
@@ -3811,7 +3694,6 @@
 ./lib/isccfg/parser.c                          C       2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./lib/isccfg/tests/Atffile                     X       2016,2017,2018
 ./lib/isccfg/tests/Kyuafile                    X       2017,2018
-./lib/isccfg/tests/Makefile.in                 MAKE    2016,2017,2018
 ./lib/isccfg/tests/parser_test.c               C       2016,2018
 ./lib/isccfg/version.c                         C       1998,1999,2000,2001,2004,2005,2007,2016,2018
 ./lib/isccfg/win32/DLLMain.c                   C       2001,2004,2007,2016,2018
@@ -3822,12 +3704,9 @@
 ./lib/isccfg/win32/version.c                   C       1998,1999,2000,2001,2004,2007,2016,2018
 ./lib/ns/Atffile                               X       2017,2018
 ./lib/ns/Kyuafile                              X       2017,2018
-./lib/ns/Makefile.in                           MAKE    2017,2018
 ./lib/ns/api                                   X       2017,2018
 ./lib/ns/client.c                              C       2017,2018
 ./lib/ns/hooks.h                               C       2017,2018
-./lib/ns/include/Makefile.in                   MAKE    2017,2018
-./lib/ns/include/ns/Makefile.in                        MAKE    2017,2018
 ./lib/ns/include/ns/client.h                   C       2017,2018
 ./lib/ns/include/ns/interfacemgr.h             C       2017,2018
 ./lib/ns/include/ns/lib.h                      C       2017,2018
@@ -3853,7 +3732,6 @@
 ./lib/ns/stats.c                               C       2017,2018
 ./lib/ns/tests/Atffile                         X       2017,2018
 ./lib/ns/tests/Kyuafile                                X       2017,2018
-./lib/ns/tests/Makefile.in                     MAKE    2017,2018
 ./lib/ns/tests/listenlist_test.c               C       2017,2018
 ./lib/ns/tests/notify_test.c                   C       2017,2018
 ./lib/ns/tests/nstest.c                                C       2017,2018
@@ -3872,7 +3750,6 @@
 ./lib/ns/win32/version.c                       C       2017,2018
 ./lib/ns/xfrout.c                              C       2017,2018
 ./lib/samples/Makefile-postinstall.in          MAKE    2009,2012,2013,2014,2016,2017,2018
-./lib/samples/Makefile.in                      MAKE    2009,2012,2013,2014,2015,2016,2017,2018
 ./lib/samples/nsprobe.c                                C       2009,2010,2011,2012,2013,2014,2015,2016,2018
 ./lib/samples/resolve.c                                C       2009,2012,2013,2014,2015,2016,2017,2018
 ./lib/samples/rootkey.sh                       SH      2013,2016,2018
@@ -3911,12 +3788,10 @@
 ./m4/ltsugar.m4                                        X       2012,2018
 ./m4/ltversion.m4                              X       2012,2018
 ./m4/lt~obsolete.m4                            X       2012,2018
-./make/Makefile.in                             MAKE    1998,1999,2000,2001,2004,2007,2012,2016,2018
 ./make/includes.in                             MAKE    1999,2000,2001,2004,2005,2007,2012,2014,2016,2017,2018
 ./make/mkdep.in                                        X       1999,2000,2001,2006,2011,2014,2018
 ./make/rules.in                                        MAKE    1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017,2018
 ./mkinstalldirs                                        X       1996,2018
-./unit/Makefile.in                             MAKE    2011,2012,2017,2018
 ./unit/README                                  X       2011,2013,2018
 ./unit/atf-src/.travis.yml                     X       2018
 ./unit/atf-src/AUTHORS                         X       2011,2013,2018
@@ -3925,10 +3800,8 @@
 ./unit/atf-src/INSTALL                         X       2011,2013,2018
 ./unit/atf-src/Kyuafile                                X       2013,2018
 ./unit/atf-src/Makefile.am                     X       2011,2013,2018
-./unit/atf-src/Makefile.in                     X       2011,2013,2018
 ./unit/atf-src/NEWS                            X       2011,2013,2018
 ./unit/atf-src/README                          X       2011,2018
-./unit/atf-src/README.md                       X       2018
 ./unit/atf-src/aclocal.m4                      X       2011,2013,2018
 ./unit/atf-src/admin/Makefile.am.inc           X       2011,2013,2018
 ./unit/atf-src/admin/ar-lib                    X       2018

diff --git a/util/merge_copyrights b/util/merge_copyrights
index d0c60ba77c8a0920f4eddf33db5b9475f06a752b..1f2b64bf282522c4c0ca11521971bf07fe457e42 100644 (file)
--- a/util/merge_copyrights
+++ b/util/merge_copyrights
@@ -35,8 +35,12 @@ while (<CHANGES>) {
               /CVS/ |          # CVS directory
               /\.git/ |                # git directory
               /\.gitignore |   # .gitignore files
+              /Makefile.in |   # build system doesn't need to have copyright
+              /configure   |   # build system doesn't need to have copyright
+              /fuzz/.*\.in/ |  # ignore fuzz corpus
               util/newcopyrights | # our output
               \.bak$ |         # created by update_copyrights
+              \.md$ |          # READMEs and such
               /(dnssafe|openssl)/.*\.[ch]$ |   # imported
               doc/(draft|expired|rfc)/         # imported
             %x);