From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Mon, 16 Oct 2017 13:42:43 +0000 (+0300)
Subject: auth: Fix compiling crypt-blowfish with i386
X-Git-Tag: 2.3.0.rc1~817
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a647edfc24242f54ef5b51b58f2646ac0fb54ed8;p=thirdparty%2Fdovecot%2Fcore.git

auth: Fix compiling crypt-blowfish with i386

We're not going to support any assembly code, so remove BF_ASM entirely.
---

diff --git a/src/auth/crypt-blowfish.c b/src/auth/crypt-blowfish.c
index 8afb0c9ddd..0530198ef5 100644
--- a/src/auth/crypt-blowfish.c
+++ b/src/auth/crypt-blowfish.c
@@ -56,13 +56,10 @@
 #include "crypt-blowfish.h"
 
 #ifdef __i386__
-#define BF_ASM				1
 #define BF_SCALE			1
 #elif defined(__x86_64__) || defined(__alpha__) || defined(__hppa__)
-#define BF_ASM				0
 #define BF_SCALE			1
 #else
-#define BF_ASM				0
 #define BF_SCALE			0
 #endif
 
@@ -519,10 +516,6 @@ static void BF_swap(BF_word *x, int count)
 	R = L; \
 	L = tmp4 ^ data.ctx.P[BF_N + 1];
 
-#if BF_ASM
-#define BF_body() \
-	_BF_body_r(&data.ctx);
-#else
 #define BF_body() \
 	L = R = 0; \
 	ptr = data.ctx.P; \
@@ -540,7 +533,6 @@ static void BF_swap(BF_word *x, int count)
 		*(ptr - 2) = L; \
 		*(ptr - 1) = R; \
 	} while (ptr < &data.ctx.S[3][0xFF]);
-#endif
 
 static void BF_set_key(const char *key, BF_key expanded, BF_key initial,
     unsigned char flags)
@@ -652,9 +644,6 @@ static char *BF_crypt(const char *key, const char *setting,
 	char *output, size_t size,
 	BF_word min)
 {
-#if BF_ASM
-	extern void _BF_body_r(BF_ctx *ctx);
-#endif
 	struct {
 		BF_ctx ctx;
 		BF_key expanded_key;