kris/pqc
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make various casts in kyber explicit to make MS compiler happy with /W4

Browse Source
This commit is contained in:
Peter Schwabe 2019-02-14 16:14:47 +01:00
parent 81797c2c13
commit 8b8f27b003
6 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
crypto_kem/kyber768/clean/cbd.c
View File

@ -37,7 +37,7 @@ void PQCLEAN_KYBER768_cbd(poly *r, const unsigned char *buf) {
int i, j; int i, j;
for (i = 0; i < KYBER_N / 4; i++) { for (i = 0; i < KYBER_N / 4; i++) {
t = load_littleendian(buf + 3 * i, 3); t = (uint32_t)load_littleendian(buf + 3 * i, 3);
d = 0; d = 0;
for (j = 0; j < 3; j++) { for (j = 0; j < 3; j++) {
d += (t >> j) & 0x249249; d += (t >> j) & 0x249249;
@ -52,17 +52,17 @@ void PQCLEAN_KYBER768_cbd(poly *r, const unsigned char *buf) {
a[3] = (d >> 18) & 0x7; a[3] = (d >> 18) & 0x7;
b[3] = (d >> 21); b[3] = (d >> 21);
r->coeffs[4 * i + 0] = a[0] + KYBER_Q - b[0]; r->coeffs[4 * i + 0] = (uint16_t)a[0] + KYBER_Q - b[0];
r->coeffs[4 * i + 1] = a[1] + KYBER_Q - b[1]; r->coeffs[4 * i + 1] = (uint16_t)a[1] + KYBER_Q - b[1];
r->coeffs[4 * i + 2] = a[2] + KYBER_Q - b[2]; r->coeffs[4 * i + 2] = (uint16_t)a[2] + KYBER_Q - b[2];
r->coeffs[4 * i + 3] = a[3] + KYBER_Q - b[3]; r->coeffs[4 * i + 3] = (uint16_t)a[3] + KYBER_Q - b[3];
} }
#elif KYBER_ETA == 4 #elif KYBER_ETA == 4
uint32_t t, d, a[4], b[4]; uint32_t t, d, a[4], b[4];
int i, j; int i, j;
for (i = 0; i < KYBER_N / 4; i++) { for (i = 0; i < KYBER_N / 4; i++) {
t = load_littleendian(buf + 4 * i, 4); t = (uint32_t)load_littleendian(buf + 4 * i, 4);
d = 0; d = 0;
for (j = 0; j < 4; j++) { for (j = 0; j < 4; j++) {
d += (t >> j) & 0x11111111; d += (t >> j) & 0x11111111;
@ -77,10 +77,10 @@ void PQCLEAN_KYBER768_cbd(poly *r, const unsigned char *buf) {
a[3] = (d >> 24) & 0xf; a[3] = (d >> 24) & 0xf;
b[3] = (d >> 28); b[3] = (d >> 28);
r->coeffs[4 * i + 0] = a[0] + KYBER_Q - b[0]; r->coeffs[4 * i + 0] = (uint16_t)a[0] + KYBER_Q - b[0];
r->coeffs[4 * i + 1] = a[1] + KYBER_Q - b[1]; r->coeffs[4 * i + 1] = (uint16_t)a[1] + KYBER_Q - b[1];
r->coeffs[4 * i + 2] = a[2] + KYBER_Q - b[2]; r->coeffs[4 * i + 2] = (uint16_t)a[2] + KYBER_Q - b[2];
r->coeffs[4 * i + 3] = a[3] + KYBER_Q - b[3]; r->coeffs[4 * i + 3] = (uint16_t)a[3] + KYBER_Q - b[3];
} }
#elif KYBER_ETA == 5 #elif KYBER_ETA == 5
uint64_t t, d, a[4], b[4]; uint64_t t, d, a[4], b[4];
@ -102,10 +102,10 @@ void PQCLEAN_KYBER768_cbd(poly *r, const unsigned char *buf) {
a[3] = (d >> 30) & 0x1f; a[3] = (d >> 30) & 0x1f;
b[3] = (d >> 35); b[3] = (d >> 35);
r->coeffs[4 * i + 0] = a[0] + KYBER_Q - b[0]; r->coeffs[4 * i + 0] = (uint16_t)a[0] + KYBER_Q - b[0];
r->coeffs[4 * i + 1] = a[1] + KYBER_Q - b[1]; r->coeffs[4 * i + 1] = (uint16_t)a[1] + KYBER_Q - b[1];
r->coeffs[4 * i + 2] = a[2] + KYBER_Q - b[2]; r->coeffs[4 * i + 2] = (uint16_t)a[2] + KYBER_Q - b[2];
r->coeffs[4 * i + 3] = a[3] + KYBER_Q - b[3]; r->coeffs[4 * i + 3] = (uint16_t)a[3] + KYBER_Q - b[3];
} }
#else #else
#error "poly_getnoise in poly.c only supports eta in {3,4,5}" #error "poly_getnoise in poly.c only supports eta in {3,4,5}"

8
crypto_kem/kyber768/clean/indcpa.c
View File

@ -143,11 +143,11 @@ static void gen_matrix(polyvec *a, const unsigned char *seed, int transposed) {
ctr = pos = 0; ctr = pos = 0;
nblocks = maxnblocks; nblocks = maxnblocks;
if (transposed) { if (transposed) {
extseed[KYBER_SYMBYTES] = i; extseed[KYBER_SYMBYTES] = (unsigned char)i;
extseed[KYBER_SYMBYTES + 1] = j; extseed[KYBER_SYMBYTES + 1] = (unsigned char)j;
} else { } else {
extseed[KYBER_SYMBYTES] = j; extseed[KYBER_SYMBYTES] = (unsigned char)j;
extseed[KYBER_SYMBYTES + 1] = i; extseed[KYBER_SYMBYTES + 1] = (unsigned char)i;
} }
shake128_absorb(state, extseed, KYBER_SYMBYTES + 2); shake128_absorb(state, extseed, KYBER_SYMBYTES + 2);

32
crypto_kem/kyber768/clean/poly.c
View File

@ -23,9 +23,9 @@ void PQCLEAN_KYBER768_poly_compress(unsigned char *r, const poly *a) {
t[j] = (((PQCLEAN_KYBER768_freeze(a->coeffs[i + j]) << 3) + KYBER_Q / 2) / KYBER_Q) & 7; t[j] = (((PQCLEAN_KYBER768_freeze(a->coeffs[i + j]) << 3) + KYBER_Q / 2) / KYBER_Q) & 7;
} }
r[k] = t[0] | (t[1] << 3) | (t[2] << 6); r[k] = (unsigned char)( t[0] | (t[1] << 3) | (t[2] << 6));
r[k + 1] = (t[2] >> 2) | (t[3] << 1) | (t[4] << 4) | (t[5] << 7); r[k + 1] = (unsigned char)((t[2] >> 2) | (t[3] << 1) | (t[4] << 4) | (t[5] << 7));
r[k + 2] = (t[5] >> 1) | (t[6] << 2) | (t[7] << 5); r[k + 2] = (unsigned char)((t[5] >> 1) | (t[6] << 2) | (t[7] << 5));
k += 3; k += 3;
} }
} }
@ -71,19 +71,19 @@ void PQCLEAN_KYBER768_poly_tobytes(unsigned char *r, const poly *a) {
t[j] = PQCLEAN_KYBER768_freeze(a->coeffs[8 * i + j]); t[j] = PQCLEAN_KYBER768_freeze(a->coeffs[8 * i + j]);
} }
r[13 * i + 0] = t[0] & 0xff; r[13 * i + 0] = (unsigned char)( t[0] & 0xff);
r[13 * i + 1] = (t[0] >> 8) | ((t[1] & 0x07) << 5); r[13 * i + 1] = (unsigned char)((t[0] >> 8) | ((t[1] & 0x07) << 5));
r[13 * i + 2] = (t[1] >> 3) & 0xff; r[13 * i + 2] = (unsigned char)((t[1] >> 3) & 0xff);
r[13 * i + 3] = (t[1] >> 11) | ((t[2] & 0x3f) << 2); r[13 * i + 3] = (unsigned char)((t[1] >> 11) | ((t[2] & 0x3f) << 2));
r[13 * i + 4] = (t[2] >> 6) | ((t[3] & 0x01) << 7); r[13 * i + 4] = (unsigned char)((t[2] >> 6) | ((t[3] & 0x01) << 7));
r[13 * i + 5] = (t[3] >> 1) & 0xff; r[13 * i + 5] = (unsigned char)((t[3] >> 1) & 0xff);
r[13 * i + 6] = (t[3] >> 9) | ((t[4] & 0x0f) << 4); r[13 * i + 6] = (unsigned char)((t[3] >> 9) | ((t[4] & 0x0f) << 4));
r[13 * i + 7] = (t[4] >> 4) & 0xff; r[13 * i + 7] = (unsigned char)((t[4] >> 4) & 0xff);
r[13 * i + 8] = (t[4] >> 12) | ((t[5] & 0x7f) << 1); r[13 * i + 8] = (unsigned char)((t[4] >> 12) | ((t[5] & 0x7f) << 1));
r[13 * i + 9] = (t[5] >> 7) | ((t[6] & 0x03) << 6); r[13 * i + 9] = (unsigned char)((t[5] >> 7) | ((t[6] & 0x03) << 6));
r[13 * i + 10] = (t[6] >> 2) & 0xff; r[13 * i + 10] = (unsigned char)((t[6] >> 2) & 0xff);
r[13 * i + 11] = (t[6] >> 10) | ((t[7] & 0x1f) << 3); r[13 * i + 11] = (unsigned char)((t[6] >> 10) | ((t[7] & 0x1f) << 3));
r[13 * i + 12] = (t[7] >> 5); r[13 * i + 12] = (unsigned char)((t[7] >> 5));
} }
} }

