NTRU Prime: more explicit casts

This commit is contained in:
John M. Schanck 2020-09-01 17:00:55 -04:00 committad av Kris Kwiatkowski
förälder 4883bb44c0
incheckning c2d2d145b7
15 ändrade filer med 38 tillägg och 38 borttagningar

Visa fil

@ -298,7 +298,7 @@ int PQCLEAN_NTRULPR653_AVX2_crypto_core_multsntrup653(unsigned char *outbytes, c
mult768(fg, f, g);
fg[0] -= fg[p - 1];
fg[0] = (int16) (fg[0] - fg[p - 1]);
for (i = 0; i < 768; i += 16) {
int16x16 fgi = load_x16(&fg[i]);
int16x16 fgip = load_x16(&fg[i + p]);

Visa fil

@ -10,10 +10,10 @@ void PQCLEAN_NTRULPR653_CLEAN_crypto_encode_653x3(unsigned char *s, const void *
int i;
for (i = 0; i < p / 4; ++i) {
x = *f++ + 1;
x += (uint8) ((*f++ + 1) << 2);
x += (uint8) ((*f++ + 1) << 4);
x += (uint8) ((*f++ + 1) << 6);
x = (uint8) (*f++ + 1);
x = (uint8) (x + ((*f++ + 1) << 2));
x = (uint8) (x + ((*f++ + 1) << 4));
x = (uint8) (x + ((*f++ + 1) << 6));
*s++ = x;
}
x = *f++ + 1;

Visa fil

@ -298,7 +298,7 @@ int PQCLEAN_NTRULPR761_AVX2_crypto_core_multsntrup761(unsigned char *outbytes, c
mult768(fg, f, g);
fg[0] -= fg[p - 1];
fg[0] = (int16) (fg[0] - fg[p - 1]);
for (i = 0; i < 768; i += 16) {
int16x16 fgi = load_x16(&fg[i]);
int16x16 fgip = load_x16(&fg[i + p]);

Visa fil

@ -5,15 +5,15 @@
#define p 761
void PQCLEAN_NTRULPR761_CLEAN_crypto_encode_761x3(unsigned char *s, const void *v) {
const uint8 *f = v;
const uint8 *f = (const uint8 *)v;
uint8 x;
int i;
for (i = 0; i < p / 4; ++i) {
x = *f++ + 1;
x += (uint8) ((*f++ + 1) << 2);
x += (uint8) ((*f++ + 1) << 4);
x += (uint8) ((*f++ + 1) << 6);
x = (uint8) (*f++ + 1);
x = (uint8) (x + ((*f++ + 1) << 2));
x = (uint8) (x + ((*f++ + 1) << 4));
x = (uint8) (x + ((*f++ + 1) << 6));
*s++ = x;
}
x = *f++ + 1;

Visa fil

@ -405,7 +405,7 @@ int PQCLEAN_NTRULPR857_AVX2_crypto_core_multsntrup857(unsigned char *outbytes, c
mult1024(fg, f, g);
fg[0] -= fg[p - 1];
fg[0] = (int16) (fg[0] - fg[p - 1]);
for (i = 0; i < 1024; i += 16) {
int16x16 fgi = load_x16(&fg[i]);
int16x16 fgip = load_x16(&fg[i + p]);

Visa fil

@ -10,10 +10,10 @@ void PQCLEAN_NTRULPR857_CLEAN_crypto_encode_857x3(unsigned char *s, const void *
int i;
for (i = 0; i < p / 4; ++i) {
x = *f++ + 1;
x += (uint8) ((*f++ + 1) << 2);
x += (uint8) ((*f++ + 1) << 4);
x += (uint8) ((*f++ + 1) << 6);
x = (uint8) (*f++ + 1);
x = (uint8) (x + ((*f++ + 1) << 2));
x = (uint8) (x + ((*f++ + 1) << 4));
x = (uint8) (x + ((*f++ + 1) << 6));
*s++ = x;
}
x = *f++ + 1;

Visa fil

@ -298,7 +298,7 @@ int PQCLEAN_SNTRUP653_AVX2_crypto_core_multsntrup653(unsigned char *outbytes, co
mult768(fg, f, g);
fg[0] -= fg[p - 1];
fg[0] = (int16) (fg[0] - fg[p - 1]);
for (i = 0; i < 768; i += 16) {
int16x16 fgi = load_x16(&fg[i]);
int16x16 fgip = load_x16(&fg[i + p]);

Visa fil

@ -74,7 +74,7 @@ int PQCLEAN_SNTRUP653_CLEAN_crypto_core_inv3sntrup653(unsigned char *outbytes, c
v[0] = 0;
sign = -g[0] * f[0];
swap = int16_negative_mask(-(int16) delta) & int16_nonzero_mask(g[0]);
swap = int16_negative_mask((int16) - delta) & int16_nonzero_mask(g[0]);
delta ^= swap & (delta ^ -delta);
delta += 1;
@ -102,7 +102,7 @@ int PQCLEAN_SNTRUP653_CLEAN_crypto_core_inv3sntrup653(unsigned char *outbytes, c
sign = f[0];
for (i = 0; i < p; ++i) {
out[i] = (small) sign * v[p - 1 - i];
out[i] = (small) (sign * v[p - 1 - i]);
}
out[p] = (small) int16_nonzero_mask((int16) delta);

Visa fil

@ -10,10 +10,10 @@ void PQCLEAN_SNTRUP653_CLEAN_crypto_encode_653x3(unsigned char *s, const void *v
int i;
for (i = 0; i < p / 4; ++i) {
x = *f++ + 1;
x += (uint8) ((*f++ + 1) << 2);
x += (uint8) ((*f++ + 1) << 4);
x += (uint8) ((*f++ + 1) << 6);
x = (uint8) (*f++ + 1);
x = (uint8) (x + ((*f++ + 1) << 2));
x = (uint8) (x + ((*f++ + 1) << 4));
x = (uint8) (x + ((*f++ + 1) << 6));
*s++ = x;
}
x = *f++ + 1;

Visa fil

@ -298,7 +298,7 @@ int PQCLEAN_SNTRUP761_AVX2_crypto_core_multsntrup761(unsigned char *outbytes, co
mult768(fg, f, g);
fg[0] -= fg[p - 1];
fg[0] = (int16) (fg[0] - fg[p - 1]);
for (i = 0; i < 768; i += 16) {
int16x16 fgi = load_x16(&fg[i]);
int16x16 fgip = load_x16(&fg[i + p]);

Visa fil

@ -74,7 +74,7 @@ int PQCLEAN_SNTRUP761_CLEAN_crypto_core_inv3sntrup761(unsigned char *outbytes, c
v[0] = 0;
sign = -g[0] * f[0];
swap = int16_negative_mask(-(int16) delta) & int16_nonzero_mask(g[0]);
swap = int16_negative_mask((int16) - delta) & int16_nonzero_mask(g[0]);
delta ^= swap & (delta ^ -delta);
delta += 1;
@ -102,7 +102,7 @@ int PQCLEAN_SNTRUP761_CLEAN_crypto_core_inv3sntrup761(unsigned char *outbytes, c
sign = f[0];
for (i = 0; i < p; ++i) {
out[i] = (small) sign * v[p - 1 - i];
out[i] = (small) (sign * v[p - 1 - i]);
}
out[p] = (small) int16_nonzero_mask((int16) delta);

Visa fil

@ -5,15 +5,15 @@
#define p 761
void PQCLEAN_SNTRUP761_CLEAN_crypto_encode_761x3(unsigned char *s, const void *v) {
const uint8 *f = v;
const uint8 *f = (const uint8 *)v;
uint8 x;
int i;
for (i = 0; i < p / 4; ++i) {
x = *f++ + 1;
x += (uint8) ((*f++ + 1) << 2);
x += (uint8) ((*f++ + 1) << 4);
x += (uint8) ((*f++ + 1) << 6);
x = (uint8) (*f++ + 1);
x = (uint8) (x + ((*f++ + 1) << 2));
x = (uint8) (x + ((*f++ + 1) << 4));
x = (uint8) (x + ((*f++ + 1) << 6));
*s++ = x;
}
x = *f++ + 1;

Visa fil

@ -405,7 +405,7 @@ int PQCLEAN_SNTRUP857_AVX2_crypto_core_multsntrup857(unsigned char *outbytes, co
mult1024(fg, f, g);
fg[0] -= fg[p - 1];
fg[0] = (int16) (fg[0] - fg[p - 1]);
for (i = 0; i < 1024; i += 16) {
int16x16 fgi = load_x16(&fg[i]);
int16x16 fgip = load_x16(&fg[i + p]);

Visa fil

@ -74,7 +74,7 @@ int PQCLEAN_SNTRUP857_CLEAN_crypto_core_inv3sntrup857(unsigned char *outbytes, c
v[0] = 0;
sign = -g[0] * f[0];
swap = int16_negative_mask(-(int16) delta) & int16_nonzero_mask(g[0]);
swap = int16_negative_mask((int16) - delta) & int16_nonzero_mask(g[0]);
delta ^= swap & (delta ^ -delta);
delta += 1;
@ -102,7 +102,7 @@ int PQCLEAN_SNTRUP857_CLEAN_crypto_core_inv3sntrup857(unsigned char *outbytes, c
sign = f[0];
for (i = 0; i < p; ++i) {
out[i] = (small) sign * v[p - 1 - i];
out[i] = (small) (sign * v[p - 1 - i]);
}
out[p] = (small) int16_nonzero_mask((int16) delta);

Visa fil

@ -10,10 +10,10 @@ void PQCLEAN_SNTRUP857_CLEAN_crypto_encode_857x3(unsigned char *s, const void *v
int i;
for (i = 0; i < p / 4; ++i) {
x = *f++ + 1;
x += (uint8) ((*f++ + 1) << 2);
x += (uint8) ((*f++ + 1) << 4);
x += (uint8) ((*f++ + 1) << 6);
x = (uint8) (*f++ + 1);
x = (uint8) (x + ((*f++ + 1) << 2));
x = (uint8) (x + ((*f++ + 1) << 4));
x = (uint8) (x + ((*f++ + 1) << 6));
*s++ = x;
}
x = *f++ + 1;