108 files changed, 198 insertions, 118 deletions

diff --git a/Makefile.am b/Makefile.am
index 41a3aa3..c0d3143 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,12 +5,17 @@
 #
 
 AUTOMAKE_OPTIONS = \
-	1.14 gnits dist-bzip2 dist-xz filename-length-max=99
+	1.14 \
+	dist-bzip2 \
+	dist-xz \
+	filename-length-max=99 \
+	gnits \
+	subdir-objects
 
 ACLOCAL_AMFLAGS = -I m4
 
+AM_CPPFLAGS = -I$(srcdir)/lib
 AM_CFLAGS = $(WARN_CFLAGS) $(OPTI_FLAGS)
-
 AM_LDFLAGS = $(RELRO_FLAG) $(BINDNOW_FLAG)
 
 @VALGRIND_CHECK_RULES@
@@ -18,27 +23,63 @@ AM_LDFLAGS = $(RELRO_FLAG) $(BINDNOW_FLAG)
 TEST_EXTENSIONS = .sh
 
 EXTRA_DIST = \
-	LICENSING THANKS \
-	crypt.h.in.in xcrypt.h.in libcrypt.map.in \
-	libcrypt.minver gen-map.awk gen-vers.awk \
-	gen-crypt-h.awk gen-hashes.awk sel-hashes.awk \
-	hashes.lst
+	LICENSING \
+	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.lst \
+	lib/libcrypt.map.in \
+	lib/libcrypt.minver \
+	lib/sel-hashes.awk \
+	lib/xcrypt.h.in \
+	m4/skip-if-exec-format-error \
+	test/symbols-compat.sh \
+	test/symbols-renames.sh \
+	test/symbols-static.sh
 
 notrans_dist_man3_MANS = \
-	crypt.3 crypt_r.3 crypt_ra.3 crypt_rn.3 \
-	crypt_checksalt.3 crypt_gensalt.3 crypt_gensalt_ra.3 \
-	crypt_gensalt_rn.3 crypt_preferred_method.3
-notrans_dist_man5_MANS = crypt.5
-
-nodist_include_HEADERS = crypt.h
-nodist_noinst_HEADERS = crypt-hashes.h crypt-symbol-vers.h
+	doc/crypt.3 \
+	doc/crypt_checksalt.3 \
+	doc/crypt_gensalt.3 \
+	doc/crypt_gensalt_ra.3 \
+	doc/crypt_gensalt_rn.3 \
+	doc/crypt_preferred_method.3 \
+	doc/crypt_r.3 \
+	doc/crypt_ra.3 \
+	doc/crypt_rn.3
+notrans_dist_man5_MANS = \
+	doc/crypt.5
+
+nodist_include_HEADERS = \
+	crypt.h
+nodist_noinst_HEADERS = \
+	crypt-hashes.h \
+	crypt-symbol-vers.h
 noinst_HEADERS = \
-	alg-des.h alg-gost3411-2012-const.h alg-gost3411-2012-core.h \
-	alg-gost3411-2012-hmac.h alg-gost3411-2012-precalc.h \
-	alg-gost3411-2012-ref.h alg-hmac-sha1.h alg-md4.h alg-md5.h \
-	alg-sha1.h alg-sha256.h alg-sha512.h alg-yescrypt.h \
-	alg-yescrypt-sysendian.h byteorder.h crypt-common.h \
-	crypt-obsolete.h crypt-port.h test-des-cases.h
+	lib/alg-des.h \
+	lib/alg-gost3411-2012-const.h \
+	lib/alg-gost3411-2012-core.h \
+	lib/alg-gost3411-2012-hmac.h \
+	lib/alg-gost3411-2012-precalc.h \
+	lib/alg-gost3411-2012-ref.h \
+	lib/alg-hmac-sha1.h \
+	lib/alg-md4.h \
+	lib/alg-md5.h \
+	lib/alg-sha1.h \
+	lib/alg-sha256.h \
+	lib/alg-sha512.h \
+	lib/alg-yescrypt-sysendian.h \
+	lib/alg-yescrypt.h \
+	lib/byteorder.h \
+	lib/crypt-common.h \
+	lib/crypt-obsolete.h \
+	lib/crypt-port.h \
+	test/des-cases.h \
+	test/crypt-kat.inc
 
 if ENABLE_XCRYPT_COMPAT_FILES
 nodist_include_HEADERS += xcrypt.h
@@ -46,21 +87,42 @@ else
 nodist_noinst_HEADERS += xcrypt.h
 endif
 
+noinst_PROGRAMS = \
+	lib/gen-des-tables
 
-noinst_PROGRAMS = gen-des-tables
+lib_LTLIBRARIES = \
+	libcrypt.la
 
-lib_LTLIBRARIES = libcrypt.la
 libcrypt_la_SOURCES = \