22
crypto_kem/kyber768/clean/polyvec.c
View File

@ -21,17 +21,17 @@ void PQCLEAN_KYBER768_polyvec_compress(unsigned char *r, const polyvec *a) {
t[k] = ((((uint32_t)PQCLEAN_KYBER768_freeze(a->vec[i].coeffs[8 * j + k]) << 11) + KYBER_Q / 2) / KYBER_Q) & 0x7ff; t[k] = ((((uint32_t)PQCLEAN_KYBER768_freeze(a->vec[i].coeffs[8 * j + k]) << 11) + KYBER_Q / 2) / KYBER_Q) & 0x7ff;
} }
r[11 * j + 0] = t[0] & 0xff; r[11 * j + 0] = (unsigned char)( t[0] & 0xff);
r[11 * j + 1] = (t[0] >> 8) | ((t[1] & 0x1f) << 3); r[11 * j + 1] = (unsigned char)((t[0] >> 8) | ((t[1] & 0x1f) << 3));
r[11 * j + 2] = (t[1] >> 5) | ((t[2] & 0x03) << 6); r[11 * j + 2] = (unsigned char)((t[1] >> 5) | ((t[2] & 0x03) << 6));
r[11 * j + 3] = (t[2] >> 2) & 0xff; r[11 * j + 3] = (unsigned char)((t[2] >> 2) & 0xff);
r[11 * j + 4] = (t[2] >> 10) | ((t[3] & 0x7f) << 1); r[11 * j + 4] = (unsigned char)((t[2] >> 10) | ((t[3] & 0x7f) << 1));
r[11 * j + 5] = (t[3] >> 7) | ((t[4] & 0x0f) << 4); r[11 * j + 5] = (unsigned char)((t[3] >> 7) | ((t[4] & 0x0f) << 4));
r[11 * j + 6] = (t[4] >> 4) | ((t[5] & 0x01) << 7); r[11 * j + 6] = (unsigned char)((t[4] >> 4) | ((t[5] & 0x01) << 7));
r[11 * j + 7] = (t[5] >> 1) & 0xff; r[11 * j + 7] = (unsigned char)((t[5] >> 1) & 0xff);
r[11 * j + 8] = (t[5] >> 9) | ((t[6] & 0x3f) << 2); r[11 * j + 8] = (unsigned char)((t[5] >> 9) | ((t[6] & 0x3f) << 2));
r[11 * j + 9] = (t[6] >> 6) | ((t[7] & 0x07) << 5); r[11 * j + 9] = (unsigned char)((t[6] >> 6) | ((t[7] & 0x07) << 5));
r[11 * j + 10] = (t[7] >> 3); r[11 * j + 10] = (unsigned char)((t[7] >> 3));
} }
r += 352; r += 352;
} }

