Skip to content

Fix endianness handling #232

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

Merged
eddelbuettel merged 5 commits into from
Jun 4, 2025
Merged

Fix endianness handling #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c9d5f25
digest.c: fix endianness handling: swap bytes conditionally
barracuda156 Jun 4, 2025
13e6086
digest.c: fix endianness for xxh3_128bits
barracuda156 Jun 4, 2025
4836132
digest.c: non-functional: tabs to spaces
barracuda156 Jun 4, 2025
1fc2c19
ChangeLog: add an entry for endianness fix
barracuda156 Jun 4, 2025
3e6537b
ChangeLog: adjust spacing
barracuda156 Jun 4, 2025
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
4 changes: 4 additions & 0 deletions ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
2025-06-04 Sergey Fedorov <barracuda@macos-powerpc.org>

* src/digest.c: Fix endianness handling

2025-06-03 Dirk Eddelbuettel <edd@debian.org>

* DESCRIPTION (Version, Date): Roll micro version and date
Expand Down
28 changes: 18 additions & 10 deletions src/digest.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,13 +145,21 @@ void rev_memcpy(char *dst, const void *src, int len) {
// n.b. ripe templating to e.g. _store_from_integral<> if switching to c++
void _store_from_int32(const uint32_t hash, char *output, const int leaveRaw) {
if (leaveRaw) {
#if BYTE_ORDER == LITTLE_ENDIAN
rev_memcpy(output, &hash, sizeof(uint32_t));
#else
memcpy(output, &hash, sizeof(uint32_t));
#endif
} else snprintf(output, sizeof(uint32_t)*2 + 1, "%08x", hash);
}

void _store_from_int64(const uint64_t hash, char *output, const int leaveRaw) {
if (leaveRaw) {
#if BYTE_ORDER == LITTLE_ENDIAN
rev_memcpy(output, &hash, sizeof(uint64_t));
#else
memcpy(output, &hash, sizeof(uint64_t));
#endif
} else snprintf(output, sizeof(uint64_t)*2 + 1, "%016" PRIx64, hash);
}

Expand Down Expand Up @@ -316,12 +324,12 @@ SEXP digest(SEXP Txt, SEXP Algo, SEXP Length, SEXP Skip, SEXP Leave_raw, SEXP Se

XXH128_hash_t val = XXH3_128bits_withSeed(txt, nChar, seed);

// need something a bit fancier here
if (leaveRaw) {
rev_memcpy(output, &val.high64, 8);
rev_memcpy(output + 8, &val.low64, 8);
XXH128_canonical_t canon;
XXH128_canonicalFromHash(&canon, val);
memcpy(output, &canon, 16);
} else {
snprintf(output, 128, "%016" PRIx64 "%016" PRIx64, val.high64, val.low64);
snprintf(output, 128, "%016" PRIx64 "%016" PRIx64, val.high64, val.low64);
}
break;
}
Expand Down Expand Up @@ -434,9 +442,9 @@ SEXP digest(SEXP Txt, SEXP Algo, SEXP Length, SEXP Skip, SEXP Leave_raw, SEXP Se
while ( ( nChar = fread( buf, 1, sizeof( buf ), fp ) ) > 0)
SHA512_Update( &ctx, buf, nChar );
}
/* Calling SHA512_Final, because SHA512_End will already
convert the hash to a string, and we also want RAW */
SHA512_Final(sha512sum, &ctx);
/* Calling SHA512_Final, because SHA512_End will already
convert the hash to a string, and we also want RAW */
SHA512_Final(sha512sum, &ctx);

_store_from_char_ptr(sha512sum, output, output_length, leaveRaw);
break;
Expand Down Expand Up @@ -639,10 +647,10 @@ SEXP digest(SEXP Txt, SEXP Algo, SEXP Length, SEXP Skip, SEXP Leave_raw, SEXP Se
XXH128_hash_t val = XXH3_128bits_digest(state);
XXH3_freeState(state);

// need something a bit fancier here
if (leaveRaw) {
rev_memcpy(output, &val.high64, 8);
rev_memcpy(output + 8, &val.low64, 8);
XXH128_canonical_t canon;
XXH128_canonicalFromHash(&canon, val);
memcpy(output, &canon, 16);
} else {
snprintf(output, 128, "%016" PRIx64 "%016" PRIx64, val.high64, val.low64);
}
Expand Down