diff options
Diffstat (limited to '')
-rw-r--r-- | src/lib/libcrypto/modes/modes_local.h | 40 |
1 files changed, 1 insertions, 39 deletions
diff --git a/src/lib/libcrypto/modes/modes_local.h b/src/lib/libcrypto/modes/modes_local.h index 511855f2e0..c04db034d0 100644 --- a/src/lib/libcrypto/modes/modes_local.h +++ b/src/lib/libcrypto/modes/modes_local.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: modes_local.h,v 1.2 2023/07/08 14:55:36 beck Exp $ */ | 1 | /* $OpenBSD: modes_local.h,v 1.4 2025/04/23 14:15:19 jsing Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 2010 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 2010 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -27,44 +27,6 @@ typedef unsigned long long u64; | |||
27 | typedef unsigned int u32; | 27 | typedef unsigned int u32; |
28 | typedef unsigned char u8; | 28 | typedef unsigned char u8; |
29 | 29 | ||
30 | #if !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM) | ||
31 | #if defined(__GNUC__) && __GNUC__>=2 | ||
32 | # if defined(__x86_64) || defined(__x86_64__) | ||
33 | # define BSWAP8(x) ({ u64 ret=(x); \ | ||
34 | asm ("bswapq %0" \ | ||
35 | : "+r"(ret)); ret; }) | ||
36 | # define BSWAP4(x) ({ u32 ret=(x); \ | ||
37 | asm ("bswapl %0" \ | ||
38 | : "+r"(ret)); ret; }) | ||
39 | # elif (defined(__i386) || defined(__i386__)) | ||
40 | # define BSWAP8(x) ({ u32 lo=(u64)(x)>>32,hi=(x); \ | ||
41 | asm ("bswapl %0; bswapl %1" \ | ||
42 | : "+r"(hi),"+r"(lo)); \ | ||
43 | (u64)hi<<32|lo; }) | ||
44 | # define BSWAP4(x) ({ u32 ret=(x); \ | ||
45 | asm ("bswapl %0" \ | ||
46 | : "+r"(ret)); ret; }) | ||
47 | # elif (defined(__arm__) || defined(__arm)) && !defined(__STRICT_ALIGNMENT) | ||
48 | # define BSWAP8(x) ({ u32 lo=(u64)(x)>>32,hi=(x); \ | ||
49 | asm ("rev %0,%0; rev %1,%1" \ | ||
50 | : "+r"(hi),"+r"(lo)); \ | ||
51 | (u64)hi<<32|lo; }) | ||
52 | # define BSWAP4(x) ({ u32 ret; \ | ||
53 | asm ("rev %0,%1" \ | ||
54 | : "=r"(ret) : "r"((u32)(x))); \ | ||
55 | ret; }) | ||
56 | # endif | ||
57 | #endif | ||
58 | #endif | ||
59 | |||
60 | #if defined(BSWAP4) && !defined(__STRICT_ALIGNMENT) | ||
61 | #define GETU32(p) BSWAP4(*(const u32 *)(p)) | ||
62 | #define PUTU32(p,v) *(u32 *)(p) = BSWAP4(v) | ||
63 | #else | ||
64 | #define GETU32(p) ((u32)(p)[0]<<24|(u32)(p)[1]<<16|(u32)(p)[2]<<8|(u32)(p)[3]) | ||
65 | #define PUTU32(p,v) ((p)[0]=(u8)((v)>>24),(p)[1]=(u8)((v)>>16),(p)[2]=(u8)((v)>>8),(p)[3]=(u8)(v)) | ||
66 | #endif | ||
67 | |||
68 | /* GCM definitions */ | 30 | /* GCM definitions */ |
69 | 31 | ||
70 | typedef struct { | 32 | typedef struct { |