Use size_t for shift and rotate values. Also define rotate_left and

rotate_right for SIMD types as a template specialization to avoid
problems in the amalgamation.

1 files changed, 9 insertions, 6 deletions

diff --git a/src/utils/simd_32/simd_32.h b/src/utils/simd_32/simd_32.h
index 9ea565402..e2c483d20 100644
--- a/src/utils/simd_32/simd_32.h
+++ b/src/utils/simd_32/simd_32.h
@@ -9,6 +9,7 @@
 #define BOTAN_SIMD_32_H__
 
 #include <botan/types.h>
+#include <botan/rotate.h>
 
 #if defined(BOTAN_TARGET_CPU_HAS_SSE2) && !defined(BOTAN_NO_SSE_INTRINSICS)
 
@@ -29,16 +30,18 @@
 
 namespace Botan {
 
-inline SIMD_32 rotate_left(const SIMD_32& x, u32bit rot)
+template<>
+inline SIMD_32 rotate_left(SIMD_32 x, size_t rot)
    {
-   SIMD_32 y = x;
-   y.rotate_left(rot);
-   return y;
+   x.rotate_left(rot);
+   return x;
    }
 
-inline SIMD_32 rotate_right(const SIMD_32& x, u32bit rot)
+template<>
+inline SIMD_32 rotate_right(SIMD_32 x, size_t rot)
    {
-   return rotate_left(x, 32 - rot);
+   x.rotate_right(rot);
+   return x;
    }
 
 }