xnu-344.tar.gz

[apple/xnu.git] / bsd / crypto / blowfish / bf_locl.h

diff --git a/bsd/crypto/blowfish/bf_locl.h b/bsd/crypto/blowfish/bf_locl.h
index fbf8d98147876ccb951270e3fa690bf97502d997..c3fa929e0402fe103b2ea28902abeb315a7f869a 100644 (file)
--- a/bsd/crypto/blowfish/bf_locl.h
+++ b/bsd/crypto/blowfish/bf_locl.h
@@ -1,3 +1,6 @@
+/*     $FreeBSD: src/sys/crypto/blowfish/bf_locl.h,v 1.1.2.2 2001/07/03 11:01:28 ume Exp $     */
+/*     $KAME: bf_locl.h,v 1.5 2000/08/31 06:03:48 itojun Exp $ */
+
 /* crypto/bf/bf_local.h */
 /* Copyright (C) 1995-1997 Eric Young (eay@mincom.oz.au)
  * All rights reserved.
@@ -64,10 +67,10 @@
  */
 
 #undef c2l
-#define c2l(c,l)       (l =((unsigned long)(*((c)++)))    , \
-                        l|=((unsigned long)(*((c)++)))<< 8L, \
-                        l|=((unsigned long)(*((c)++)))<<16L, \
-                        l|=((unsigned long)(*((c)++)))<<24L)
+#define c2l(c,l)       (l =((BF_LONG)(*((c)++)))    , \
+                        l|=((BF_LONG)(*((c)++)))<< 8L, \
+                        l|=((BF_LONG)(*((c)++)))<<16L, \
+                        l|=((BF_LONG)(*((c)++)))<<24L)
 
 /* NOTE - c is not incremented as per c2l */
 #undef c2ln
@@ -75,14 +78,14 @@
                        c+=n; \
                        l1=l2=0; \
                        switch (n) { \
-                       case 8: l2 =((unsigned long)(*(--(c))))<<24L; \
-                       case 7: l2|=((unsigned long)(*(--(c))))<<16L; \
-                       case 6: l2|=((unsigned long)(*(--(c))))<< 8L; \
-                       case 5: l2|=((unsigned long)(*(--(c))));     \
-                       case 4: l1 =((unsigned long)(*(--(c))))<<24L; \
-                       case 3: l1|=((unsigned long)(*(--(c))))<<16L; \
-                       case 2: l1|=((unsigned long)(*(--(c))))<< 8L; \
-                       case 1: l1|=((unsigned long)(*(--(c))));     \
+                       case 8: l2 =((BF_LONG)(*(--(c))))<<24L; \
+                       case 7: l2|=((BF_LONG)(*(--(c))))<<16L; \
+                       case 6: l2|=((BF_LONG)(*(--(c))))<< 8L; \
+                       case 5: l2|=((BF_LONG)(*(--(c))));     \
+                       case 4: l1 =((BF_LONG)(*(--(c))))<<24L; \
+                       case 3: l1|=((BF_LONG)(*(--(c))))<<16L; \
+                       case 2: l1|=((BF_LONG)(*(--(c))))<< 8L; \
+                       case 1: l1|=((BF_LONG)(*(--(c))));     \
                                } \
                        }
 
@@ -113,14 +116,14 @@
                        c+=n; \
                        l1=l2=0; \
                        switch (n) { \
-                       case 8: l2 =((unsigned long)(*(--(c))))    ; \
-                       case 7: l2|=((unsigned long)(*(--(c))))<< 8; \
-                       case 6: l2|=((unsigned long)(*(--(c))))<<16; \
-                       case 5: l2|=((unsigned long)(*(--(c))))<<24; \
-                       case 4: l1 =((unsigned long)(*(--(c))))    ; \
-                       case 3: l1|=((unsigned long)(*(--(c))))<< 8; \
-                       case 2: l1|=((unsigned long)(*(--(c))))<<16; \
-                       case 1: l1|=((unsigned long)(*(--(c))))<<24; \
+                       case 8: l2 =((BF_LONG)(*(--(c))))    ; \
+                       case 7: l2|=((BF_LONG)(*(--(c))))<< 8; \
+                       case 6: l2|=((BF_LONG)(*(--(c))))<<16; \
+                       case 5: l2|=((BF_LONG)(*(--(c))))<<24; \
+                       case 4: l1 =((BF_LONG)(*(--(c))))    ; \
+                       case 3: l1|=((BF_LONG)(*(--(c))))<< 8; \
+                       case 2: l1|=((BF_LONG)(*(--(c))))<<16; \
+                       case 1: l1|=((BF_LONG)(*(--(c))))<<24; \
                                } \
                        }
 
@@ -140,10 +143,10 @@
                        }
 
 #undef n2l
-#define n2l(c,l)        (l =((unsigned long)(*((c)++)))<<24L, \
-                         l|=((unsigned long)(*((c)++)))<<16L, \
-                         l|=((unsigned long)(*((c)++)))<< 8L, \
-                         l|=((unsigned long)(*((c)++))))
+#define n2l(c,l)        (l =((BF_LONG)(*((c)++)))<<24L, \
+                         l|=((BF_LONG)(*((c)++)))<<16L, \
+                         l|=((BF_LONG)(*((c)++)))<< 8L, \
+                         l|=((BF_LONG)(*((c)++))))
 
 #undef l2n
 #define l2n(l,c)        (*((c)++)=(unsigned char)(((l)>>24L)&0xff), \
@@ -158,9 +161,17 @@
  * BF_PTR for sparc and MIPS/SGI
  * use nothing for Alpha and HP.
  */
-#if !defined(BF_PTR) && !defined(BF_PTR2)
-#undef BF_PTR
+#undef BF_PTR
+#undef BF_PTR2
+#ifdef __NetBSD__
+#ifdef __i386__
+#define        BF_PTR2
+#else
+#ifdef __mips__
+#define        BF_PTR
+#endif
 #endif
+#endif /*NetBSD*/
 
 #define BF_M   0x3fc
 #define BF_0   22L