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

simplify clean/repetition.c and satisfy test_boolean

Browse Source
This commit is contained in:
John M. Schanck 2020-09-14 12:53:28 -04:00
parent 470c2662f9
commit 721610cca7
3 changed files with 36 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
crypto_kem/hqc-128/clean/repetition.c
View File

@ -20,26 +20,18 @@ static inline int32_t popcount(uint64_t n);
* @param[in] m Pointer to an array that is the message * @param[in] m Pointer to an array that is the message
*/ */
void PQCLEAN_HQC128_CLEAN_repetition_code_encode(uint64_t *em, const uint64_t *m) { void PQCLEAN_HQC128_CLEAN_repetition_code_encode(uint64_t *em, const uint64_t *m) {
uint16_t i, j, bit, idx_r; uint64_t bit, idx_r;
uint32_t pos_r; size_t pos_r;
uint64_t *p64 = em;
const uint64_t mask[2][2] = {{0x0UL, 0x0UL}, {0x7FFFFFFFUL, 0x3FFFFFFFUL}};
for (i = 0; i < (uint16_t) (VEC_N1_SIZE_64 - 1); i++) {
for (j = 0; j < 64; j++) {
bit = (m[i] >> j) & 0x1;
pos_r = PARAM_N2 * ((i << 6) + j);
idx_r = (pos_r & 0x3f);
p64[pos_r >> 6] ^= mask[bit][0] << idx_r;
p64[(pos_r >> 6) + 1] ^= mask[bit][1] >> ((63 - idx_r));
}
}
for (j = 0; j < (PARAM_N1 & 0x3f); j++) { pos_r = 0;
bit = (m[VEC_N1_SIZE_64 - 1] >> j) & 0x1; for (size_t i = 0; i < VEC_N1_SIZE_64; i++) {
pos_r = PARAM_N2 * (((VEC_N1_SIZE_64 - 1) << 6) + j); for (size_t j = 0; j < 64 && pos_r < PARAM_N1N2; j++) {
bit = -((m[i] >> j) & 1);
idx_r = (pos_r & 0x3f); idx_r = (pos_r & 0x3f);
p64[pos_r >> 6] ^= mask[bit][0] << idx_r; em[(pos_r >> 6) + 0] ^= (bit & 0x7FFFFFFFUL) << idx_r;
p64[(pos_r >> 6) + 1] ^= mask[bit][1] >> ((63 - idx_r)); em[(pos_r >> 6) + 1] ^= (bit & 0x3FFFFFFFUL) >> ((63 - idx_r));
pos_r += PARAM_N2;
}
} }
} }

28
crypto_kem/hqc-192/clean/repetition.c
View File

@ -20,26 +20,18 @@ static inline int32_t popcount(uint64_t n);
* @param[in] m Pointer to an array that is the message * @param[in] m Pointer to an array that is the message
*/ */
void PQCLEAN_HQC192_CLEAN_repetition_code_encode(uint64_t *em, const uint64_t *m) { void PQCLEAN_HQC192_CLEAN_repetition_code_encode(uint64_t *em, const uint64_t *m) {
uint16_t i, j, bit, idx_r; uint64_t bit, idx_r;
uint32_t pos_r; size_t pos_r;
uint64_t *p64 = em;
const uint64_t mask[2][2] = {{0x0UL, 0x0UL}, {0x7FFFFFFFFFFFFFFUL, 0x3FFFFFFFFFFFFFFUL}};
for (i = 0; i < (uint16_t) (VEC_N1_SIZE_64 - 1); i++) {
for (j = 0; j < 64; j++) {
bit = (m[i] >> j) & 0x1;
pos_r = PARAM_N2 * ((i << 6) + j);
idx_r = (pos_r & 0x3f);
p64[pos_r >> 6] ^= mask[bit][0] << idx_r;
p64[(pos_r >> 6) + 1] ^= mask[bit][1] >> ((63 - idx_r));
}
}
for (j = 0; j < (PARAM_N1 & 0x3f); j++) { pos_r = 0;
bit = (m[VEC_N1_SIZE_64 - 1] >> j) & 0x1; for (size_t i = 0; i < VEC_N1_SIZE_64; i++) {
pos_r = PARAM_N2 * (((VEC_N1_SIZE_64 - 1) << 6) + j); for (size_t j = 0; j < 64 && pos_r < PARAM_N1N2; j++) {
bit = -((m[i] >> j) & 1);
idx_r = (pos_r & 0x3f); idx_r = (pos_r & 0x3f);
p64[pos_r >> 6] ^= mask[bit][0] << idx_r; em[(pos_r >> 6) + 0] ^= (bit & 0x7FFFFFFFFFFFFFFUL) << idx_r;
p64[(pos_r >> 6) + 1] ^= mask[bit][1] >> ((63 - idx_r)); em[(pos_r >> 6) + 1] ^= (bit & 0x3FFFFFFFFFFFFFFUL) >> ((63 - idx_r));
pos_r += PARAM_N2;
}
} }
} }

