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

NTRU Prime: more explicit casts

Browse Source
This commit is contained in:
John M. Schanck 2020-09-01 17:00:55 -04:00 committed by Kris Kwiatkowski
parent 4883bb44c0
commit c2d2d145b7
15 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto_kem/ntrulpr653/avx2/crypto_core_multsntrup653.c
View File

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

8
crypto_kem/ntrulpr653/clean/crypto_encode_653x3.c
View File

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

2
crypto_kem/ntrulpr761/avx2/crypto_core_multsntrup761.c
View File

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

10
crypto_kem/ntrulpr761/clean/crypto_encode_761x3.c
View File

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

2
crypto_kem/ntrulpr857/avx2/crypto_core_multsntrup857.c
View File

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

8
crypto_kem/ntrulpr857/clean/crypto_encode_857x3.c
View File

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

2
crypto_kem/sntrup653/avx2/crypto_core_multsntrup653.c
View File

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

4
crypto_kem/sntrup653/clean/crypto_core_inv3sntrup653.c
View File

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

8
crypto_kem/sntrup653/clean/crypto_encode_653x3.c
View File

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

2
crypto_kem/sntrup761/avx2/crypto_core_multsntrup761.c
View File

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

4
crypto_kem/sntrup761/clean/crypto_core_inv3sntrup761.c
View File

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

10
crypto_kem/sntrup761/clean/crypto_encode_761x3.c
View File

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

2
crypto_kem/sntrup857/avx2/crypto_core_multsntrup857.c
View File

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

4
crypto_kem/sntrup857/clean/crypto_core_inv3sntrup857.c
View File

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

8
crypto_kem/sntrup857/clean/crypto_encode_857x3.c
View File

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