Merge "Fix 64 bit issue in sha1.c"