From 457ff09ee71ad9eb3b4c3d9a53fa7409d6f648f5 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Thu, 26 Nov 2015 19:07:37 +0100 Subject: [PATCH] Revert --- src/libsodium/sodium/utils.c | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/src/libsodium/sodium/utils.c b/src/libsodium/sodium/utils.c index 28f2ad02..b5acc191 100644 --- a/src/libsodium/sodium/utils.c +++ b/src/libsodium/sodium/utils.c @@ -170,16 +170,8 @@ void sodium_increment(unsigned char *n, const size_t nlen) { size_t i = 0U; -#if !defined(CPU_UNALIGNED_ACCESS) || !defined(NATIVE_LITTLE_ENDIAN) || defined(__EMSCRIPTEN__) uint_fast16_t c = 1U; -#else - uint_fast64_t c = 1U; - for (; i < (nlen & ~0x3); i += 4U) { - c += (uint_fast64_t) *((const uint32_t *) (const void *) &n[i]); - *((uint32_t *) (void *) &n[i]) = (uint32_t) c; - c >>= 32; - } -#endif + for (; i < nlen; i++) { c += (uint_fast16_t) n[i]; n[i] = (unsigned char) c; @@ -191,17 +183,8 @@ void sodium_add(unsigned char *a, const unsigned char *b, const size_t len) { size_t i = 0U; -#if !defined(CPU_UNALIGNED_ACCESS) || !defined(NATIVE_LITTLE_ENDIAN) || defined(__EMSCRIPTEN__) uint_fast16_t c = 0U; -#else - uint_fast64_t c = 0U; - for (; i < (len & ~0x3); i += 4U) { - c += (uint_fast64_t) *((const uint32_t *) (const void *) &a[i]) + - (uint_fast64_t) *((const uint32_t *) (const void *) &b[i]); - *((uint32_t *) (void *) &a[i]) = (uint32_t) c; - c >>= 32; - } -#endif + for (; i < len; i++) { c += (uint_fast16_t) a[i] + (uint_fast16_t) b[i]; a[i] = (unsigned char) c;