1 files changed, 11 insertions, 69 deletions

diff --git a/src/lib/libcrypto/modes/modes_local.h b/src/lib/libcrypto/modes/modes_local.h
index 511855f2e0..5c1acfc25f 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.2 2023/07/08 14:55:36 beck Exp $ */
+/* $OpenBSD: modes_local.h,v 1.7 2025/07/13 06:01:33 jsing Exp $ */
 /* ====================================================================
  * Copyright (c) 2010 The OpenSSL Project.  All rights reserved.
  *
@@ -15,105 +15,47 @@
 __BEGIN_HIDDEN_DECLS
 
 #if defined(_LP64)
-typedef long i64;
-typedef unsigned long u64;
 #define U64(C) C##UL
 #else
-typedef long long i64;
-typedef unsigned long long u64;
 #define U64(C) C##ULL
 #endif
 
-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))
-#define PUTU32(p,v)     *(u32 *)(p) = BSWAP4(v)
-#else
-#define GETU32(p)       ((u32)(p)[0]<<24|(u32)(p)[1]<<16|(u32)(p)[2]<<8|(u32)(p)[3])
-#define PUTU32(p,v)     ((p)[0]=(u8)((v)>>24),(p)[1]=(u8)((v)>>16),(p)[2]=(u8)((v)>>8),(p)[3]=(u8)(v))
-#endif
-
 /* GCM definitions */
 
 typedef struct {
-        u64 hi, lo;
+        uint64_t hi, lo;
 } u128;
 
-#ifdef  TABLE_BITS
-#undef  TABLE_BITS
-#endif
-/*
- * Even though permitted values for TABLE_BITS are 8, 4 and 1, it should
- * never be set to 8 [or 1]. For further information see gcm128.c.
- */
-#define TABLE_BITS 4
-
 struct gcm128_context {
         /* Following 6 names follow names in GCM specification */
         union {
-                u64 u[2];
-                u32 d[4];
-                u8 c[16];
+                uint64_t u[2];
+                uint32_t d[4];
+                uint8_t c[16];
                 size_t t[16/sizeof(size_t)];
         } Yi, EKi, EK0, len, Xi, H;
         /* Relative position of Xi, H and pre-computed Htable is used
          * in some assembler modules, i.e. don't change the order! */
-#if TABLE_BITS==8
-        u128 Htable[256];
-#else
         u128 Htable[16];
-        void (*gmult)(u64 Xi[2], const u128 Htable[16]);
-        void (*ghash)(u64 Xi[2], const u128 Htable[16], const u8 *inp,
+        void (*gmult)(uint64_t Xi[2], const u128 Htable[16]);
+        void (*ghash)(uint64_t Xi[2], const u128 Htable[16], const uint8_t *inp,
             size_t len);
-#endif
         unsigned int mres, ares;
         block128_f block;
         void *key;
 };
 
 struct xts128_context {
-        void      *key1, *key2;
+        const void *key1, *key2;
         block128_f block1, block2;
 };
 
 struct ccm128_context {
         union {
-                u64 u[2];
-                u8 c[16];
+                uint64_t u[2];
+                uint8_t c[16];
         } nonce, cmac;
-        u64 blocks;
+        uint64_t blocks;
         block128_f block;
         void *key;
 };