Skip to content

Commit e910f92

Browse files
committed
libgcrypt: Fix bswap patch.
1 parent d685d3e commit e910f92

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

security/libgcrypt/distinfo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ BLAKE2s (libgcrypt-1.11.0.tar.bz2) = b431a329ef99a103d60bf8337f36e33f7dae380e316
44
SHA512 (libgcrypt-1.11.0.tar.bz2) = 8e093e69e3c45d30838625ca008e995556f0d5b272de1c003d44ef94633bcc0d0ef5d95e8725eb531bfafb4490ac273488633e0c801200d4666194f86c3e270e
55
Size (libgcrypt-1.11.0.tar.bz2) = 4180345 bytes
66
SHA1 (patch-aa) = 60b3f4453b217ed8879a2ffd8d485c0195ffb5f8
7-
SHA1 (patch-cipher_aria.c) = 7e574b13872ea0610bf8b4abd699ffbc9dabc09a
7+
SHA1 (patch-cipher_aria.c) = dcb6dc45ca601237191ffb8b6b9a0774fe543583
88
SHA1 (patch-cipher_blake2.c) = f415135a98e4949f6eba53f9d13efcbd65f2d31d
99
SHA1 (patch-cipher_rijndael-arm.S) = ef3cb7f481022440780eb48ae31cbfad0a3ec115
1010
SHA1 (patch-config.h.in) = b065aca0c4bf11cd45507b14d60b682be10ab8c9

security/libgcrypt/patches/patch-cipher_aria.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,15 @@
22

33
* Do not conflict with NetBSD's bswap(3).
44

5-
--- cipher/aria.c.orig 2024-08-02 04:47:06.896383457 +0000
5+
--- cipher/aria.c.orig 2024-03-28 10:07:27.000000000 +0000
66
+++ cipher/aria.c
7-
@@ -641,11 +641,13 @@ u32 rotr32(u32 v, u32 r)
7+
@@ -641,11 +641,15 @@ u32 rotr32(u32 v, u32 r)
88
return ror(v, r);
99
}
1010

11-
+#if !defined(__NetBSD__)
11+
+#ifdef __NetBSD__
12+
+#include <sys/bswap.h>
13+
+#else
1214
static ALWAYS_INLINE
1315
u32 bswap32(u32 v)
1416
{

0 commit comments

Comments
 (0)