Skip to content

Commit 389c2b4

Browse files
committed
Drop BF_ASM constant as it's always 0
Closes GH-5531
1 parent 822c489 commit 389c2b4

File tree

1 file changed

+1
-14
lines changed

1 file changed

+1
-14
lines changed

ext/standard/crypt_blowfish.c

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,9 @@
5353
/* Just to make sure the prototypes match the actual definitions */
5454
#include "crypt_blowfish.h"
5555

56-
#ifdef __i386__
57-
#define BF_ASM 0
58-
#define BF_SCALE 1
59-
#elif defined(__x86_64__) || defined(__alpha__) || defined(__hppa__)
60-
#define BF_ASM 0
56+
#if defined(__i386__) || defined(__x86_64__) || defined(__alpha__) || defined(__hppa__)
6157
#define BF_SCALE 1
6258
#else
63-
#define BF_ASM 0
6459
#define BF_SCALE 0
6560
#endif
6661

@@ -525,10 +520,6 @@ static void BF_swap(BF_word *x, int count)
525520
R = L; \
526521
L = tmp4 ^ data.ctx.P[BF_N + 1];
527522

528-
#if BF_ASM
529-
#define BF_body() \
530-
_BF_body_r(&data.ctx);
531-
#else
532523
#define BF_body() \
533524
L = R = 0; \
534525
ptr = data.ctx.P; \
@@ -546,7 +537,6 @@ static void BF_swap(BF_word *x, int count)
546537
*(ptr - 2) = L; \
547538
*(ptr - 1) = R; \
548539
} while (ptr < &data.ctx.S[3][0xFF]);
549-
#endif
550540

551541
static void BF_set_key(const char *key, BF_key expanded, BF_key initial,
552542
unsigned char flags)
@@ -658,9 +648,6 @@ static char *BF_crypt(const char *key, const char *setting,
658648
char *output, int size,
659649
BF_word min)
660650
{
661-
#if BF_ASM
662-
extern void _BF_body_r(BF_ctx *ctx);
663-
#endif
664651
struct {
665652
BF_ctx ctx;
666653
BF_key expanded_key;

0 commit comments

Comments
 (0)