diff options
Diffstat (limited to 'libbb')
| -rw-r--r-- | libbb/pw_encrypt_des.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/libbb/pw_encrypt_des.c b/libbb/pw_encrypt_des.c index 8b5edaaed..38c76a15c 100644 --- a/libbb/pw_encrypt_des.c +++ b/libbb/pw_encrypt_des.c | |||
| @@ -186,17 +186,6 @@ static const uint8_t pbox[32] ALIGN1 = { | |||
| 186 | 2, 8, 24, 14, 32, 27, 3, 9, 19, 13, 30, 6, 22, 11, 4, 25 | 186 | 2, 8, 24, 14, 32, 27, 3, 9, 19, 13, 30, 6, 22, 11, 4, 25 |
| 187 | }; | 187 | }; |
| 188 | 188 | ||
| 189 | static const uint32_t bits32[32] ALIGN4 = { | ||
| 190 | 0x80000000, 0x40000000, 0x20000000, 0x10000000, | ||
| 191 | 0x08000000, 0x04000000, 0x02000000, 0x01000000, | ||
| 192 | 0x00800000, 0x00400000, 0x00200000, 0x00100000, | ||
| 193 | 0x00080000, 0x00040000, 0x00020000, 0x00010000, | ||
| 194 | 0x00008000, 0x00004000, 0x00002000, 0x00001000, | ||
| 195 | 0x00000800, 0x00000400, 0x00000200, 0x00000100, | ||
| 196 | 0x00000080, 0x00000040, 0x00000020, 0x00000010, | ||
| 197 | 0x00000008, 0x00000004, 0x00000002, 0x00000001 | ||
| 198 | }; | ||
| 199 | |||
| 200 | static const uint8_t bits8[8] ALIGN1 = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 }; | 189 | static const uint8_t bits8[8] ALIGN1 = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 }; |
| 201 | 190 | ||
| 202 | 191 | ||
| @@ -335,11 +324,18 @@ des_init(struct des_ctx *ctx, const struct const_des_ctx *cctx) | |||
| 335 | int i, j, b, k, inbit, obit; | 324 | int i, j, b, k, inbit, obit; |
| 336 | uint32_t p; | 325 | uint32_t p; |
| 337 | const uint32_t *bits28, *bits24; | 326 | const uint32_t *bits28, *bits24; |
| 327 | uint32_t bits32[32]; | ||
| 338 | 328 | ||
| 339 | if (!ctx) | 329 | if (!ctx) |
| 340 | ctx = xmalloc(sizeof(*ctx)); | 330 | ctx = xmalloc(sizeof(*ctx)); |
| 341 | const_ctx = cctx; | 331 | const_ctx = cctx; |
| 342 | 332 | ||
| 333 | p = 0x80000000U; | ||
| 334 | for (i = 0; p; i++) { | ||
| 335 | bits32[i] = p; | ||
| 336 | p >>= 1; | ||
| 337 | } | ||
| 338 | |||
| 343 | #if USE_REPETITIVE_SPEEDUP | 339 | #if USE_REPETITIVE_SPEEDUP |
| 344 | old_rawkey0 = old_rawkey1 = 0; | 340 | old_rawkey0 = old_rawkey1 = 0; |
| 345 | old_salt = 0; | 341 | old_salt = 0; |
