35c35
< __FBSDID("$FreeBSD: head/secure/lib/libcrypt/blowfish.c 85358 2001-10-23 10:23:32Z peter $");
---
> __FBSDID("$FreeBSD: head/secure/lib/libcrypt/blowfish.c 91754 2002-03-06 17:18:09Z markm $");
56,62d55
< #undef inline
< #ifdef __GNUC__
< #define inline __inline
< #else /* !__GNUC__ */
< #define inline
< #endif /* !__GNUC__ */
<
65c58
< #define F(s, x) ((((s)[ (((x)>>24)&0xFF)] \
---
> #define _F(s, x) ((((s)[ (((x)>>24)&0xFF)] \
70c63
< #define BLFRND(s,p,i,j,n) (i ^= F(s,j) ^ (p)[n])
---
> #define BLFRND(s, p, i, j, n) (i ^= _F(s, j) ^ (p)[n])
73,76c66
< Blowfish_encipher(c, xl, xr)
< blf_ctx *c;
< u_int32_t *xl;
< u_int32_t *xr;
---
> Blowfish_encipher(blf_ctx *c, u_int32_t *xl, u_int32_t *xr)
101,104c91
< Blowfish_decipher(c, xl, xr)
< blf_ctx *c;
< u_int32_t *xl;
< u_int32_t *xr;
---
> Blowfish_decipher(blf_ctx *c, u_int32_t *xl, u_int32_t *xr)
129,130c116
< Blowfish_initstate(c)
< blf_ctx *c;
---
> Blowfish_initstate(blf_ctx *c)
202c188
< 0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a},
---
> 0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a},
267c253
< 0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7},
---
> 0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7},
332c318
< 0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0},
---
> 0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0},
397c383
< 0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6}
---
> 0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6}
411d396
< #ifdef __STDC__
413,420c398,399
< Blowfish_stream2word(const u_int8_t *data, u_int16_t databytes, u_int16_t *current)
< #else
< u_int32_t
< Blowfish_stream2word(data, databytes, current)
< const u_int8_t *data;
< u_int16_t databytes;
< u_int16_t *current;
< #endif
---
> Blowfish_stream2word(const u_int8_t *data, u_int16_t databytes,
> u_int16_t *current)
439d417
< #if __STDC__
442,448d419
< #else
< void
< Blowfish_expand0state(c, key, keybytes)
< blf_ctx *c;
< const u_int8_t *key;
< u_int16_t keybytes;
< #endif
485d455
< #if __STDC__
488,497c458
< const u_int8_t *key, u_int16_t keybytes)
< #else
< void
< Blowfish_expandstate(c, data, databytes, key, keybytes)
< blf_ctx *c;
< const u_int8_t *data;
< u_int16_t databytes;
< const u_int8_t *key;
< u_int16_t keybytes;
< #endif
---
> const u_int8_t *key, u_int16_t keybytes)
538d498
< #if __STDC__
541,547d500
< #else
< void
< blf_key(c, k, len)
< blf_ctx *c;
< const u_int8_t *k;
< u_int16_t len;
< #endif
556d508
< #if __STDC__
559,565d510
< #else
< void
< blf_enc(c, data, blocks)
< blf_ctx *c;
< u_int32_t *data;
< u_int16_t blocks;
< #endif
577d521
< #if __STDC__
580,586d523
< #else
< void
< blf_dec(c, data, blocks)
< blf_ctx *c;
< u_int32_t *data;
< u_int16_t blocks;
< #endif
598d534
< #if __STDC__
601,607d536
< #else
< void
< blf_ecb_encrypt(c, data, len)
< blf_ctx *c;
< u_int8_t *data;
< u_int32_t len;
< #endif
628d556
< #if __STDC__
631,637d558
< #else
< void
< blf_ecb_decrypt(c, data, len)
< blf_ctx *c;
< u_int8_t *data;
< u_int32_t len;
< #endif
658d578
< #if __STDC__
661,668d580
< #else
< void
< blf_cbc_encrypt(c, iv, data, len)
< blf_ctx *c;
< u_int8_t *iv;
< u_int8_t *data;
< u_int32_t len;
< #endif
692d603
< #if __STDC__
695,702d605
< #else
< void
< blf_cbc_decrypt(c, iva, data, len)
< blf_ctx *c;
< u_int8_t *iva;
< u_int8_t *data;
< u_int32_t len;
< #endif
761c664
< {0x424c4f57l, 0x46495348l};
---
> {0x424c4f57L, 0x46495348L};