-	alg-des.c alg-des-tables.c alg-gost3411-2012-core.c \
-	alg-gost3411-2012-hmac.c alg-hmac-sha1.c alg-md4.c alg-md5.c \
-	alg-sha1.c alg-sha256.c alg-sha512.c alg-yescrypt-opt.c \
-	alg-yescrypt-common.c crypt.c crypt-bcrypt.c crypt-des.c \
-	crypt-gensalt-static.c crypt-gensalt.c crypt-gost-yescrypt.c \
-	crypt-md5.c crypt-nthash.c crypt-pbkdf1-sha1.c crypt-scrypt.c \
-	crypt-sha256.c crypt-sha512.c crypt-static.c crypt-sunmd5.c \
-	crypt-yescrypt.c randombytes.c crypt-common.c
-
-EXTRA_DIST += alg-yescrypt-platform.c
+	lib/alg-des-tables.c \
+	lib/alg-des.c \
+	lib/alg-gost3411-2012-core.c \
+	lib/alg-gost3411-2012-hmac.c \
+	lib/alg-hmac-sha1.c \
+	lib/alg-md4.c \
+	lib/alg-md5.c \
+	lib/alg-sha1.c \
+	lib/alg-sha256.c \
+	lib/alg-sha512.c \
+	lib/alg-yescrypt-common.c \
+	lib/alg-yescrypt-opt.c \
+	lib/crypt-bcrypt.c \
+	lib/crypt-common.c \
+	lib/crypt-des.c \
+	lib/crypt-gensalt-static.c \
+	lib/crypt-gensalt.c \
+	lib/crypt-gost-yescrypt.c \
+	lib/crypt-md5.c \
+	lib/crypt-nthash.c \
+	lib/crypt-pbkdf1-sha1.c \
+	lib/crypt-scrypt.c \
+	lib/crypt-sha256.c \
+	lib/crypt-sha512.c \
+	lib/crypt-static.c \
+	lib/crypt-sunmd5.c \
+	lib/crypt-yescrypt.c \
+	lib/crypt.c \
+	lib/randombytes.c
 
 pkgconfig_DATA = libxcrypt.pc
 
@@ -93,58 +155,66 @@ libcrypt_la_LDFLAGS += $(UNDEF_FLAG) $(TEXT_RELOC_FLAG) $(AM_LDFLAGS)
 
 libcrypt_la_CPPFLAGS = $(AM_CPPFLAGS) -DIN_LIBCRYPT
 
-CONFIG_STATUS_DEPENDENCIES = libcrypt.minver
+CONFIG_STATUS_DEPENDENCIES = lib/libcrypt.minver
 EXTRA_libcrypt_la_DEPENDENCIES = libcrypt.map
-CLEANFILES = Makefile.deps.T Makefile.deps \
+CLEANFILES = \
+	Makefile.deps Makefile.deps.T \
 	libcrypt.map libcrypt.map.T \
 	crypt-symbol-vers.h crypt-symbol-vers.h.T \
 	crypt-hashes.h crypt-hashes.h.T \