4
crypto_kem/kyber768/clean/reduce.c
View File

@ -24,7 +24,7 @@ uint16_t PQCLEAN_KYBER768_montgomery_reduce(uint32_t a) {
u &= ((1 << rlog) - 1); u &= ((1 << rlog) - 1);
u *= KYBER_Q; u *= KYBER_Q;
a = a + u; a = a + u;
return a >> rlog; return (uint16_t)(a >> rlog);
} }
/************************************************* /*************************************************
@ -38,7 +38,7 @@ uint16_t PQCLEAN_KYBER768_montgomery_reduce(uint32_t a) {
* Returns: unsigned integer in {0,...,11768} congruent to a modulo q. * Returns: unsigned integer in {0,...,11768} congruent to a modulo q.
**************************************************/ **************************************************/
uint16_t PQCLEAN_KYBER768_barrett_reduce(uint16_t a) { uint16_t PQCLEAN_KYBER768_barrett_reduce(uint16_t a) {
uint32_t u; uint16_t u;
u = a >> 13; //((uint32_t) a * sinv) >> 16; u = a >> 13; //((uint32_t) a * sinv) >> 16;
u *= KYBER_Q; u *= KYBER_Q;

4
crypto_kem/kyber768/clean/verify.c
View File

@ -21,8 +21,8 @@ int PQCLEAN_KYBER768_verify(const unsigned char *a, const unsigned char *b, size
r |= a[i] ^ b[i]; r |= a[i] ^ b[i];
} }
r = (-r) >> 63; r = (-(int64_t)r) >> 63;
return r; return (int)r;
} }
/************************************************* /*************************************************