42
crypto_kem/hqc-256/clean/repetition.c
View File

@ -18,35 +18,21 @@ static inline int32_t popcount(uint64_t n);
* @param[in] m Pointer to an array that is the message * @param[in] m Pointer to an array that is the message
*/ */
void PQCLEAN_HQC256_CLEAN_repetition_code_encode(uint64_t *em, const uint64_t *m) { void PQCLEAN_HQC256_CLEAN_repetition_code_encode(uint64_t *em, const uint64_t *m) {
static const uint64_t mask[2][3] = {{0x0UL, 0x0UL, 0x0UL}, {0xFFFFFFFFFFFFFFFFUL, 0xFFFFFFFFFFFFFFFFUL, 0x3FFFFFUL}}; uint64_t bit, idx_r, idx2;
for (size_t i = 0; i < VEC_N1_SIZE_64 - 1; i++) { size_t pos_r;
for (size_t j = 0; j < 64; j++) {
uint8_t bit = (m[i] >> j) & 0x1;
uint32_t pos_r = PARAM_N2 * ((i << 6) + j);
uint16_t idx_r = (pos_r & 0x3f);
uint64_t *p64 = em;
p64 += pos_r >> 6;
*p64 ^= mask[bit][0] << idx_r;
int64_t aux = (41 - idx_r);
uint64_t aux2 = (aux > 0);
uint64_t idx2 = aux * aux2;
*(p64 + 1) ^= mask[bit][1] >> idx2;
*(p64 + 2) ^= mask[bit][2] >> ((63 - idx_r));
}
}
for (size_t j = 0; j < (PARAM_N1 & 0x3f); j++) { pos_r = 0;
uint8_t bit = (m[VEC_N1_SIZE_64 - 1] >> j) & 0x1; for (size_t i = 0; i < VEC_N1_SIZE_64; i++) {
uint32_t pos_r = PARAM_N2 * (((VEC_N1_SIZE_64 - 1) << 6) + j); for (size_t j = 0; j < 64 && pos_r < PARAM_N1N2; j++) {
uint16_t idx_r = (pos_r & 0x3f); bit = -((m[i] >> j) & 1);
uint64_t *p64 = em; idx_r = (pos_r & 0x3f);
p64 += pos_r >> 6; idx2 = 41 - idx_r;
*p64 ^= mask[bit][0] << idx_r; idx2 &= (uint64_t) (-((int64_t)idx2) >> 63);
int64_t aux = (41 - idx_r); em[(pos_r >> 6) + 0] ^= (bit & 0xFFFFFFFFFFFFFFFFUL) << idx_r;
uint64_t aux2 = (aux > 0); em[(pos_r >> 6) + 1] ^= (bit & 0xFFFFFFFFFFFFFFFFUL) >> idx2;
uint64_t idx2 = aux * aux2; em[(pos_r >> 6) + 2] ^= (bit & 0x3FFFFFUL) >> ((63 - idx_r));
*(p64 + 1) ^= mask[bit][1] >> idx2; pos_r += PARAM_N2;
*(p64 + 2) ^= mask[bit][2] >> ((63 - idx_r)); }
} }
} }