From 12726b68fc18fa72db48121980172e1e6ef4260c Mon Sep 17 00:00:00 2001
From: Graham Percival <gperciva@tarsnap.com>
Date: Sat, 1 Feb 2025 20:02:38 -0800
Subject: [PATCH] Makefile.am: add libcperciva_cpusupport_detect.la

libcpusupport_crypto_aes.la needs to resolve symbols such as
cpusupport_x86_aesni_detect_1.  In scrypt, that was previously provided
by cpusupport_x86_aesni.o, which was listed explicitly on the
command-line (via Makefile.am's ${crypto_scrypt_files}).

However, in the tarsnap repository, cpusupport_x86_aesni.o was linked
into libtarsnap.a.  When we tried to add libcperciva_crypto_aes.a, that
created a circular dependency:
- libtarsnap.a needed crypto_aes symbols (which were in
  libcperciva_crypto_aes)
- libcperciva_crypto_aes needed cpusupport_x86_aesni_detect_1 (which
  were in libtarsnap.a)

To avoid the circular dependency, we're moving the cpusupport detection
functionality into its own library.  We're also clarifying the order of
libraries in the scrypt_LDADD list.
---
 Makefile.am | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 10fe24cb..af51ffb9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,9 +10,6 @@ ACLOCAL_AMFLAGS=	-I m4
 #     lib/crypto/crypto_scrypt_smix_sse2.c
 # which require special compiler flags and are thus compiled as separate
 # libraries.  See test_scrypt for an example.
-#
-# crypto_scrypt() does not require aesni or rdrand, but we need to include
-# the relevant cpusupport_x86 files so that cpusupport can link to them.
 crypto_scrypt_files=							\
 	lib/crypto/crypto_scrypt_smix.c					\
 	lib/crypto/crypto_scrypt_smix.h					\
@@ -26,13 +23,6 @@ crypto_scrypt_files=							\
 	libcperciva/alg/sha256_shani.h					\
 	libcperciva/alg/sha256_sse2.h					\
 	libcperciva/cpusupport/cpusupport.h				\
-	libcperciva/cpusupport/cpusupport_arm_aes.c			\
-	libcperciva/cpusupport/cpusupport_arm_sha256.c			\
-	libcperciva/cpusupport/cpusupport_x86_aesni.c			\
-	libcperciva/cpusupport/cpusupport_x86_rdrand.c			\
-	libcperciva/cpusupport/cpusupport_x86_shani.c			\
-	libcperciva/cpusupport/cpusupport_x86_sse2.c			\
-	libcperciva/cpusupport/cpusupport_x86_ssse3.c			\
 	libcperciva/util/insecure_memzero.c				\
 	libcperciva/util/insecure_memzero.h				\
 	libcperciva/util/warnp.c					\
@@ -101,15 +91,20 @@ AM_CPPFLAGS=								\
 	-D_XOPEN_SOURCE=700						\
 	${CFLAGS_POSIX}
 
+# Each "paragraph" denotes a rank of dependencies.  Libraries without
+# dependencies go in the bottom paragraph; a library which depends on one of
+# those goes in the preceeding paragraph; and so on.
 scrypt_LDADD=								\
+	libcperciva_crypto_aes.la					\
+									\
 	libcperciva_aesni.la						\
 	libcperciva_rdrand.la						\
 	libcperciva_shani.la						\
 	libscrypt_sse2.la						\
 	libscrypt_memlimit.la						\
-	libcperciva_crypto_aes.la					\
 	libcperciva_arm_sha256.la					\
 	libcperciva_arm_aes.la						\
+	libcperciva_cpusupport_detect.la				\
 	${LDADD_POSIX}
 scrypt_man_MANS=	scrypt.1
 
@@ -164,6 +159,18 @@ libcperciva_crypto_aes_la_SOURCES=	libcperciva/crypto/crypto_aes.c
 nodist_libcperciva_crypto_aes_la_SOURCES=	cpusupport-config.h
 libcperciva_crypto_aes_la_CFLAGS=`. ./apisupport-config.h; echo $${CFLAGS_LIBCRYPTO_LOW_LEVEL_AES}`
 
+noinst_LTLIBRARIES+=	libcperciva_cpusupport_detect.la
+libcperciva_cpusupport_detect_la_SOURCES=				\
+	libcperciva/cpusupport/cpusupport_arm_aes.c			\
+	libcperciva/cpusupport/cpusupport_arm_sha256.c			\
+	libcperciva/cpusupport/cpusupport_x86_aesni.c			\
+	libcperciva/cpusupport/cpusupport_x86_rdrand.c			\
+	libcperciva/cpusupport/cpusupport_x86_shani.c			\
+	libcperciva/cpusupport/cpusupport_x86_sse2.c			\
+	libcperciva/cpusupport/cpusupport_x86_ssse3.c
+nodist_libcperciva_cpusupport_detect_la_SOURCES=	cpusupport-config.h
+
+
 # Library from libcperciva and scrypt code.
 noinst_LTLIBRARIES+=	libscrypt_sse2.la
 libscrypt_sse2_la_SOURCES=						\
@@ -198,6 +205,7 @@ endif
 # Shared definitions for libscrypt-kdf.
 libscrypt_kdf_la_SOURCES=	$(crypto_scrypt_files)
 libscrypt_kdf_la_LIBADD=						\
+	libcperciva_cpusupport_detect.la				\
 	libcperciva_shani.la						\
 	libscrypt_sse2.la						\
 	libcperciva_arm_sha256.la
@@ -277,6 +285,7 @@ tests_verify_strings_test_scrypt_LDADD=					\
 	libcperciva_shani.la						\
 	libscrypt_sse2.la						\
 	libcperciva_arm_sha256.la					\
+	libcperciva_cpusupport_detect.la				\
 	${LDADD_POSIX}
 
 # Eliminate false positives while memory-checking for the test framework.