32 files changed, 70 insertions, 67 deletions

diff --git a/.gitignore b/.gitignore
index 3695362..53b4f20 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,19 +20,19 @@
 /libtool
 /libxcrypt.pc
 /stamp-h1
-/m4/compile
-/m4/config.guess
-/m4/config.sub
-/m4/depcomp
-/m4/install-sh
-/m4/libtool.m4
-/m4/ltmain.sh
-/m4/ltoptions.m4
-/m4/ltsugar.m4
-/m4/ltversion.m4
-/m4/lt~obsolete.m4
-/m4/missing
-/m4/test-driver
+/build-aux/compile
+/build-aux/config.guess
+/build-aux/config.sub
+/build-aux/depcomp
+/build-aux/install-sh
+/build-aux/libtool.m4
+/build-aux/ltmain.sh
+/build-aux/ltoptions.m4
+/build-aux/ltsugar.m4
+/build-aux/ltversion.m4
+/build-aux/lt~obsolete.m4
+/build-aux/missing
+/build-aux/test-driver
 
 # compiler output
 *.gcda
diff --git a/.travis.yml b/.travis.yml
index a64512f..7e444f5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,16 +24,16 @@ notifications:
     skip_join: true
 
 install:
-  - ./.travis_install.sh
+  - build-aux/travis-install
 
 before_script:
-  - ./.travis_before_script.sh
+  - build-aux/travis-before
 
 script:
-  - ./.travis_script.sh
+  - build-aux/travis-build
 
 after_success:
-  - ./.travis_after_success.sh
+  - build-aux/travis-after-success
 
 
 # Repeated configuration blocks, referred to below by YAML aliases.
diff --git a/LICENSING b/LICENSING
index 0781153..62b2b20 100644
--- a/LICENSING
+++ b/LICENSING
@@ -75,52 +75,53 @@ source tree.  For specific licensing terms consult the files themselves.
  * Public domain, written by Zack Weinberg et al.:
    byteorder.h, randombytes.c, test-byteorder.c
    test-alg-pbkdf-hmac-sha256.c
-   gen-crypt-h.awk, gen-map.awk, gen-vers.awk
    test-badsetting.c, test-crypt-badargs.c, test-getrandom-fallbacks.c,
    test-getrandom-interface.c, test-symbols-compat.sh,
-   test-symbols-renames.sh, test-symbols-static.sh
-   m4/zw_alignment.m4, m4/zw_static_assert.m4, m4/zw_endianness.m4,
-   m4/zw_ld_wrap.m4, m4/skip-if-exec-format-error
+   test-symbols-renames.sh, test-symbols-static.sh,
+   build-aux/gen-crypt-h, build-aux/gen-crypt-symbol-vers-h,
+   build-aux/gen-libcrypt-map, build-aux/skip-if-exec-format-error,
+   build-aux/zw_alignment.m4, build-aux/zw_static_assert.m4,
+   build-aux/zw_endianness.m4, build-aux/zw_ld_wrap.m4
 
  * Copyright Zack Weinberg and Free Software Foundation, Inc;
    GPL (v3 or later), with Autoconf exception:
-   m4/zw_automodern.m4, m4/zw_simple_warnings.m4
+   build-aux/zw_automodern.m4, build-aux/zw_simple_warnings.m4
 
  * Copyright <vt at altlinux.org>; 0-clause BSD:
    crypt-yescrypt.c, test-crypt-yescrypt.c
 
  * Copyright Kevin Cernekee; FSF All Permissive License:
-   m4/ax_check_vscript.m4
+   build-aux/ax_check_vscript.m4
 
  * Copyright Maarten Bosmans; FSF All Permissive License:
-   m4/ax_append_compile_flags.m4
+   build-aux/ax_append_compile_flags.m4
 
  * Copyright Guido U. Draheim, Maarten Bosmans;
    FSF All Permissive License:
-   m4/ax_append_flag.m4, m4/ax_check_compile_flag.m4
+   build-aux/ax_append_flag.m4, build-aux/ax_check_compile_flag.m4
 
  * Copyright Mike Frysinger; FSF All Permissive License:
-   m4/ax_require_defined.m4
+   build-aux/ax_require_defined.m4
 
  * Copyright Scott James Remnant, Dan Nicholson;
    GPL (v2 or later), with Autoconf exception:
-   m4/pkg_installdir_compat.m4
+   build-aux/pkg_installdir_compat.m4
 
  * Copyright Tim Toolan; FSF All Permissive License:
-   m4/ax_compare_version.m4
+   build-aux/ax_compare_version.m4
 
  * Copyright Philip Withnall; FSF All Permissive License:
-   m4/ax_valgrind_check.m4
+   build-aux/ax_valgrind_check.m4
 
  * Copyright Steven G. Johnson, Daniel Richard G.;
    GPL (v3 or later), with Autoconf exception:
-   m4/ax_pthread.m4
+   build-aux/ax_pthread.m4
 
  * Copyright Francesco Salvestrini; FSF All Permissive License:
-   m4/ax_prog_python_version.m4
+   build-aux/ax_prog_python_version.m4
 
  * Copyright Andrew Collier; FSF All Permissive License:
-   m4/ax_python_module.m4
+   build-aux/ax_python_module.m4
 
  * Copyright holders unknown, no statement of license (all of these
    files are part of the testsuite and do not contribute to the
diff --git a/Makefile.am b/Makefile.am
index 430115a..f0f92c3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,7 +12,7 @@ AUTOMAKE_OPTIONS = \
 	gnits \
 	subdir-objects
 
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I build-aux
 
 AM_CPPFLAGS = -I$(srcdir)/lib
 AM_CFLAGS = $(WARN_CFLAGS) $(OPTI_FLAGS)
@@ -27,19 +27,19 @@ EXTRA_DIST = \
 	THANKS \
 	lib/alg-yescrypt-platform.c \
 	lib/crypt.h.in.in \
-	lib/gen-crypt-h.awk \
-	lib/gen-hashes.awk \
-	lib/gen-map.awk \
-	lib/gen-vers.awk \
 	lib/hashes.conf \
 	lib/libcrypt.map.in \
 	lib/libcrypt.minver.linux \
 	lib/libcrypt.minver.kfreebsd \
 	lib/libcrypt.minver.hurd \
 	lib/libcrypt.minver.no \
-	lib/sel-hashes.awk \
 	lib/xcrypt.h.in \
-	m4/skip-if-exec-format-error \
+	build-aux/expand-selected-hashes \
+	build-aux/gen-crypt-h \
+	build-aux/gen-crypt-hashes-h \
+	build-aux/gen-crypt-symbol-vers-h \
+	build-aux/gen-libcrypt-map \
+	build-aux/skip-if-exec-format-error \
 	test/symbols-compat.sh \
 	test/symbols-renames.sh \
 	test/symbols-static.sh
@@ -179,34 +179,35 @@ Makefile.deps: crypt.h crypt-hashes.h crypt-symbol-vers.h xcrypt.h
 	$(AM_V_GEN)LC_ALL=C echo "# Deps" > Makefile.deps.T
 	$(AM_V_at)mv -f Makefile.deps.T Makefile.deps
 
-libcrypt.map: lib/libcrypt.map.in lib/gen-map.awk Makefile
+libcrypt.map: lib/libcrypt.map.in build-aux/gen-libcrypt-map Makefile
 	$(AM_V_GEN)LC_ALL=C $(AWK) \
 	  -v SYMVER_MIN=$(SYMVER_MIN) \
 	  -v SYMVER_FLOOR=$(SYMVER_FLOOR) \
 	  -v COMPAT_ABI=$(COMPAT_ABI) \
-	  -f $(srcdir)/lib/gen-map.awk \
+	  -f $(srcdir)/build-aux/gen-libcrypt-map \
 	     $(srcdir)/lib/libcrypt.map.in > libcrypt.map.T
 	$(AM_V_at)mv -f libcrypt.map.T libcrypt.map
 
-crypt-hashes.h: lib/hashes.conf lib/gen-hashes.awk Makefile
+crypt-hashes.h: lib/hashes.conf build-aux/gen-crypt-hashes-h Makefile
 	$(AM_V_GEN)LC_ALL=C $(AWK) \
 	  -v ENABLED_HASHES=$(hashes_enabled) \
-	  -f $(srcdir)/lib/gen-hashes.awk \
+	  -f $(srcdir)/build-aux/gen-crypt-hashes-h \
 	     $(srcdir)/lib/hashes.conf > crypt-hashes.h.T
 	$(AM_V_at)mv -f crypt-hashes.h.T crypt-hashes.h
 
-crypt-symbol-vers.h: lib/libcrypt.map.in lib/gen-vers.awk Makefile
+crypt-symbol-vers.h: lib/libcrypt.map.in build-aux/gen-crypt-symbol-vers-h \
+		     Makefile
 	$(AM_V_GEN)LC_ALL=C $(AWK) \
 	  -v SYMVER_MIN=$(SYMVER_MIN) \
 	  -v SYMVER_FLOOR=$(SYMVER_FLOOR) \
 	  -v COMPAT_ABI=$(COMPAT_ABI) \
-	  -f $(srcdir)/lib/gen-vers.awk \
+	  -f $(srcdir)/build-aux/gen-crypt-symbol-vers-h \
 	     $(srcdir)/lib/libcrypt.map.in > crypt-symbol-vers.h.T
 	$(AM_V_at)mv -f crypt-symbol-vers.h.T crypt-symbol-vers.h
 
-crypt.h: crypt.h.in crypt-hashes.h lib/gen-crypt-h.awk config.h Makefile
+crypt.h: crypt.h.in crypt-hashes.h build-aux/gen-crypt-h config.h Makefile
 	$(AM_V_GEN)LC_ALL=C $(AWK) \
-	  -f $(srcdir)/lib/gen-crypt-h.awk config.h \
+	  -f $(srcdir)/build-aux/gen-crypt-h config.h \
 	     $(builddir)/crypt.h.in > crypt.h.T
 	$(AM_V_GEN)LC_ALL=C \
 	$(GREP) -q "#define HASH_ALGORITHM_DEFAULT" crypt-hashes.h && \
@@ -214,9 +215,9 @@ crypt.h: crypt.h.in crypt-hashes.h lib/gen-crypt-h.awk config.h Makefile
 	$(SED) -i -e "s/@DEFAULT_PREFIX_ENABLED@/0/g" crypt.h.T
 	$(AM_V_at)mv -f crypt.h.T crypt.h
 
-xcrypt.h: lib/xcrypt.h.in lib/gen-crypt-h.awk config.h Makefile
+xcrypt.h: lib/xcrypt.h.in build-aux/gen-crypt-h config.h Makefile
 	$(AM_V_GEN)LC_ALL=C $(AWK) \
-	  -f $(srcdir)/lib/gen-crypt-h.awk \
+	  -f $(srcdir)/build-aux/gen-crypt-h \
 	     config.h $(srcdir)/lib/xcrypt.h.in \
 	  > xcrypt.h.T
 	$(AM_V_at)mv -f xcrypt.h.T xcrypt.h
@@ -432,7 +433,7 @@ AM_TESTS_ENVIRONMENT = \
     export host_os lib_la lib_map AWK CC CPP CPPFLAGS NM;
 
 if CROSS_COMPILING
-LOG_COMPILER = m4/skip-if-exec-format-error
+LOG_COMPILER = build-aux/skip-if-exec-format-error
 endif
 
 # Refer to object files that are linked into libxcrypt with the
diff --git a/m4/ax_append_compile_flags.m4 b/build-aux/ax_append_compile_flags.m4
index 9c85635..9c85635 100644
--- a/m4/ax_append_compile_flags.m4
+++ b/build-aux/ax_append_compile_flags.m4
diff --git a/m4/ax_append_flag.m4 b/build-aux/ax_append_flag.m4
index dd6d8b6..dd6d8b6 100644
--- a/m4/ax_append_flag.m4
+++ b/build-aux/ax_append_flag.m4
diff --git a/m4/ax_check_compile_flag.m4 b/build-aux/ax_check_compile_flag.m4
index bd753b3..bd753b3 100644
--- a/m4/ax_check_compile_flag.m4
+++ b/build-aux/ax_check_compile_flag.m4
diff --git a/m4/ax_check_vscript.m4 b/build-aux/ax_check_vscript.m4
index 9851f32..9851f32 100644
--- a/m4/ax_check_vscript.m4
+++ b/build-aux/ax_check_vscript.m4
diff --git a/m4/ax_require_defined.m4 b/build-aux/ax_require_defined.m4
index 17c3eab..17c3eab 100644
--- a/m4/ax_require_defined.m4
+++ b/build-aux/ax_require_defined.m4
diff --git a/m4/ax_valgrind_check.m4 b/build-aux/ax_valgrind_check.m4
index b2297e1..b2297e1 100644
--- a/m4/ax_valgrind_check.m4
+++ b/build-aux/ax_valgrind_check.m4
diff --git a/.clang_gcov_wrapper.sh b/build-aux/clang-gcov-wrapper
index 4e320d8..4e320d8 100755
--- a/.clang_gcov_wrapper.sh
+++ b/build-aux/clang-gcov-wrapper
diff --git a/lib/sel-hashes.awk b/build-aux/expand-selected-hashes
index da6cfd7..da6cfd7 100644
--- a/lib/sel-hashes.awk
+++ b/build-aux/expand-selected-hashes
diff --git a/lib/gen-crypt-h.awk b/build-aux/gen-crypt-h
index d7ca1a2..d7ca1a2 100644
--- a/lib/gen-crypt-h.awk
+++ b/build-aux/gen-crypt-h
diff --git a/lib/gen-hashes.awk b/build-aux/gen-crypt-hashes-h
index 7f769ef..d042456 100644
--- a/lib/gen-hashes.awk
+++ b/build-aux/gen-crypt-hashes-h
@@ -89,7 +89,7 @@ BEGIN {
                    flag == "OPENBSD" || flag == "OSX"     || \
                    flag == "OWL"     || flag == "SOLARIS" || \
                    flag == "SUSE") {
-            # handled in sel-hashes.awk
+            # handled in expand-selected-hashes
         } else {
             printf("%s:%d: unrecognized flag %s\n", FILENAME, NR, flag) \
                 > "/dev/stderr"
@@ -123,7 +123,7 @@ END {
         exit 1
     }
 
-    print "/* Generated by genhashes.awk from hashes.conf.  DO NOT EDIT.  */"
+    print "/* Generated by gen-crypt-hashes-h from hashes.conf.  DO NOT EDIT.  */"
     print ""
     print "#ifndef _CRYPT_HASHES_H"
     print "#define _CRYPT_HASHES_H 1"
diff --git a/lib/gen-vers.awk b/build-aux/gen-crypt-symbol-vers-h
index 8bd9d5e..5cc046d 100644
--- a/lib/gen-vers.awk
+++ b/build-aux/gen-crypt-symbol-vers-h
@@ -10,12 +10,12 @@
 
 # The .map.in file is the first input file, and we expect the Makefile
 # to have set the variables SYMVER_MIN, SYMVER_FLOOR, and COMPAT_ABI.
-# See libcrypt.map.in and gen-vers.awk for explanations of the format
+# See libcrypt.map.in and gen-libcrypt-map for explanations of the format
 # of .map.in files.  See crypt-port.h for an explanation of how to use
 # the macros generated by this program.
 #
 # Note: if you change the format of .map.in files you probably need to
-# update gen-map.awk too.
+# update gen-libcrypt-map too.
 #
 # Note: we currently don't support compatibility symbols that need
 # a different definition from the default version.
@@ -110,7 +110,7 @@ END {
     # versions with symbols, discarding all symbols associated with
     # versions below SYMVER_MIN, raising symbols below SYMVER_FLOOR to
     # SYMVER_FLOOR, and removing duplicates.
-    # Note: unlike in gen-map.awk, symbols all of whose versions are
+    # Note: unlike in gen-libcrypt-map, symbols all of whose versions are
     # below SYMVER_MIN must still be counted in 'allsyms' so their
     # INCLUDE macros are generated.
     for (i = 1; i <= NVCHAIN; i++) {
@@ -132,7 +132,7 @@ END {
         }
     }
 
-    print "/* Generated from " ARGV[1] " by gen-vers.awk.  DO NOT EDIT.  */"
+    print "/* Generated from " ARGV[1] " by gen-crypt-symbol-vers-h.  DO NOT EDIT.  */"
     print ""
     print "#ifndef _CRYPT_SYMBOL_VERS_H"
     print "#define _CRYPT_SYMBOL_VERS_H 1"
diff --git a/lib/gen-map.awk b/build-aux/gen-libcrypt-map
index 025af05..e4383b6 100644
--- a/lib/gen-map.awk
+++ b/build-aux/gen-libcrypt-map
@@ -20,7 +20,7 @@
 # used as SYMVER_MIN or SYMVER_FLOOR.
 #
 # Note: if you change the format of .map.in files you probably need to
-# update gen-vers.awk too.
+# update gen-crypt-symbol-vers-h too.
 
 BEGIN {
     split("", SYMBOLS) # ensure SYMBOLS is an array
diff --git a/m4/pkg_installdir_compat.m4 b/build-aux/pkg_installdir_compat.m4
index 2bbe156..2bbe156 100644
--- a/m4/pkg_installdir_compat.m4
+++ b/build-aux/pkg_installdir_compat.m4
diff --git a/m4/skip-if-exec-format-error b/build-aux/skip-if-exec-format-error
index 901e6bb..901e6bb 100755
--- a/m4/skip-if-exec-format-error
+++ b/build-aux/skip-if-exec-format-error
diff --git a/.travis_after_success.sh b/build-aux/travis-after-success
index c72f4e9..fee3d5d 100755
--- a/.travis_after_success.sh
+++ b/build-aux/travis-after-success
@@ -20,7 +20,7 @@ if [ "$TRAVIS_OS_NAME" = osx ]; then
 
 elif [ "$TRAVIS_OS_NAME" = linux ]; then
   if [ "$CC" = clang ]; then
-    GCOV="$PWD/.clang_gcov_wrapper.sh"
+    GCOV="$PWD/build-aux/clang-gcov-wrapper"
   fi
 
 fi
diff --git a/.travis_before_script.sh b/build-aux/travis-before
index abe48e5..abe48e5 100755
--- a/.travis_before_script.sh
+++ b/build-aux/travis-before
diff --git a/.travis_script.sh b/build-aux/travis-build
index 36a84b1..36a84b1 100755
--- a/.travis_script.sh
+++ b/build-aux/travis-build
diff --git a/.travis_install.sh b/build-aux/travis-install
index 3fc154b..3fc154b 100755
--- a/.travis_install.sh
+++ b/build-aux/travis-install
diff --git a/m4/zw_alignment.m4 b/build-aux/zw_alignment.m4
index a714196..a714196 100644
--- a/m4/zw_alignment.m4
+++ b/build-aux/zw_alignment.m4
diff --git a/m4/zw_automodern.m4 b/build-aux/zw_automodern.m4
index 8451b20..8451b20 100644
--- a/m4/zw_automodern.m4
+++ b/build-aux/zw_automodern.m4
diff --git a/m4/zw_endianness.m4 b/build-aux/zw_endianness.m4
index 9513216..9513216 100644
--- a/m4/zw_endianness.m4
+++ b/build-aux/zw_endianness.m4
diff --git a/m4/zw_ld_wrap.m4 b/build-aux/zw_ld_wrap.m4
index 87b22e7..87b22e7 100644
--- a/m4/zw_ld_wrap.m4
+++ b/build-aux/zw_ld_wrap.m4
diff --git a/m4/zw_simple_warnings.m4 b/build-aux/zw_simple_warnings.m4
index fef1312..fef1312 100644
--- a/m4/zw_simple_warnings.m4
+++ b/build-aux/zw_simple_warnings.m4
diff --git a/m4/zw_static_assert.m4 b/build-aux/zw_static_assert.m4
index e33931a..e33931a 100644
--- a/m4/zw_static_assert.m4
+++ b/build-aux/zw_static_assert.m4
diff --git a/configure.ac b/configure.ac
index 79ae7d4..b42c570 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,12 +1,12 @@
 # Process this file with autoconf to produce a configure script.
-m4_include([m4/zw_automodern.m4])
+m4_include([build-aux/zw_automodern.m4])
 AC_INIT([xcrypt],
         [4.4.18],
         [https://github.com/besser82/libxcrypt/issues],
         [libxcrypt],
         [https://github.com/besser82/libxcrypt])
-AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_AUX_DIR([m4])
+AC_CONFIG_MACRO_DIR([build-aux])
+AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_SRCDIR([lib/crypt.c])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_FILES([
@@ -369,7 +369,7 @@ AC_ARG_ENABLE([hashes],
 )
 # This code must run after AC_PROG_AWK.
 hashes_enabled=$(
-    $AWK -f ${srcdir}/lib/sel-hashes.awk \
+    $AWK -f ${srcdir}/build-aux/expand-selected-hashes \
          -v SELECTED_HASHES="$hashes_selected" \
             ${srcdir}/lib/hashes.conf
 )
diff --git a/lib/crypt-port.h b/lib/crypt-port.h
index 5ce8bf7..0e9d6f2 100644
--- a/lib/crypt-port.h
+++ b/lib/crypt-port.h
@@ -210,7 +210,8 @@ _crypt_strcpy_or_abort (void *, const size_t, const void *);
 #define symver_nop() __asm__ ("")
 
 /* The macros for versioned symbols work differently in this library
-   than they do in glibc.  They are mostly auto-generated (see gen-vers.awk),
+   than they do in glibc.  They are mostly auto-generated
+   (see build-aux/gen-crypt-symbol-vers-h)
    and we currently don't support compatibility symbols that need a different
    definition from the default version.
 
diff --git a/lib/hashes.conf b/lib/hashes.conf
index 99ed116..817b5f0 100644
--- a/lib/hashes.conf
+++ b/lib/hashes.conf
@@ -1,4 +1,4 @@
-# This file is read by gen-hashes.awk and sel-hashes.awk.
+# This file is read by expand-selected-hashes and gen-crypt-hashes-h.
 # It lists, for each supported hash algorithm, the name to be used to
 # enable or disable it at configure time, which is also part of the
 # name used for the 'crypt_fn' and 'gensalt_fn' entry points to the
diff --git a/lib/libcrypt.map.in b/lib/libcrypt.map.in
index 4045894..1b751fd 100644
--- a/lib/libcrypt.map.in
+++ b/lib/libcrypt.map.in
@@ -1,5 +1,5 @@
-# This file is processed by gen-map.awk to produce the versions map file
-# for libxcrypt.
+# This file is processed by gen-libcrypt-map to produce the versions
+# map file for libxcrypt.
 # symbol default_version compat_version [compat_version ...]
 
 # Actively supported POSIX interfaces; in GNU libc since 2.0
@@ -38,7 +38,7 @@ fcrypt			-		GLIBC_2.0
 
 # This determines the ordering of the version chain.  Each symbol
 # version that appears above must also appear in this list, and to
-# simplify gen-map.awk, so must all of the versions listed in
+# simplify gen-libcrypt-map, so must all of the versions listed in
 # libcrypt.minver.  The ordering is left to right, top to bottom.
 %chain GLIBC_2.0 GLIBC_2.2 GLIBC_2.2.1 GLIBC_2.2.2 GLIBC_2.2.5 GLIBC_2.2.6 GLIBC_2.3
 %chain GLIBC_2.4 GLIBC_2.12 GLIBC_2.16 GLIBC_2.17 GLIBC_2.18 GLIBC_2.21