Deleted Added
full compact
0a1,3
> /* $FreeBSD: head/sys/crypto/blowfish/bf_locl.h 62587 2000-07-04 16:35:15Z itojun $ */
> /* $KAME: bf_locl.h,v 1.3 2000/03/27 04:36:26 sumikawa Exp $ */
>
57,58d59
< *
< * $FreeBSD: head/sys/crypto/blowfish/bf_locl.h 55009 1999-12-22 19:13:38Z shin $
69c70
< #define c2l(c,l) (l =((unsigned long)(*((c)++))) , \
---
> #define c2l(c,l) (l =((unsigned long)(*((c)++))) , \
76c77
< #define c2ln(c,l1,l2,n) { \
---
> #define c2ln(c,l1,l2,n) { \
92c93
< #define l2c(l,c) (*((c)++)=(unsigned char)(((l) )&0xff), \
---
> #define l2c(l,c) (*((c)++)=(unsigned char)(((l) )&0xff), \
99c100
< #define l2cn(l1,l2,c,n) { \
---
> #define l2cn(l1,l2,c,n) { \
114c115
< #define n2ln(c,l1,l2,n) { \
---
> #define n2ln(c,l1,l2,n) { \
130c131
< #define l2nn(l1,l2,c,n) { \
---
> #define l2nn(l1,l2,c,n) { \
145c146
< #define n2l(c,l) (l =((unsigned long)(*((c)++)))<<24L, \
---
> #define n2l(c,l) (l =((unsigned long)(*((c)++)))<<24L, \
151c152
< #define l2n(l,c) (*((c)++)=(unsigned char)(((l)>>24L)&0xff), \
---
> #define l2n(l,c) (*((c)++)=(unsigned char)(((l)>>24L)&0xff), \
167,171c168,172
< #define BF_M 0x3fc
< #define BF_0 22L
< #define BF_1 14L
< #define BF_2 6L
< #define BF_3 2L /* left shift */
---
> #define BF_M 0x3fc
> #define BF_0 22L
> #define BF_1 14L
> #define BF_2 6L
> #define BF_3 2L /* left shift */
176c177
< #define BF_ENC(LL,R,S,P) \
---
> #define BF_ENC(LL,R,S,P) \
199c200
< #define BF_ENC(LL,R,S,P) \
---
> #define BF_ENC(LL,R,S,P) \
211c212
< #define BF_ENC(LL,R,S,P) \
---
> #define BF_ENC(LL,R,S,P) \