Ooops! No ROTATE on some platforms after x86_64 performance patch...

6be4688b · Andy Polyakov · 717c5cdc · 6be4688b · 6be4688b
显示空白变更内容
内联并排

Showing with 6 addition and 2 deletion

crypto/des/des_locl.h crypto/des/des_locl.h +2 -1

crypto/rc5/rc5_locl.h crypto/rc5/rc5_locl.h +4 -1

未找到文件。
--- a/crypto/des/des_locl.h
+++ b/crypto/des/des_locl.h
@@ -169,7 +169,8 @@
 			   ret;				\
 			})
 # endif
-#else
+#endif
+#ifndef ROTATE
 #define	ROTATE(a,n)	(((a)>>(n))+((a)<<(32-(n))))
 #endif


--- a/crypto/rc5/rc5_locl.h
+++ b/crypto/rc5/rc5_locl.h
@@ -166,8 +166,11 @@
 					ret;			\
 				})
 # endif
-#else
+#endif
+#ifndef ROTATE_l32
 #define ROTATE_l32(a,n)     (((a)<<(n&0x1f))|(((a)&0xffffffff)>>(32-(n&0x1f))))
+#endif
+#ifndef ROTATE_r32
 #define ROTATE_r32(a,n)     (((a)<<(32-(n&0x1f)))|(((a)&0xffffffff)>>(n&0x1f)))
 #endif