diff options
| -rw-r--r-- | libbb/sha1.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/libbb/sha1.c b/libbb/sha1.c index 9fa095e85..ea645b735 100644 --- a/libbb/sha1.c +++ b/libbb/sha1.c | |||
| @@ -53,6 +53,12 @@ static inline uint64_t hton64(uint64_t v) | |||
| 53 | #endif | 53 | #endif |
| 54 | 54 | ||
| 55 | 55 | ||
| 56 | /* Some arch headers have conflicting defines */ | ||
| 57 | #undef ch | ||
| 58 | #undef parity | ||
| 59 | #undef maj | ||
| 60 | #undef rnd | ||
| 61 | |||
| 56 | static void FAST_FUNC sha1_process_block64(sha1_ctx_t *ctx) | 62 | static void FAST_FUNC sha1_process_block64(sha1_ctx_t *ctx) |
| 57 | { | 63 | { |
| 58 | unsigned t; | 64 | unsigned t; |
| @@ -162,6 +168,13 @@ static const uint64_t sha_K[80] = { | |||
| 162 | 0x5fcb6fab3ad6faecULL, 0x6c44198c4a475817ULL | 168 | 0x5fcb6fab3ad6faecULL, 0x6c44198c4a475817ULL |
| 163 | }; | 169 | }; |
| 164 | 170 | ||
| 171 | #undef Ch | ||
| 172 | #undef Maj | ||
| 173 | #undef S0 | ||
| 174 | #undef S1 | ||
| 175 | #undef R0 | ||
| 176 | #undef R1 | ||
| 177 | |||
| 165 | static void FAST_FUNC sha256_process_block64(sha256_ctx_t *ctx) | 178 | static void FAST_FUNC sha256_process_block64(sha256_ctx_t *ctx) |
| 166 | { | 179 | { |
| 167 | unsigned t; | 180 | unsigned t; |
