From a7253a353075e0ac84fe3131267a2f9cfba5de9a Mon Sep 17 00:00:00 2001 From: "Matthias J. Kannwischer" Date: Fri, 14 Jun 2019 14:16:40 +0200 Subject: [PATCH] make Windows and 32-bit systems (slightly more?) happy --- crypto_sign/rainbowIa-classic/clean/blas_comm.h | 4 ++-- crypto_sign/rainbowIa-classic/clean/utils_prng.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/crypto_sign/rainbowIa-classic/clean/blas_comm.h b/crypto_sign/rainbowIa-classic/clean/blas_comm.h index aab6d3ce..c435b970 100644 --- a/crypto_sign/rainbowIa-classic/clean/blas_comm.h +++ b/crypto_sign/rainbowIa-classic/clean/blas_comm.h @@ -17,7 +17,7 @@ static inline uint8_t gf16v_get_ele(const uint8_t *a, unsigned i) { uint8_t r = a[i >> 1]; uint8_t r0 = r & 0xf; uint8_t r1 = r >> 4; - uint8_t m = (uint8_t)(-(i & 1)); + uint8_t m = (uint8_t)(-((int8_t)i & 1)); return (uint8_t)((r1 & m) | ((~m)&r0)); } @@ -29,7 +29,7 @@ static inline uint8_t gf16v_get_ele(const uint8_t *a, unsigned i) { /// @return the value of the element. /// static inline uint8_t gf16v_set_ele(uint8_t *a, unsigned i, uint8_t v) { - uint8_t m = (uint8_t) (0xf ^ (-(i & 1))); /// 1--> 0xf0 , 0--> 0x0f + uint8_t m = (uint8_t) (0xf ^ (-((int8_t)i & 1))); /// 1--> 0xf0 , 0--> 0x0f uint8_t ai_remaining = (uint8_t) (a[i >> 1] & (~m)); /// erase a[i >> 1] = (uint8_t) (ai_remaining | (m & (v << 4)) | (m & v & 0xf)); /// set return v; diff --git a/crypto_sign/rainbowIa-classic/clean/utils_prng.c b/crypto_sign/rainbowIa-classic/clean/utils_prng.c index 7a9ad369..1a8a36b4 100644 --- a/crypto_sign/rainbowIa-classic/clean/utils_prng.c +++ b/crypto_sign/rainbowIa-classic/clean/utils_prng.c @@ -44,7 +44,7 @@ static void randombytes_init_with_state(prng_t *state, static int randombytes_with_state(prng_t *state, unsigned char *x, - unsigned long long xlen) { + size_t xlen) { unsigned char block[16]; int i = 0;