Handle zero-distance rotates correctly

Author: peterdettman

core/src/main/j2me/org/bouncycastle/util/Integers.java

@@ -65,12 +65,12 @@ public static int reverseBytes(int i)
 
     public static int rotateLeft(int i, int distance)
     {
-        return (i << distance) ^ (i >>> -distance);
+        return (i << distance) | (i >>> -distance);
     }
 
     public static int rotateRight(int i, int distance)
     {
-        return (i >>> distance) ^ (i << -distance);
+        return (i >>> distance) | (i << -distance);
     }
 
     public static Integer valueOf(int value)

core/src/main/j2me/org/bouncycastle/util/Longs.java

@@ -65,12 +65,12 @@ public static long reverseBytes(long i)
 
     public static long rotateLeft(long i, int distance)
     {
-        return (i << distance) ^ (i >>> -distance);
+        return (i << distance) | (i >>> -distance);
     }
 
     public static long rotateRight(long i, int distance)
     {
-        return (i >>> distance) ^ (i << -distance);
+        return (i >>> distance) | (i << -distance);
     }
 
     public static Long valueOf(long value)

core/src/main/jdk1.4/org/bouncycastle/util/Integers.java

@@ -65,12 +65,12 @@ public static int reverseBytes(int i)
 
     public static int rotateLeft(int i, int distance)
     {
-        return (i << distance) ^ (i >>> -distance);
+        return (i << distance) | (i >>> -distance);
     }
 
     public static int rotateRight(int i, int distance)
     {
-        return (i >>> distance) ^ (i << -distance);
+        return (i >>> distance) | (i << -distance);
     }
 
     public static Integer valueOf(int value)

core/src/main/jdk1.4/org/bouncycastle/util/Longs.java

@@ -65,12 +65,12 @@ public static long reverseBytes(long i)
 
     public static long rotateLeft(long i, int distance)
     {
-        return (i << distance) ^ (i >>> -distance);
+        return (i << distance) | (i >>> -distance);
     }
 
     public static long rotateRight(long i, int distance)
     {
-        return (i >>> distance) ^ (i << -distance);
+        return (i >>> distance) | (i << -distance);
     }
 
     public static Long valueOf(long value)