From 5dcef2b3ea9eb7ace8ed74c27534785fc0b87130 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Sun, 11 Aug 2024 13:02:39 +0000
Subject: 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@
---
 src/lib/libcrypto/aes/aes.c      | 4 +++-
 src/lib/libcrypto/aes/aes_core.c | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/lib/libcrypto/aes')

diff --git a/src/lib/libcrypto/aes/aes.c b/src/lib/libcrypto/aes/aes.c
index 4d040ea5f7..d36a006360 100644
--- a/src/lib/libcrypto/aes/aes.c
+++ b/src/lib/libcrypto/aes/aes.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aes.c,v 1.3 2024/03/30 05:14:12 joshua Exp $ */
+/* $OpenBSD: aes.c,v 1.4 2024/08/11 13:02:39 jsing Exp $ */
 /* ====================================================================
  * Copyright (c) 2002-2006 The OpenSSL Project.  All rights reserved.
  *
@@ -55,6 +55,8 @@
 #include <openssl/bio.h>
 #include <openssl/modes.h>
 
+#include "crypto_arch.h"
+
 static const unsigned char aes_wrap_default_iv[] = {
 	0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6,
 };
diff --git a/src/lib/libcrypto/aes/aes_core.c b/src/lib/libcrypto/aes/aes_core.c
index 335b1dba54..0472d5f4e2 100644
--- a/src/lib/libcrypto/aes/aes_core.c
+++ b/src/lib/libcrypto/aes/aes_core.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aes_core.c,v 1.23 2024/03/30 05:14:12 joshua Exp $ */
+/* $OpenBSD: aes_core.c,v 1.24 2024/08/11 13:02:39 jsing Exp $ */
 /**
  * rijndael-alg-fst.c
  *
@@ -35,6 +35,7 @@
 #include <openssl/aes.h>
 
 #include "aes_local.h"
+#include "crypto_arch.h"
 #include "crypto_internal.h"
 
 /*
-- 
cgit v1.2.3-55-g6feb