From fa507d40374ff29342cd51b7f2db5f7ad373594d Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Wed, 23 Apr 2025 14:15:19 +0000
Subject: Mop up all of the GETU32/BSWAP4/BSWAP8 macros since they're now
 unused.

ok beck@ tb@
---
 src/lib/libcrypto/modes/gcm128.c      |  8 +-------
 src/lib/libcrypto/modes/modes_local.h | 38 +----------------------------------
 2 files changed, 2 insertions(+), 44 deletions(-)

(limited to 'src')

diff --git a/src/lib/libcrypto/modes/gcm128.c b/src/lib/libcrypto/modes/gcm128.c
index 29f289cb7e..fb03f72754 100644
--- a/src/lib/libcrypto/modes/gcm128.c
+++ b/src/lib/libcrypto/modes/gcm128.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gcm128.c,v 1.31 2025/04/23 14:12:38 jsing Exp $ */
+/* $OpenBSD: gcm128.c,v 1.32 2025/04/23 14:15:19 jsing Exp $ */
 /* ====================================================================
  * Copyright (c) 2010 The OpenSSL Project.  All rights reserved.
  *
@@ -55,12 +55,6 @@
 #include "crypto_internal.h"
 #include "modes_local.h"
 
-#if defined(BSWAP4) && defined(__STRICT_ALIGNMENT)
-/* redefine, because alignment is ensured */
-#undef	GETU32
-#define	GETU32(p)	BSWAP4(*(const u32 *)(p))
-#endif
-
 #define	PACK(s)		((size_t)(s)<<(sizeof(size_t)*8-16))
 #define REDUCE1BIT(V)							\
 	do {								\
diff --git a/src/lib/libcrypto/modes/modes_local.h b/src/lib/libcrypto/modes/modes_local.h
index 6e3336dad9..c04db034d0 100644
--- a/src/lib/libcrypto/modes/modes_local.h
+++ b/src/lib/libcrypto/modes/modes_local.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: modes_local.h,v 1.3 2025/04/22 14:03:05 jsing Exp $ */
+/* $OpenBSD: modes_local.h,v 1.4 2025/04/23 14:15:19 jsing Exp $ */
 /* ====================================================================
  * Copyright (c) 2010 The OpenSSL Project.  All rights reserved.
  *
@@ -27,42 +27,6 @@ typedef unsigned long long u64;
 typedef unsigned int u32;
 typedef unsigned char u8;
 
-#if !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM)
-#if defined(__GNUC__) && __GNUC__>=2
-# if defined(__x86_64) || defined(__x86_64__)
-#  define BSWAP8(x) ({	u64 ret=(x);					\
-			asm ("bswapq %0"				\
-			: "+r"(ret));	ret;		})
-#  define BSWAP4(x) ({	u32 ret=(x);					\
-			asm ("bswapl %0"				\
-			: "+r"(ret));	ret;		})
-# elif (defined(__i386) || defined(__i386__))
-#  define BSWAP8(x) ({	u32 lo=(u64)(x)>>32,hi=(x);			\
-			asm ("bswapl %0; bswapl %1"			\
-			: "+r"(hi),"+r"(lo));				\
-			(u64)hi<<32|lo;			})
-#  define BSWAP4(x) ({	u32 ret=(x);					\
-			asm ("bswapl %0"				\
-			: "+r"(ret));	ret;		})
-# elif (defined(__arm__) || defined(__arm)) && !defined(__STRICT_ALIGNMENT)
-#  define BSWAP8(x) ({	u32 lo=(u64)(x)>>32,hi=(x);			\
-			asm ("rev %0,%0; rev %1,%1"			\
-			: "+r"(hi),"+r"(lo));				\
-			(u64)hi<<32|lo;			})
-#  define BSWAP4(x) ({	u32 ret;					\
-			asm ("rev %0,%1"				\
-			: "=r"(ret) : "r"((u32)(x)));			\
-			ret;				})
-# endif
-#endif
-#endif
-
-#if defined(BSWAP4) && !defined(__STRICT_ALIGNMENT)
-#define GETU32(p)	BSWAP4(*(const u32 *)(p))
-#else
-#define GETU32(p)	((u32)(p)[0]<<24|(u32)(p)[1]<<16|(u32)(p)[2]<<8|(u32)(p)[3])
-#endif
-
 /* GCM definitions */
 
 typedef struct {
-- 
cgit v1.2.3-55-g6feb