From: =?UTF-8?q?Dagfinn=20Ilmari=20Manns=C3=A5ker?= <ilmari@ilmari.org>
Date: Thu, 9 Apr 2026 11:30:33 +0100
Subject: [PATCH 1/2] pgcrypto: remove unused BF_ASM macro

This has never been defined to anything but 0, and the _BF_body_r
function it would call has never existed.
---
 contrib/pgcrypto/crypt-blowfish.c | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/contrib/pgcrypto/crypt-blowfish.c b/contrib/pgcrypto/crypt-blowfish.c
index 5a1b1e10091..4d870fd65d7 100644
--- a/contrib/pgcrypto/crypt-blowfish.c
+++ b/contrib/pgcrypto/crypt-blowfish.c
@@ -39,13 +39,10 @@
 #include "px.h"
 
 #ifdef __i386__
-#define BF_ASM				0	/* 1 */
 #define BF_SCALE			1
 #elif defined(__x86_64__)
-#define BF_ASM				0
 #define BF_SCALE			1
 #else
-#define BF_ASM				0
 #define BF_SCALE			0
 #endif
 
@@ -518,14 +515,6 @@ BF_swap(BF_word *x, int count)
 	R = L; \
 	L = tmp4 ^ data.ctx.P[BF_N + 1]
 
-#if BF_ASM
-
-extern void _BF_body_r(BF_ctx *ctx);
-
-#define BF_body() \
-	_BF_body_r(&data.ctx)
-#else
-
 #define BF_body() \
 do { \
 	L = R = 0; \
@@ -545,7 +534,6 @@ do { \
 		*(ptr - 1) = R; \
 	} while (ptr < &data.ctx.S[3][0xFF]); \
 } while (0)
-#endif
 
 static void
 BF_set_key(const char *key, BF_key expanded, BF_key initial,
-- 
2.53.0


--=-=-=
Content-Type: text/x-diff
Content-Disposition: inline;
 filename=0002-pgcrypto-use-explicit_bzero-instead-of-px_memset-.-0.patch