diff options
| author | George Peter Banyard <girgias@php.net> | 2020-05-06 00:45:42 +0200 |
|---|---|---|
| committer | George Peter Banyard <girgias@php.net> | 2020-05-06 17:55:32 +0200 |
| commit | 389c2b43035dd0ea898389389311fd8fb0d17b08 (patch) | |
| tree | fb047d8119695e44c89b9b591c298feea786ec42 /ext/standard/crypt_blowfish.c | |
| parent | 822c48996144f0da312f1d148a4888de3a16c474 (diff) | |
| download | php-git-389c2b43035dd0ea898389389311fd8fb0d17b08.tar.gz | |
Drop BF_ASM constant as it's always 0
Closes GH-5531
Diffstat (limited to 'ext/standard/crypt_blowfish.c')
| -rw-r--r-- | ext/standard/crypt_blowfish.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/ext/standard/crypt_blowfish.c b/ext/standard/crypt_blowfish.c index c1f945f29e..7f3a6fbb34 100644 --- a/ext/standard/crypt_blowfish.c +++ b/ext/standard/crypt_blowfish.c @@ -53,14 +53,9 @@ /* Just to make sure the prototypes match the actual definitions */ #include "crypt_blowfish.h" -#ifdef __i386__ -#define BF_ASM 0 -#define BF_SCALE 1 -#elif defined(__x86_64__) || defined(__alpha__) || defined(__hppa__) -#define BF_ASM 0 +#if defined(__i386__) || defined(__x86_64__) || defined(__alpha__) || defined(__hppa__) #define BF_SCALE 1 #else -#define BF_ASM 0 #define BF_SCALE 0 #endif @@ -525,10 +520,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; \ @@ -546,7 +537,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) @@ -658,9 +648,6 @@ static char *BF_crypt(const char *key, const char *setting, char *output, int size, BF_word min) { -#if BF_ASM - extern void _BF_body_r(BF_ctx *ctx); -#endif struct { BF_ctx ctx; BF_key expanded_key; |