Provide and use crypto_arch.h.

Provide a per architecture crypto_arch.h - this will be used in a similar
manner to bn_arch.h and will allow for architecture specific #defines and
static inline functions. Move the HAVE_AES_* and HAVE_RC4_* defines here.

ok tb@

2 files changed, 35 insertions, 8 deletions

diff --git a/src/lib/libcrypto/arch/amd64/Makefile.inc b/src/lib/libcrypto/arch/amd64/Makefile.inc
index 0cf212b186..dd136f76a7 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.28 2024/06/04 15:14:45 deraadt Exp $
+# $OpenBSD: Makefile.inc,v 1.29 2024/08/11 13:02:39 jsing Exp $
 
 # amd64-specific libcrypto build rules
 
@@ -13,11 +13,6 @@ SSLASM+= aes bsaes-x86_64
 CFLAGS+= -DVPAES_ASM
 SSLASM+= aes vpaes-x86_64
 SSLASM+= aes aesni-x86_64
-CFLAGS+= -DHAVE_AES_CBC_ENCRYPT_INTERNAL
-CFLAGS+= -DHAVE_AES_SET_ENCRYPT_KEY_INTERNAL
-CFLAGS+= -DHAVE_AES_SET_DECRYPT_KEY_INTERNAL
-CFLAGS+= -DHAVE_AES_ENCRYPT_INTERNAL
-CFLAGS+= -DHAVE_AES_DECRYPT_INTERNAL
 # bn
 CFLAGS+= -DOPENSSL_IA32_SSE2
 CFLAGS+= -DRSA_ASM
@@ -48,8 +43,6 @@ SSLASM+= md5 md5-x86_64
 CFLAGS+= -DGHASH_ASM
 SSLASM+= modes ghash-x86_64
 # rc4
-CFLAGS+= -DHAVE_RC4_INTERNAL
-CFLAGS+= -DHAVE_RC4_SET_KEY_INTERNAL
 SSLASM+= rc4 rc4-x86_64
 # ripemd
 # sha
diff --git a/src/lib/libcrypto/arch/amd64/crypto_arch.h b/src/lib/libcrypto/arch/amd64/crypto_arch.h
new file mode 100644
index 0000000000..8e91c25529
--- /dev/null
+++ b/src/lib/libcrypto/arch/amd64/crypto_arch.h
@@ -0,0 +1,34 @@
+/*      $OpenBSD: crypto_arch.h,v 1.1 2024/08/11 13:02:39 jsing Exp $ */
+/*
+ * Copyright (c) 2024 Joel Sing <jsing@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef HEADER_CRYPTO_ARCH_H
+#define HEADER_CRYPTO_ARCH_H
+
+#ifndef OPENSSL_NO_ASM
+
+#define HAVE_AES_CBC_ENCRYPT_INTERNAL
+#define HAVE_AES_SET_ENCRYPT_KEY_INTERNAL
+#define HAVE_AES_SET_DECRYPT_KEY_INTERNAL
+#define HAVE_AES_ENCRYPT_INTERNAL
+#define HAVE_AES_DECRYPT_INTERNAL
+
+#define HAVE_RC4_INTERNAL
+#define HAVE_RC4_SET_KEY_INTERNAL
+
+#endif
+
+#endif