Move wp_block.c to the primary Makefile.

This is now built on all platforms.

12 files changed, 12 insertions, 35 deletions

diff --git a/src/lib/libcrypto/Makefile b/src/lib/libcrypto/Makefile
index 918454e7a4..d3533412fd 100644
--- a/src/lib/libcrypto/Makefile
+++ b/src/lib/libcrypto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.185 2024/03/28 12:52:58 jsing Exp $
+# $OpenBSD: Makefile,v 1.186 2024/03/29 02:33:44 jsing Exp $
 
 LIB=    crypto
 LIBREBUILD=y
@@ -557,6 +557,7 @@ SRCS+= ui_openssl.c
 SRCS+= ui_util.c
 
 # whrlpool/
+SRCS+= wp_block.c
 SRCS+= wp_dgst.c
 
 # x509/
@@ -792,7 +793,6 @@ SRCS+= aes_core.c
 SRCS+= camellia.c
 SRCS+= cmll_cbc.c
 SRCS+= cmll_misc.c
-SRCS+= wp_block.c
 .endif
 
 BUILDFIRST = ${GENERATED}
diff --git a/src/lib/libcrypto/arch/aarch64/Makefile.inc b/src/lib/libcrypto/arch/aarch64/Makefile.inc
index 6f57fa230f..0c16c8d79a 100644
--- a/src/lib/libcrypto/arch/aarch64/Makefile.inc
+++ b/src/lib/libcrypto/arch/aarch64/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.10 2024/03/28 12:52:58 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.11 2024/03/29 02:33:44 jsing Exp $
 
 # aarch64-specific libcrypto build rules
 
@@ -9,8 +9,6 @@ SRCS+= aes_core.c
 SRCS+= camellia.c cmll_cbc.c cmll_misc.c
 # modes
 # sha
-# whrlpool
-SRCS+= wp_block.c
 
 .for dir f in ${SSLASM}
 SRCS+=  ${f}.S
diff --git a/src/lib/libcrypto/arch/alpha/Makefile.inc b/src/lib/libcrypto/arch/alpha/Makefile.inc
index ac8314563c..9c5923589b 100644
--- a/src/lib/libcrypto/arch/alpha/Makefile.inc
+++ b/src/lib/libcrypto/arch/alpha/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.11 2024/03/28 12:52:58 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.12 2024/03/29 02:33:44 jsing Exp $
 
 # alpha-specific libcrypto build rules
 
@@ -15,8 +15,6 @@ SSLASM+= modes ghash-alpha
 # sha
 CFLAGS+= -DSHA1_ASM
 SSLASM+= sha sha1-alpha
-# whrlpool
-SRCS+= wp_block.c
 
 .for dir f in ${SSLASM}
 SRCS+=  ${f}.S
diff --git a/src/lib/libcrypto/arch/amd64/Makefile.inc b/src/lib/libcrypto/arch/amd64/Makefile.inc
index 8ae28f16e9..ac5cf874f5 100644
--- a/src/lib/libcrypto/arch/amd64/Makefile.inc
+++ b/src/lib/libcrypto/arch/amd64/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.21 2024/03/29 01:24:07 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.22 2024/03/29 02:33:44 jsing Exp $
 
 # amd64-specific libcrypto build rules
 
@@ -66,8 +66,6 @@ GENERATED+= sha512-x86_64.S
 sha512-x86_64.S: ${LCRYPTO_SRC}/sha/asm/sha512-x86_64.pl ${EXTRA_PL}
         cd ${LCRYPTO_SRC}/sha/asm ; \
                 /usr/bin/perl ./sha512-x86_64.pl ${.OBJDIR}/${.TARGET}
-# whrlpool
-SRCS+= wp_block.c
 
 .for dir f in ${SSLASM}
 SRCS+=  ${f}.S
diff --git a/src/lib/libcrypto/arch/arm/Makefile.inc b/src/lib/libcrypto/arch/arm/Makefile.inc
index b0d125572c..7db36aaa60 100644
--- a/src/lib/libcrypto/arch/arm/Makefile.inc
+++ b/src/lib/libcrypto/arch/arm/Makefile.inc
@@ -20,8 +20,6 @@ CFLAGS+= -DSHA256_ASM
 SSLASM+= sha sha256-armv4
 CFLAGS+= -DSHA512_ASM
 SSLASM+= sha sha512-armv4
-# whrlpool
-SRCS+= wp_block.c
 
 .for dir f in ${SSLASM}
 SRCS+=  ${f}.S
diff --git a/src/lib/libcrypto/arch/hppa/Makefile.inc b/src/lib/libcrypto/arch/hppa/Makefile.inc
index bbe4c9ac1e..948aff2107 100644
--- a/src/lib/libcrypto/arch/hppa/Makefile.inc
+++ b/src/lib/libcrypto/arch/hppa/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.20 2024/03/28 12:52:58 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.21 2024/03/29 02:33:44 jsing Exp $
 
 # hppa-specific libcrypto build rules
 
@@ -19,8 +19,6 @@ CFLAGS+= -DSHA1_ASM
 SSLASM+= sha sha1-parisc sha1-parisc
 CFLAGS+= -DSHA256_ASM
 SSLASM+= sha sha512-parisc sha256-parisc
-# whrlpool
-SRCS+= wp_block.c
 
 .for dir src dst in ${SSLASM}
 SRCS+=  ${dst}.S
