|
 |
fe9ead9 |
From 168275c3f4ffe9d0e09ed7a3789b45b440416f73 Mon Sep 17 00:00:00 2001
|
|
|
fe9ead9 |
From: Nikolai Kondrashov <Nikolai.Kondrashov@redhat.com>
|
|
|
fe9ead9 |
Date: Wed, 1 Oct 2014 16:32:11 +0300
|
|
|
fe9ead9 |
Subject: [PATCH 4/4] Don't assume little-endian in fr_prints_uint128
|
|
|
fe9ead9 |
|
|
|
fe9ead9 |
Add handling of big-endian architectures to fr_prints_uint128.
|
|
|
fe9ead9 |
---
|
|
|
fe9ead9 |
src/lib/misc.c | 13 ++++++++++---
|
|
|
fe9ead9 |
1 file changed, 10 insertions(+), 3 deletions(-)
|
|
|
fe9ead9 |
|
|
|
fe9ead9 |
diff --git a/src/lib/misc.c b/src/lib/misc.c
|
|
|
fe9ead9 |
index 66171ff..d0ccd6c 100644
|
|
|
fe9ead9 |
--- a/src/lib/misc.c
|
|
|
fe9ead9 |
+++ b/src/lib/misc.c
|
|
|
fe9ead9 |
@@ -1366,6 +1366,13 @@ size_t fr_prints_uint128(char *out, size_t outlen, uint128_t const num)
|
|
|
fe9ead9 |
uint64_t n[2];
|
|
|
fe9ead9 |
char *p = buff;
|
|
|
fe9ead9 |
int i;
|
|
|
fe9ead9 |
+#ifdef RADIUS_LITTLE_ENDIAN
|
|
|
fe9ead9 |
+ const size_t l = 0;
|
|
|
fe9ead9 |
+ const size_t h = 1;
|
|
|
fe9ead9 |
+#else
|
|
|
fe9ead9 |
+ const size_t l = 1;
|
|
|
fe9ead9 |
+ const size_t h = 0;
|
|
|
fe9ead9 |
+#endif
|
|
|
fe9ead9 |
|
|
|
fe9ead9 |
memset(buff, '0', sizeof(buff) - 1);
|
|
|
fe9ead9 |
buff[sizeof(buff) - 1] = '\0';
|
|
|
fe9ead9 |
@@ -1376,11 +1383,11 @@ size_t fr_prints_uint128(char *out, size_t outlen, uint128_t const num)
|
|
|
fe9ead9 |
ssize_t j;
|
|
|
fe9ead9 |
int carry;
|
|
|
fe9ead9 |
|
|
|
fe9ead9 |
- carry = (n[1] >= 0x8000000000000000);
|
|
|
fe9ead9 |
+ carry = (n[h] >= 0x8000000000000000);
|
|
|
fe9ead9 |
|
|
|
fe9ead9 |
// Shift n[] left, doubling it
|
|
|
fe9ead9 |
- n[1] = ((n[1] << 1) & 0xffffffffffffffff) + (n[0] >= 0x8000000000000000);
|
|
|
fe9ead9 |
- n[0] = ((n[0] << 1) & 0xffffffffffffffff);
|
|
|
fe9ead9 |
+ n[h] = ((n[h] << 1) & 0xffffffffffffffff) + (n[l] >= 0x8000000000000000);
|
|
|
fe9ead9 |
+ n[l] = ((n[l] << 1) & 0xffffffffffffffff);
|
|
|
fe9ead9 |
|
|
|
fe9ead9 |
// Add s[] to itself in decimal, doubling it
|
|
|
fe9ead9 |
for (j = sizeof(buff) - 2; j >= 0; j--) {
|
|
|
fe9ead9 |
--
|
|
|
fe9ead9 |
2.1.0
|
|
|
fe9ead9 |
|