-	crypt.h crypt.h.T xcrypt.h xcrypt.h.T \
-	*.gcda *.gcno
+	crypt.h crypt.h.T \
+	xcrypt.h xcrypt.h.T \
+	*.gcda *.gcno \
+	lib/*.gcda lib/*.gcno \
+	test/*.gcda test/*.gcno
 
 DISTCLEANFILES = .deps/*.Plo
 
-# Empty target to have needed headers pre-generated before any other target.
-Makefile.deps: xcrypt.h libcrypt.map
+# Force generated headers to be generated before any source files that
+# might depend on them are compiled.
+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: libcrypt.map.in gen-map.awk Makefile
+libcrypt.map: lib/libcrypt.map.in lib/gen-map.awk 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)/gen-map.awk $(srcdir)/libcrypt.map.in > libcrypt.map.T
+	  -f $(srcdir)/lib/gen-map.awk \
+	     $(srcdir)/lib/libcrypt.map.in > libcrypt.map.T
 	$(AM_V_at)mv -f libcrypt.map.T libcrypt.map
 
-crypt-hashes.h: hashes.lst gen-hashes.awk Makefile
-	$(AM_V_GEN)LC_ALL=C $(AWK) -f $(srcdir)/gen-hashes.awk \
+crypt-hashes.h: lib/hashes.lst lib/gen-hashes.awk Makefile
+	$(AM_V_GEN)LC_ALL=C $(AWK) \
 	  -v ENABLED_HASHES=$(hashes_enabled) \
-	  $(srcdir)/hashes.lst > crypt-hashes.h.T
+	  -f $(srcdir)/lib/gen-hashes.awk \
+	     $(srcdir)/lib/hashes.lst > crypt-hashes.h.T
 	$(AM_V_at)mv -f crypt-hashes.h.T crypt-hashes.h
 
-crypt-symbol-vers.h: libcrypt.map.in gen-vers.awk Makefile
+crypt-symbol-vers.h: lib/libcrypt.map.in lib/gen-vers.awk 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)/gen-vers.awk \
-	     $(srcdir)/libcrypt.map.in > crypt-symbol-vers.h.T
+	  -f $(srcdir)/lib/gen-vers.awk \
+	     $(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 gen-crypt-h.awk config.h Makefile
+crypt.h: crypt.h.in crypt-hashes.h lib/gen-crypt-h.awk config.h Makefile
 	$(AM_V_GEN)LC_ALL=C $(AWK) \
-	  -f $(srcdir)/gen-crypt-h.awk config.h $(builddir)/crypt.h.in \
-	  > crypt.h.T
+	  -f $(srcdir)/lib/gen-crypt-h.awk config.h \
+	     $(builddir)/crypt.h.in > crypt.h.T
 	$(AM_V_GEN)LC_ALL=C \
 	$(GREP) -q "#define HASH_ALGORITHM_DEFAULT" crypt-hashes.h && \
 	$(SED) -i -e "s/@DEFAULT_PREFIX_ENABLED@/1/g" crypt.h.T || \
 	$(SED) -i -e "s/@DEFAULT_PREFIX_ENABLED@/0/g" crypt.h.T
 	$(AM_V_at)mv -f crypt.h.T crypt.h
 
-xcrypt.h: crypt.h crypt-symbol-vers.h
+xcrypt.h: lib/xcrypt.h.in lib/gen-crypt-h.awk config.h Makefile
 	$(AM_V_GEN)LC_ALL=C $(AWK) \
-	  -f $(srcdir)/gen-crypt-h.awk config.h $(srcdir)/xcrypt.h.in \
+	  -f $(srcdir)/lib/gen-crypt-h.awk \
+	     config.h $(srcdir)/lib/xcrypt.h.in \
 	  > xcrypt.h.T
 	$(AM_V_at)mv -f xcrypt.h.T xcrypt.h
 
@@ -228,60 +298,71 @@ endif
 endif
 
 check_PROGRAMS = \
-	test-alg-des test-alg-gost3411-2012 test-alg-gost3411-2012-hmac \
-	test-alg-hmac-sha1 test-alg-md4 test-alg-md5 \
-	test-alg-pbkdf-hmac-sha256 test-alg-sha1 test-alg-sha256 \
-	test-alg-sha512 test-alg-yescrypt test-checksalt \
-	test-crypt-kat \
-	test-crypt-gost-yescrypt \
-	test-byteorder test-badsalt test-badsetting \
-	test-gensalt test-gensalt-extradata test-gensalt-nthash \
-	test-preferred-method test-crypt-badargs test-short-outbuf \
-	test-compile-strong-alias test-getrandom-interface \
-	test-getrandom-fallbacks
-
-# headers used only by test programs
-noinst_HEADERS += test-crypt-kat.inc
+	test/alg-des \
+	test/alg-gost3411-2012 \
+	test/alg-gost3411-2012-hmac \
+	test/alg-hmac-sha1 \
+	test/alg-md4 \
+	test/alg-md5 \
+	test/alg-pbkdf-hmac-sha256 \
+	test/alg-sha1 \
+	test/alg-sha256 \
+	test/alg-sha512 \
+	test/alg-yescrypt \
+	test/badsalt \
+	test/badsetting \
+	test/byteorder \
+	test/checksalt \
+	test/compile-strong-alias \
+	test/crypt-badargs \
+	test/crypt-gost-yescrypt \
+	test/crypt-kat \
+	test/gensalt \
+	test/gensalt-extradata \
+	test/gensalt-nthash \
+	test/getrandom-fallbacks \
+	test/getrandom-interface \
+	test/preferred-method \
+	test/short-outbuf
 
 if ENABLE_CRYPT_KAT_GEN
 if ENABLE_SHARED
-# test-crypt-kat.inc can be regenerated by running test-crypt-kat-gen.py.
+# test/crypt-kat.inc can be regenerated by running test/crypt-kat-gen.py.
 # This is very slow and requires nonstandard Python libraries and a shared
 # library build of libcrypt already present in the build-tree, so we only
 # do it when explicitly requested.
 regen-test-crypt-kat: libcrypt.la
-	$(PYTHON) $(srcdir)/test-crypt-kat-gen.py > test-crypt-kat.inc.T
-	@if cmp -s test-crypt-kat.inc.T $(srcdir)/test-crypt-kat.inc; \
+	$(PYTHON) $(srcdir)/test/crypt-kat-gen.py > test-crypt-kat.inc.T
+	@if cmp -s test-crypt-kat.inc.T $(srcdir)/test/crypt-kat.inc; \
 	then echo test-crypt-kat.inc is unchanged; rm test-crypt-kat.inc.T; \
-	else echo mv -f test-crypt-kat.inc.T $(srcdir)/test-crypt-kat.inc; \
-	mv -f test-crypt-kat.inc.T $(srcdir)/test-crypt-kat.inc; fi
+	else echo mv -f test-crypt-kat.inc.T $(srcdir)/test/crypt-kat.inc; \
+	mv -f test-crypt-kat.inc.T $(srcdir)/test/crypt-kat.inc; fi
 phony_targets += regen-test-crypt-kat
+CLEANFILES += test-crypt-kat.inc.T
 endif
 endif
 
 if ENABLE_OBSOLETE_API
-libcrypt_la_SOURCES += crypt-des-obsolete.c
-check_PROGRAMS += test-des-obsolete test-des-obsolete_r test-fcrypt-enosys
+libcrypt_la_SOURCES += lib/crypt-des-obsolete.c
+check_PROGRAMS += test/des-obsolete test/des-obsolete_r test/fcrypt-enosys
 endif
 
 TESTS = $(check_PROGRAMS)
 
 if ENABLE_STATIC
-TESTS += test-symbols-static.sh
+TESTS += test/symbols-static.sh
 
 if HAVE_CPP_dD
-TESTS += test-symbols-renames.sh
+TESTS += test/symbols-renames.sh
 endif
 endif
 
 if ENABLE_OBSOLETE_API
-TESTS += test-symbols-compat.sh
+TESTS += test/symbols-compat.sh
 endif
 
-EXTRA_DIST += test-symbols-static.sh test-symbols-compat.sh test-symbols-renames.sh
-
 AM_TESTS_ENVIRONMENT = \
-    lib_la="./libcrypt.la"; lib_map="$(srcdir)/libcrypt.map.in"; \
+    lib_la="./libcrypt.la"; lib_map="$(srcdir)/lib/libcrypt.map.in"; \
     CC="$(CC)"; CPP="$(CPP)"; \
     CPPFLAGS="$(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)"; \
     CPPFLAGS="$${CPPFLAGS} $(AM_CPPFLAGS) $(CPPFLAGS)"; \
@@ -291,12 +372,10 @@ if CROSS_COMPILING
 LOG_COMPILER = m4/skip-if-exec-format-error
 endif
 
-EXTRA_DIST += m4/skip-if-exec-format-error
-
 # Refer to object files that are linked into libxcrypt with the
-# qualified name, libcrypt_la-foobar.lo, to prevent them from
+# qualified name, lib/libcrypt_la-foobar.lo, to prevent them from
 # being compiled a second time.
-COMMON_TEST_OBJECTS = libcrypt_la-crypt-common.lo libcrypt.la
+COMMON_TEST_OBJECTS = lib/libcrypt_la-crypt-common.lo libcrypt.la
 
 test_badsalt_LDADD = $(COMMON_TEST_OBJECTS)
 test_badsetting_LDADD = $(COMMON_TEST_OBJECTS)
@@ -318,58 +397,58 @@ test_crypt_kat_LDADD  = $(COMMON_TEST_OBJECTS) $(PTHREAD_LIBS)
 # These tests call internal APIs that may not be accessible from the
 # fully linked shared library.
 test_alg_des_LDADD = \
-	libcrypt_la-alg-des.lo \
-	libcrypt_la-alg-des-tables.lo \
+	lib/libcrypt_la-alg-des.lo \
+	lib/libcrypt_la-alg-des-tables.lo \
 	$(COMMON_TEST_OBJECTS)
 test_alg_gost3411_2012_LDADD = \
-	libcrypt_la-alg-gost3411-2012-core.lo \
-	libcrypt_la-alg-gost3411-2012-hmac.lo \
+	lib/libcrypt_la-alg-gost3411-2012-core.lo \
+	lib/libcrypt_la-alg-gost3411-2012-hmac.lo \
 	$(COMMON_TEST_OBJECTS)
 test_alg_gost3411_2012_hmac_LDADD = \
-	libcrypt_la-alg-gost3411-2012-core.lo \
-	libcrypt_la-alg-gost3411-2012-hmac.lo \
+	lib/libcrypt_la-alg-gost3411-2012-core.lo \
+	lib/libcrypt_la-alg-gost3411-2012-hmac.lo \
 	$(COMMON_TEST_OBJECTS)
 test_alg_hmac_sha1_LDADD = \
-	libcrypt_la-alg-sha1.lo \
-	libcrypt_la-alg-hmac-sha1.lo \
+	lib/libcrypt_la-alg-sha1.lo \
+	lib/libcrypt_la-alg-hmac-sha1.lo \
 	$(COMMON_TEST_OBJECTS)
 test_alg_md4_LDADD = \
-	libcrypt_la-alg-md4.lo \
+	lib/libcrypt_la-alg-md4.lo \
 	$(COMMON_TEST_OBJECTS)
 test_alg_md5_LDADD = \
-	libcrypt_la-alg-md5.lo \
+	lib/libcrypt_la-alg-md5.lo \
 	$(COMMON_TEST_OBJECTS)
 test_alg_pbkdf_hmac_sha256_LDADD = \
-	libcrypt_la-alg-sha256.lo \
+	lib/libcrypt_la-alg-sha256.lo \
 	$(COMMON_TEST_OBJECTS)
 test_alg_sha1_LDADD = \
-	libcrypt_la-alg-sha1.lo \
+	lib/libcrypt_la-alg-sha1.lo \
 	$(COMMON_TEST_OBJECTS)
 test_alg_sha256_LDADD = \
-	libcrypt_la-alg-sha256.lo \
+	lib/libcrypt_la-alg-sha256.lo \
 	$(COMMON_TEST_OBJECTS)
 test_alg_sha512_LDADD = \
-	libcrypt_la-alg-sha512.lo \
+	lib/libcrypt_la-alg-sha512.lo \
 	$(COMMON_TEST_OBJECTS)
 test_alg_yescrypt_LDADD = \
-	libcrypt_la-alg-sha256.lo \
-	libcrypt_la-alg-yescrypt-common.lo \
-	libcrypt_la-alg-yescrypt-opt.lo \
+	lib/libcrypt_la-alg-sha256.lo \
+	lib/libcrypt_la-alg-yescrypt-common.lo \
+	lib/libcrypt_la-alg-yescrypt-opt.lo \
 	$(COMMON_TEST_OBJECTS)
 test_crypt_gost_yescrypt_LDADD = \
-	libcrypt_la-alg-gost3411-2012-core.lo \
-	libcrypt_la-alg-gost3411-2012-hmac.lo \
-	libcrypt_la-alg-sha256.lo \
-	libcrypt_la-alg-yescrypt-common.lo \
-	libcrypt_la-alg-yescrypt-opt.lo \
-	libcrypt_la-crypt-yescrypt.lo \
+	lib/libcrypt_la-alg-gost3411-2012-core.lo \
+	lib/libcrypt_la-alg-gost3411-2012-hmac.lo \
+	lib/libcrypt_la-alg-sha256.lo \
+	lib/libcrypt_la-alg-yescrypt-common.lo \
+	lib/libcrypt_la-alg-yescrypt-opt.lo \
+	lib/libcrypt_la-crypt-yescrypt.lo \
 	$(COMMON_TEST_OBJECTS)
 
 test_getrandom_interface_LDADD = \
-	libcrypt_la-randombytes.lo \
+	lib/libcrypt_la-randombytes.lo \
 	$(COMMON_TEST_OBJECTS)
 test_getrandom_fallbacks_LDADD = \
-	libcrypt_la-randombytes.lo \
+	lib/libcrypt_la-randombytes.lo \
 	$(COMMON_TEST_OBJECTS)
 
 if HAVE_LD_WRAP
diff --git a/configure.ac b/configure.ac
index c6efe43..367b8b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,12 +7,12 @@ AC_INIT([xcrypt],
         [https://github.com/besser82/libxcrypt])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([m4])
-AC_CONFIG_SRCDIR([crypt.c])
+AC_CONFIG_SRCDIR([lib/crypt.c])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_FILES([
   Makefile
-  crypt.h.in
-  libxcrypt.pc
+  crypt.h.in:lib/crypt.h.in.in
+  libxcrypt.pc:lib/libxcrypt.pc.in
 ])
 AM_INIT_AUTOMAKE([tar-v7])
 
@@ -386,8 +386,9 @@ AC_ARG_ENABLE([hashes],
 )
 # This code must run after AC_PROG_AWK.
 hashes_enabled=$(
-    $AWK -f ${srcdir}/sel-hashes.awk -v SELECTED_HASHES="$hashes_selected" \
-            ${srcdir}/hashes.lst
+    $AWK -f ${srcdir}/lib/sel-hashes.awk \
+         -v SELECTED_HASHES="$hashes_selected" \
+            ${srcdir}/lib/hashes.lst
 )
 if test x"$hashes_enabled" = x || test x"$hashes_enabled" = x,; then
     AC_MSG_ERROR([bad value '${hashes_selected}' for --enable-hashes])
@@ -456,7 +457,7 @@ if test $enable_obsolete_api = 1; then
             break
           fi
         fi
-      done < ${srcdir}/libcrypt.minver
+      done < ${srcdir}/lib/libcrypt.minver
     ;;
 
     *gnu*)
diff --git a/crypt.3 b/doc/crypt.3
index f93004f..f93004f 100644
--- a/crypt.3
+++ b/doc/crypt.3
diff --git a/crypt.5 b/doc/crypt.5
index 3dbab96..3dbab96 100644
--- a/crypt.5
+++ b/doc/crypt.5
diff --git a/crypt_checksalt.3 b/doc/crypt_checksalt.3
index f9948e8..f9948e8 100644
--- a/crypt_checksalt.3
+++ b/doc/crypt_checksalt.3
diff --git a/crypt_gensalt.3 b/doc/crypt_gensalt.3
index 3b3dab5..3b3dab5 100644
--- a/crypt_gensalt.3
+++ b/doc/crypt_gensalt.3
diff --git a/crypt_gensalt_ra.3 b/doc/crypt_gensalt_ra.3
index def4ace..def4ace 100644
--- a/crypt_gensalt_ra.3
+++ b/doc/crypt_gensalt_ra.3
diff --git a/crypt_gensalt_rn.3 b/doc/crypt_gensalt_rn.3
index def4ace..def4ace 100644
--- a/crypt_gensalt_rn.3
+++ b/doc/crypt_gensalt_rn.3
diff --git a/crypt_preferred_method.3 b/doc/crypt_preferred_method.3
index b26656a..b26656a 100644
--- a/crypt_preferred_method.3
+++ b/doc/crypt_preferred_method.3
diff --git a/crypt_r.3 b/doc/crypt_r.3
index 3944ebd..3944ebd 100644
--- a/crypt_r.3
+++ b/doc/crypt_r.3
diff --git a/crypt_ra.3 b/doc/crypt_ra.3
index 3944ebd..3944ebd 100644
--- a/crypt_ra.3
+++ b/doc/crypt_ra.3
diff --git a/crypt_rn.3 b/doc/crypt_rn.3
index 3944ebd..3944ebd 100644
--- a/crypt_rn.3
+++ b/doc/crypt_rn.3
diff --git a/alg-des-tables.c b/lib/alg-des-tables.c
index 0bbd79b..0bbd79b 100644
--- a/alg-des-tables.c
+++ b/lib/alg-des-tables.c
diff --git a/alg-des.c b/lib/alg-des.c
index 80b207a..80b207a 100644
--- a/alg-des.c
+++ b/lib/alg-des.c
diff --git a/alg-des.h b/lib/alg-des.h
index 505fd79..505fd79 100644
--- a/alg-des.h
+++ b/lib/alg-des.h
diff --git a/alg-gost3411-2012-const.h b/lib/alg-gost3411-2012-const.h
index 9e07c4d..9e07c4d 100644
--- a/alg-gost3411-2012-const.h
+++ b/lib/alg-gost3411-2012-const.h
diff --git a/alg-gost3411-2012-core.c b/lib/alg-gost3411-2012-core.c
index 2c36574..2c36574 100644
--- a/alg-gost3411-2012-core.c
+++ b/lib/alg-gost3411-2012-core.c
diff --git a/alg-gost3411-2012-core.h b/lib/alg-gost3411-2012-core.h
index 2464cdf..2464cdf 100644
--- a/alg-gost3411-2012-core.h
+++ b/lib/alg-gost3411-2012-core.h
diff --git a/alg-gost3411-2012-hmac.c b/lib/alg-gost3411-2012-hmac.c
index 45001d2..45001d2 100644
--- a/alg-gost3411-2012-hmac.c
+++ b/lib/alg-gost3411-2012-hmac.c
diff --git a/alg-gost3411-2012-hmac.h b/lib/alg-gost3411-2012-hmac.h
index d9fcc8e..d9fcc8e 100644
--- a/alg-gost3411-2012-hmac.h
+++ b/lib/alg-gost3411-2012-hmac.h
diff --git a/alg-gost3411-2012-precalc.h b/lib/alg-gost3411-2012-precalc.h
index a71d7eb..a71d7eb 100644
--- a/alg-gost3411-2012-precalc.h
+++ b/lib/alg-gost3411-2012-precalc.h
diff --git a/alg-gost3411-2012-ref.h b/lib/alg-gost3411-2012-ref.h
index 0031b9f..0031b9f 100644
--- a/alg-gost3411-2012-ref.h
+++ b/lib/alg-gost3411-2012-ref.h
diff --git a/alg-hmac-sha1.c b/lib/alg-hmac-sha1.c
index a72a96d..a72a96d 100644
--- a/alg-hmac-sha1.c
+++ b/lib/alg-hmac-sha1.c
diff --git a/alg-hmac-sha1.h b/lib/alg-hmac-sha1.h
index c5db9ab..c5db9ab 100644
--- a/alg-hmac-sha1.h
+++ b/lib/alg-hmac-sha1.h
diff --git a/alg-md4.c b/lib/alg-md4.c
index be51cc1..be51cc1 100644
--- a/alg-md4.c
+++ b/lib/alg-md4.c
diff --git a/alg-md4.h b/lib/alg-md4.h
index 473930e..473930e 100644
--- a/alg-md4.h
+++ b/lib/alg-md4.h
diff --git a/alg-md5.c b/lib/alg-md5.c
index 2d78375..2d78375 100644
--- a/alg-md5.c
+++ b/lib/alg-md5.c
diff --git a/alg-md5.h b/lib/alg-md5.h
index 1947eb3..1947eb3 100644
--- a/alg-md5.h
+++ b/lib/alg-md5.h
diff --git a/alg-sha1.c b/lib/alg-sha1.c
index b3b5fdd..b3b5fdd 100644
--- a/alg-sha1.c
+++ b/lib/alg-sha1.c
diff --git a/alg-sha1.h b/lib/alg-sha1.h
index 5d62601..5d62601 100644
--- a/alg-sha1.h
+++ b/lib/alg-sha1.h
diff --git a/alg-sha256.c b/lib/alg-sha256.c
index 2f8e352..2f8e352 100644
--- a/alg-sha256.c
+++ b/lib/alg-sha256.c
diff --git a/alg-sha256.h b/lib/alg-sha256.h
index b30748b..b30748b 100644
--- a/alg-sha256.h
+++ b/lib/alg-sha256.h
diff --git a/alg-sha512.c b/lib/alg-sha512.c
index d3e83b3..d3e83b3 100644
--- a/alg-sha512.c
+++ b/lib/alg-sha512.c
diff --git a/alg-sha512.h b/lib/alg-sha512.h
index c2516a9..c2516a9 100644
--- a/alg-sha512.h
+++ b/lib/alg-sha512.h
diff --git a/alg-yescrypt-common.c b/lib/alg-yescrypt-common.c
index 9d0a7ae..9d0a7ae 100644
--- a/alg-yescrypt-common.c
+++ b/lib/alg-yescrypt-common.c
diff --git a/alg-yescrypt-opt.c b/lib/alg-yescrypt-opt.c
index 060caf4..060caf4 100644
--- a/alg-yescrypt-opt.c
+++ b/lib/alg-yescrypt-opt.c
diff --git a/alg-yescrypt-platform.c b/lib/alg-yescrypt-platform.c
index 078e247..078e247 100644
--- a/alg-yescrypt-platform.c
+++ b/lib/alg-yescrypt-platform.c
diff --git a/alg-yescrypt-sysendian.h b/lib/alg-yescrypt-sysendian.h
index 4c70264..4c70264 100644
--- a/alg-yescrypt-sysendian.h
+++ b/lib/alg-yescrypt-sysendian.h
diff --git a/alg-yescrypt.h b/lib/alg-yescrypt.h
index cf948ba..cf948ba 100644
--- a/alg-yescrypt.h
+++ b/lib/alg-yescrypt.h
diff --git a/byteorder.h b/lib/byteorder.h
index e612468..e612468 100644
--- a/byteorder.h
+++ b/lib/byteorder.h
diff --git a/crypt-bcrypt.c b/lib/crypt-bcrypt.c
index b82983b..b82983b 100644
--- a/crypt-bcrypt.c
+++ b/lib/crypt-bcrypt.c
diff --git a/crypt-common.c b/lib/crypt-common.c
index c03cd5f..c03cd5f 100644
--- a/crypt-common.c
+++ b/lib/crypt-common.c
diff --git a/crypt-common.h b/lib/crypt-common.h
index c97fa5d..c97fa5d 100644
--- a/crypt-common.h
+++ b/lib/crypt-common.h
diff --git a/crypt-des-obsolete.c b/lib/crypt-des-obsolete.c
index 66aa534..66aa534 100644
--- a/crypt-des-obsolete.c
+++ b/lib/crypt-des-obsolete.c
diff --git a/crypt-des.c b/lib/crypt-des.c
index b21f3f8..b21f3f8 100644
--- a/crypt-des.c
+++ b/lib/crypt-des.c
diff --git a/crypt-gensalt-static.c b/lib/crypt-gensalt-static.c
index 6f1ff43..6f1ff43 100644
--- a/crypt-gensalt-static.c
+++ b/lib/crypt-gensalt-static.c
diff --git a/crypt-gensalt.c b/lib/crypt-gensalt.c
index 4c6cf78..4c6cf78 100644
--- a/crypt-gensalt.c
+++ b/lib/crypt-gensalt.c
diff --git a/crypt-gost-yescrypt.c b/lib/crypt-gost-yescrypt.c
index 51009c7..51009c7 100644
--- a/crypt-gost-yescrypt.c
+++ b/lib/crypt-gost-yescrypt.c
diff --git a/crypt-md5.c b/lib/crypt-md5.c
index f33d173..f33d173 100644
--- a/crypt-md5.c
+++ b/lib/crypt-md5.c
diff --git a/crypt-nthash.c b/lib/crypt-nthash.c
index e19fa45..e19fa45 100644
--- a/crypt-nthash.c
+++ b/lib/crypt-nthash.c
diff --git a/crypt-obsolete.h b/lib/crypt-obsolete.h
index 27579dc..27579dc 100644
--- a/crypt-obsolete.h
+++ b/lib/crypt-obsolete.h
diff --git a/crypt-pbkdf1-sha1.c b/lib/crypt-pbkdf1-sha1.c
index ef2be00..ef2be00 100644
--- a/crypt-pbkdf1-sha1.c
+++ b/lib/crypt-pbkdf1-sha1.c
diff --git a/crypt-port.h b/lib/crypt-port.h
index 44d278f..44d278f 100644
--- a/crypt-port.h
+++ b/lib/crypt-port.h
diff --git a/crypt-scrypt.c b/lib/crypt-scrypt.c
index 5614570..5614570 100644
--- a/crypt-scrypt.c
+++ b/lib/crypt-scrypt.c
diff --git a/crypt-sha256.c b/lib/crypt-sha256.c
index 447fe11..447fe11 100644
--- a/crypt-sha256.c
+++ b/lib/crypt-sha256.c
diff --git a/crypt-sha512.c b/lib/crypt-sha512.c
index d4a5993..d4a5993 100644
--- a/crypt-sha512.c
+++ b/lib/crypt-sha512.c
diff --git a/crypt-static.c b/lib/crypt-static.c
index 12ece0c..12ece0c 100644
--- a/crypt-static.c
+++ b/lib/crypt-static.c
diff --git a/crypt-sunmd5.c b/lib/crypt-sunmd5.c
index 9a871db..9a871db 100644
--- a/crypt-sunmd5.c
+++ b/lib/crypt-sunmd5.c
diff --git a/crypt-yescrypt.c b/lib/crypt-yescrypt.c
index 7a6851c..7a6851c 100644
--- a/crypt-yescrypt.c
+++ b/lib/crypt-yescrypt.c
diff --git a/crypt.c b/lib/crypt.c
index 12892ff..12892ff 100644
--- a/crypt.c
+++ b/lib/crypt.c
diff --git a/crypt.h.in.in b/lib/crypt.h.in.in
index fb50c6a..fb50c6a 100644
--- a/crypt.h.in.in
+++ b/lib/crypt.h.in.in
diff --git a/gen-crypt-h.awk b/lib/gen-crypt-h.awk
index d7ca1a2..d7ca1a2 100644
--- a/gen-crypt-h.awk
+++ b/lib/gen-crypt-h.awk
diff --git a/gen-des-tables.c b/lib/gen-des-tables.c
index ee18cd4..ee18cd4 100644
--- a/gen-des-tables.c
+++ b/lib/gen-des-tables.c
diff --git a/gen-hashes.awk b/lib/gen-hashes.awk
index b97586a..b97586a 100644
--- a/gen-hashes.awk
+++ b/lib/gen-hashes.awk
diff --git a/gen-map.awk b/lib/gen-map.awk
index 025af05..025af05 100644
--- a/gen-map.awk
+++ b/lib/gen-map.awk
diff --git a/gen-vers.awk b/lib/gen-vers.awk
index 8bd9d5e..8bd9d5e 100644
--- a/gen-vers.awk
+++ b/lib/gen-vers.awk
diff --git a/hashes.lst b/lib/hashes.lst
index 99ed116..99ed116 100644
--- a/hashes.lst
+++ b/lib/hashes.lst
diff --git a/libcrypt.map.in b/lib/libcrypt.map.in
index 89fa2a5..89fa2a5 100644
--- a/libcrypt.map.in
+++ b/lib/libcrypt.map.in
diff --git a/libcrypt.minver b/lib/libcrypt.minver
index e1896bb..e1896bb 100644
--- a/libcrypt.minver
+++ b/lib/libcrypt.minver
diff --git a/libxcrypt.pc.in b/lib/libxcrypt.pc.in
index 2c75dc2..2c75dc2 100644
--- a/libxcrypt.pc.in
+++ b/lib/libxcrypt.pc.in
diff --git a/randombytes.c b/lib/randombytes.c
index 2c80bc7..2c80bc7 100644
--- a/randombytes.c
+++ b/lib/randombytes.c
diff --git a/sel-hashes.awk b/lib/sel-hashes.awk
index 1b9cec2..1b9cec2 100644
--- a/sel-hashes.awk
+++ b/lib/sel-hashes.awk
diff --git a/xcrypt.h.in b/lib/xcrypt.h.in
index 332722c..332722c 100644
--- a/xcrypt.h.in
+++ b/lib/xcrypt.h.in
diff --git a/test-alg-des.c b/test/alg-des.c
index 0f590b7..ccf672e 100644
--- a/test-alg-des.c
+++ b/test/alg-des.c
@@ -7,7 +7,7 @@
 
 #include "crypt-port.h"
 #include "alg-des.h"
-#include "test-des-cases.h"
+#include "des-cases.h"
 
 #include <stdio.h>
 
diff --git a/test-alg-gost3411-2012-hmac.c b/test/alg-gost3411-2012-hmac.c
index bb9ed10..bb9ed10 100644
--- a/test-alg-gost3411-2012-hmac.c
+++ b/test/alg-gost3411-2012-hmac.c
diff --git a/test-alg-gost3411-2012.c b/test/alg-gost3411-2012.c
index 3a56cba..3a56cba 100644
--- a/test-alg-gost3411-2012.c
+++ b/test/alg-gost3411-2012.c
diff --git a/test-alg-hmac-sha1.c b/test/alg-hmac-sha1.c
index 5a87c7b..5a87c7b 100644
--- a/test-alg-hmac-sha1.c
+++ b/test/alg-hmac-sha1.c
diff --git a/test-alg-md4.c b/test/alg-md4.c
index 949cc4b..949cc4b 100644
--- a/test-alg-md4.c
+++ b/test/alg-md4.c
diff --git a/test-alg-md5.c b/test/alg-md5.c
index 461e814..461e814 100644
--- a/test-alg-md5.c
+++ b/test/alg-md5.c
diff --git a/test-alg-pbkdf-hmac-sha256.c b/test/alg-pbkdf-hmac-sha256.c
index df22979..df22979 100644
--- a/test-alg-pbkdf-hmac-sha256.c
+++ b/test/alg-pbkdf-hmac-sha256.c
diff --git a/test-alg-sha1.c b/test/alg-sha1.c
index d5271a8..d5271a8 100644
--- a/test-alg-sha1.c
+++ b/test/alg-sha1.c
diff --git a/test-alg-sha256.c b/test/alg-sha256.c
index 598f758..598f758 100644
--- a/test-alg-sha256.c
+++ b/test/alg-sha256.c
diff --git a/test-alg-sha512.c b/test/alg-sha512.c
index add9eb1..add9eb1 100644
--- a/test-alg-sha512.c
+++ b/test/alg-sha512.c
diff --git a/test-alg-yescrypt.c b/test/alg-yescrypt.c
index 0694079..0694079 100644
--- a/test-alg-yescrypt.c
+++ b/test/alg-yescrypt.c
diff --git a/test-badsalt.c b/test/badsalt.c
index 887ce4a..887ce4a 100644
--- a/test-badsalt.c
+++ b/test/badsalt.c
diff --git a/test-badsetting.c b/test/badsetting.c
index 4af151a..4af151a 100644
--- a/test-badsetting.c
+++ b/test/badsetting.c
diff --git a/test-byteorder.c b/test/byteorder.c
index 7be0895..7be0895 100644
--- a/test-byteorder.c
+++ b/test/byteorder.c
diff --git a/test-checksalt.c b/test/checksalt.c
index 7575dfd..7575dfd 100644
--- a/test-checksalt.c
+++ b/test/checksalt.c
diff --git a/test-compile-strong-alias.c b/test/compile-strong-alias.c
index cd12a44..cd12a44 100644
--- a/test-compile-strong-alias.c
+++ b/test/compile-strong-alias.c
diff --git a/test-crypt-badargs.c b/test/crypt-badargs.c
index 59c6690..59c6690 100644
--- a/test-crypt-badargs.c
+++ b/test/crypt-badargs.c
diff --git a/test-crypt-gost-yescrypt.c b/test/crypt-gost-yescrypt.c
index fc3cab7..f7fda80 100644
--- a/test-crypt-gost-yescrypt.c
+++ b/test/crypt-gost-yescrypt.c
@@ -30,7 +30,7 @@ static void
 test_outer_hmac (const uint8_t *k, size_t n, const uint8_t *t, size_t len,
                  uint8_t *out32, gost_hmac_256_t *gostbuf);
 #define outer_gost_hmac256 test_outer_hmac
-#include "crypt-gost-yescrypt.c"
+#include "../lib/crypt-gost-yescrypt.c"
 
 static int test_mode = 0;
 
diff --git a/test-crypt-kat-gen.py b/test/crypt-kat-gen.py
index b6ac3ce..b6ac3ce 100644
--- a/test-crypt-kat-gen.py
+++ b/test/crypt-kat-gen.py
diff --git a/test-crypt-kat.c b/test/crypt-kat.c
index 00971db..0cd8c2b 100644
--- a/test-crypt-kat.c
+++ b/test/crypt-kat.c
@@ -73,7 +73,7 @@ struct testcase
 
 static const struct testcase tests[] =
 {
-#include "test-crypt-kat.inc"
+#include "crypt-kat.inc"
 };
 #define ntests ARRAY_SIZE (tests)
 
diff --git a/test-crypt-kat.inc b/test/crypt-kat.inc
index 237599c..237599c 100644
--- a/test-crypt-kat.inc
+++ b/test/crypt-kat.inc
diff --git a/test-des-cases.h b/test/des-cases.h
index 8354df7..8354df7 100644
--- a/test-des-cases.h
+++ b/test/des-cases.h
diff --git a/test-des-obsolete.c b/test/des-obsolete.c
index 1a70d76..2955c87 100644
--- a/test-des-obsolete.c
+++ b/test/des-obsolete.c
@@ -8,7 +8,7 @@
 
 #include "crypt-port.h"
 #include "crypt-obsolete.h"
-#include "test-des-cases.h"
+#include "des-cases.h"
 
 #include <stdio.h>
 
diff --git a/test-des-obsolete_r.c b/test/des-obsolete_r.c
index e1fdd65..6113d3f 100644
--- a/test-des-obsolete_r.c
+++ b/test/des-obsolete_r.c
@@ -8,7 +8,7 @@
 
 #include "crypt-port.h"
 #include "crypt-obsolete.h"
-#include "test-des-cases.h"
+#include "des-cases.h"
 
 #include <stdio.h>
 
diff --git a/test-fcrypt-enosys.c b/test/fcrypt-enosys.c
index 4761897..4761897 100644
--- a/test-fcrypt-enosys.c
+++ b/test/fcrypt-enosys.c
diff --git a/test-gensalt-extradata.c b/test/gensalt-extradata.c
index 9df2e9f..9df2e9f 100644
--- a/test-gensalt-extradata.c
+++ b/test/gensalt-extradata.c
diff --git a/test-gensalt-nthash.c b/test/gensalt-nthash.c
index 5fb0522..5fb0522 100644
--- a/test-gensalt-nthash.c
+++ b/test/gensalt-nthash.c
diff --git a/test-gensalt.c b/test/gensalt.c
index 5494f4b..5494f4b 100644
--- a/test-gensalt.c
+++ b/test/gensalt.c
diff --git a/test-getrandom-fallbacks.c b/test/getrandom-fallbacks.c
index 9f93cba..9f93cba 100644
--- a/test-getrandom-fallbacks.c
+++ b/test/getrandom-fallbacks.c
diff --git a/test-getrandom-interface.c b/test/getrandom-interface.c
index 82be78a..82be78a 100644
--- a/test-getrandom-interface.c
+++ b/test/getrandom-interface.c
diff --git a/test-preferred-method.c b/test/preferred-method.c
index a794d7f..a794d7f 100644
--- a/test-preferred-method.c
+++ b/test/preferred-method.c
diff --git a/test-short-outbuf.c b/test/short-outbuf.c
index 9418c2a..9418c2a 100644
--- a/test-short-outbuf.c
+++ b/test/short-outbuf.c
diff --git a/test-symbols-compat.sh b/test/symbols-compat.sh
index fd1a510..fd1a510 100755
--- a/test-symbols-compat.sh
+++ b/test/symbols-compat.sh
diff --git a/test-symbols-renames.sh b/test/symbols-renames.sh
index a9856cd..a9856cd 100755
--- a/test-symbols-renames.sh
+++ b/test/symbols-renames.sh
diff --git a/test-symbols-static.sh b/test/symbols-static.sh
index 0720ade..0720ade 100755
--- a/test-symbols-static.sh
+++ b/test/symbols-static.sh