diff --git a/src/lib/libcrypto/arch/i386/Makefile.inc b/src/lib/libcrypto/arch/i386/Makefile.inc
index 9da377a3c6..c8e5a535e5 100644
--- a/src/lib/libcrypto/arch/i386/Makefile.inc
+++ b/src/lib/libcrypto/arch/i386/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.18 2024/03/29 01:24:07 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.19 2024/03/29 02:33:44 jsing Exp $
 
 # i386-specific libcrypto build rules
 
@@ -37,8 +37,6 @@ CFLAGS+= -DSHA256_ASM
 SSLASM+= sha sha256-586
 CFLAGS+= -DSHA512_ASM
 SSLASM+= sha sha512-586
-# whrlpool
-SRCS+= wp_block.c
 
 .for dir f in ${SSLASM}
 SRCS+=  ${f}.S
diff --git a/src/lib/libcrypto/arch/mips64/Makefile.inc b/src/lib/libcrypto/arch/mips64/Makefile.inc
index d40bbdf00e..4fde831c9a 100644
--- a/src/lib/libcrypto/arch/mips64/Makefile.inc
+++ b/src/lib/libcrypto/arch/mips64/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.12 2024/03/28 12:52:58 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.13 2024/03/29 02:33:44 jsing Exp $
 
 # mips64-specific libcrypto build rules
 
@@ -18,8 +18,6 @@ SSLASM+= sha sha512-mips sha256-mips
 CFLAGS+= -DSHA256_ASM
 SSLASM+= sha sha512-mips sha512-mips
 CFLAGS+= -DSHA512_ASM
-# whrlpool
-SRCS+= wp_block.c
 
 .for dir src dst in ${SSLASM}
 SRCS+=  ${dst}.S
diff --git a/src/lib/libcrypto/arch/powerpc/Makefile.inc b/src/lib/libcrypto/arch/powerpc/Makefile.inc
index 9e3a2f7280..a20d083434 100644
--- a/src/lib/libcrypto/arch/powerpc/Makefile.inc
+++ b/src/lib/libcrypto/arch/powerpc/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.9 2024/03/28 12:52:58 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.10 2024/03/29 02:33:44 jsing Exp $
 
 # powerpc-specific libcrypto build rules
 
@@ -19,8 +19,6 @@ CFLAGS+= -DSHA1_ASM
 SSLASM+= sha sha1-ppc sha1-ppc
 CFLAGS+= -DSHA256_ASM
 SSLASM+= sha sha512-ppc sha256-ppc
-# whrlpool
-SRCS+= wp_block.c
 
 .for dir src dst in ${SSLASM}
 SRCS+=  ${dst}.S
diff --git a/src/lib/libcrypto/arch/powerpc64/Makefile.inc b/src/lib/libcrypto/arch/powerpc64/Makefile.inc
index ea466bb8a3..1e71fd4ba0 100644
--- a/src/lib/libcrypto/arch/powerpc64/Makefile.inc
+++ b/src/lib/libcrypto/arch/powerpc64/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.11 2024/03/28 12:52:58 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.12 2024/03/29 02:33:45 jsing Exp $
 
 # powerpc-specific libcrypto build rules
 
@@ -19,8 +19,6 @@ SRCS+= camellia.c cmll_cbc.c cmll_misc.c
 #SSLASM+= sha sha1-ppc sha1-ppc
 #CFLAGS+= -DSHA256_ASM
 #SSLASM+= sha sha512-ppc sha256-ppc
-# whrlpool
-SRCS+= wp_block.c
 
 .for dir src dst in ${SSLASM}
 SRCS+=  ${dst}.S
diff --git a/src/lib/libcrypto/arch/riscv64/Makefile.inc b/src/lib/libcrypto/arch/riscv64/Makefile.inc
index 0737d3ce11..ddb2e631e8 100644
--- a/src/lib/libcrypto/arch/riscv64/Makefile.inc
+++ b/src/lib/libcrypto/arch/riscv64/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.7 2024/03/28 12:52:58 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.8 2024/03/29 02:33:45 jsing Exp $
 
 # riscv64 libcrypto build rules
 
@@ -9,6 +9,3 @@ SRCS+= aes_core.c
 SRCS+= camellia.c
 SRCS+= cmll_cbc.c
 SRCS+= cmll_misc.c
-
-# whrlpool
-SRCS+= wp_block.c
diff --git a/src/lib/libcrypto/arch/sparc64/Makefile.inc b/src/lib/libcrypto/arch/sparc64/Makefile.inc
index e540fcbbba..ef1fdcfcd0 100644
--- a/src/lib/libcrypto/arch/sparc64/Makefile.inc
+++ b/src/lib/libcrypto/arch/sparc64/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.14 2024/03/28 12:52:58 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.15 2024/03/29 02:33:45 jsing Exp $
 
 # sparc64-specific libcrypto build rules
 
@@ -19,8 +19,6 @@ SSLASM+= sha sha512-sparcv9 sha256-sparcv9
 CFLAGS+= -DSHA256_ASM
 SSLASM+= sha sha512-sparcv9 sha512-sparcv9
 CFLAGS+= -DSHA512_ASM
-# whrlpool
-SRCS+= wp_block.c
 
 .for dir src dst in ${SSLASM}
 SRCS+=  ${dst}.S