Skip to content

Fix handling of unsigned arithmetic. #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bsilverthorn wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix handling of unsigned arithmetic. #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
80b26d0
Fix handling of unsigned arithmetic.
bsilverthorn Dec 18, 2013
bd4a723
Revert an unnecessary change to lastBlock().
bsilverthorn Aug 31, 2014
f5b5fa7
Revert removal of trailing whitespace.
bsilverthorn Aug 31, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/main/java/com/github/emboss/siphash/SipHash.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,19 @@ private static long lastBlock(byte[] data, int iter) {

Copy link

@skhoshoo skhoshoo Feb 15, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is one more change for this PR:

diff --git a/src/main/java/com/github/emboss/siphash/SipHash.java b/src/main/java/com/github/emboss/siphash/SipHash.java
index 9f31287..00c4640 100644
--- a/src/main/java/com/github/emboss/siphash/SipHash.java
+++ b/src/main/java/com/github/emboss/siphash/SipHash.java
@@ -21,7 +21,7 @@ public class SipHash {
     }
 
     private static long lastBlock(byte[] data, int iter) {
-        long last = ((long) data.length) << 56;
+        long last = (((long) data.length) & 0xff) << 56;
         int off = iter * 8;
 
         switch (data.length % 8) {

switch (data.length % 8) {
case 7:
last |= ((long) data[off + 6]) << 48;
last |= (((long) data[off + 6]) & 0xff) << 48;
case 6:
last |= ((long) data[off + 5]) << 40;
last |= (((long) data[off + 5]) & 0xff) << 40;
case 5:
last |= ((long) data[off + 4]) << 32;
last |= (((long) data[off + 4]) & 0xff) << 32;
case 4:
last |= ((long) data[off + 3]) << 24;
last |= (((long) data[off + 3]) & 0xff) << 24;
case 3:
last |= ((long) data[off + 2]) << 16;
last |= (((long) data[off + 2]) & 0xff) << 16;
case 2:
last |= ((long) data[off + 1]) << 8;
last |= (((long) data[off + 1]) & 0xff) << 8;
case 1:
last |= (long) data[off];
last |= ((long) data[off]) & 0xff;
break;
case 0:
break;
Expand Down
16 changes: 8 additions & 8 deletions src/main/java/com/github/emboss/siphash/UnsignedInt64.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ public static long binToInt(byte[] b) {
}

public static long binToIntOffset(byte[] b, int off) {
return ((long) b[off ]) |
((long) b[off + 1]) << 8 |
((long) b[off + 2]) << 16 |
((long) b[off + 3]) << 24 |
((long) b[off + 4]) << 32 |
((long) b[off + 5]) << 40 |
((long) b[off + 6]) << 48 |
((long) b[off + 7]) << 56;
return (((long) b[off ]) & 0xff) |
(((long) b[off + 1]) & 0xff) << 8 |
(((long) b[off + 2]) & 0xff) << 16 |
(((long) b[off + 3]) & 0xff) << 24 |
(((long) b[off + 4]) & 0xff) << 32 |
(((long) b[off + 5]) & 0xff) << 40 |
(((long) b[off + 6]) & 0xff) << 48 |
(((long) b[off + 7]) & 0xff) << 56;
}

public static void intToBin(long l, byte[] b) {
Expand Down