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

ASCII->POLY: fix some valgrind warnings

Browse Source 
Especially uninitalized memory warnings.
This commit is contained in:
hasufell 2014-05-28 11:20:28 +02:00
parent bf192a0498
commit 593c24ff90
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/ascii_poly.c
View File

@ -100,21 +100,28 @@ get_int_to_bin_str(uint8_t value)
static char * static char *
get_bin_arr_to_ascii(char *binary_rep) get_bin_arr_to_ascii(char *binary_rep)
{ {
const size_t int_arr_size = strlen(binary_rep) / ASCII_BITS; size_t int_arr_size = 0;
uint8_t int_arr[int_arr_size]; uint8_t *int_arr = NULL;
uint32_t i = 0; uint32_t i = 0;
char *int_string; char *int_string = NULL;
while (*binary_rep) { if (!binary_rep || !*binary_rep)
return NULL;
printf("YO %sEND\n", binary_rep);
int_arr_size = strlen(binary_rep) / ASCII_BITS;
int_arr = ntru_malloc(sizeof(*int_arr) * int_arr_size);
for (i = 0; i < strlen(binary_rep); i++) {
int_arr[i] = 0; int_arr[i] = 0;
for (uint32_t j = 0; j < ASCII_BITS; j++) { for (uint32_t j = 0; j < ASCII_BITS && *binary_rep; j++) {
if (*binary_rep == '1') if (*binary_rep == '1')
int_arr[i] = int_arr[i] * 2 + 1; int_arr[i] = int_arr[i] * 2 + 1;
else if (*binary_rep == '0') else if (*binary_rep == '0')
int_arr[i] *= 2; int_arr[i] *= 2;
binary_rep++; binary_rep++;
} }
i++;
} }
int_string = ntru_calloc(1, CHAR_SIZE * (i + 1)); int_string = ntru_calloc(1, CHAR_SIZE * (i + 1));
@ -122,6 +129,8 @@ get_bin_arr_to_ascii(char *binary_rep)
for (uint32_t j = 0; j < i; j++) for (uint32_t j = 0; j < i; j++)
int_string[j] = (char) int_arr[j]; int_string[j] = (char) int_arr[j];
free(int_arr);
return int_string; return int_string;
} }
@ -131,21 +140,19 @@ fmpz_poly_t *
ascii_bin_to_bin_poly(char *to_poly, ntru_context *ctx) ascii_bin_to_bin_poly(char *to_poly, ntru_context *ctx)
{ {
uint32_t i = 0; uint32_t i = 0;
uint32_t j = 0;
fmpz_poly_t *new_poly = ntru_malloc(sizeof(*new_poly)); fmpz_poly_t *new_poly = ntru_malloc(sizeof(*new_poly));
fmpz_poly_init(*new_poly); fmpz_poly_init(*new_poly);
while (to_poly[i] && j < ctx->N) { while (to_poly[i] && i < ctx->N) {
fmpz_poly_set_coeff_si(*new_poly, fmpz_poly_set_coeff_si(*new_poly,
j, i,
(to_poly[i] == '0') ? -1 : 1); (to_poly[i] == '0') ? -1 : 1);
i++; i++;
j++;
} }
/* fill the last poly with 2 */ /* fill the last poly with 2 */
for (uint32_t i = j; i < ctx->N; i++) { for (uint32_t j = i; j < ctx->N; j++) {
fmpz_poly_set_coeff_si(*new_poly, fmpz_poly_set_coeff_si(*new_poly,
i, i,
2); 2);
@ -218,6 +225,8 @@ bin_poly_to_ascii(fmpz_poly_t poly,
binary_rep[i] = '1'; binary_rep[i] = '1';
else if (fmpz_cmp_si(coeff, 2)) else if (fmpz_cmp_si(coeff, 2))
binary_rep[i] = '0'; binary_rep[i] = '0';
} else {
binary_rep[i] = '0';
} }
i++; i++;
} }
@ -246,9 +255,9 @@ bin_poly_arr_to_ascii(fmpz_poly_t **bin_poly_arr, ntru_context *ctx)
*/ */
binary_rep = ntru_calloc(1, CHAR_SIZE * (ctx->N + 1)); binary_rep = ntru_calloc(1, CHAR_SIZE * (ctx->N + 1));
while ((ascii_poly = *bin_poly_arr++)) { while ((ascii_poly = *bin_poly_arr++)) {
string *single_poly_string; string *single_poly_string = NULL;
new_length = CHAR_SIZE * (ctx->N + 1); new_length = CHAR_SIZE * (ctx->N);
REALLOC(binary_rep, REALLOC(binary_rep,
old_length + old_length +
@ -258,14 +267,15 @@ bin_poly_arr_to_ascii(fmpz_poly_t **bin_poly_arr, ntru_context *ctx)
old_length += new_length; old_length += new_length;
single_poly_string = bin_poly_to_ascii(*ascii_poly, ctx); single_poly_string = bin_poly_to_ascii(*ascii_poly, ctx);
memcpy(binary_rep + string_len, memcpy(binary_rep + string_len,
single_poly_string->ptr, single_poly_string->ptr,
single_poly_string->len); single_poly_string->len);
string_len += single_poly_string->len; string_len += single_poly_string->len;
string_delete(single_poly_string); string_delete(single_poly_string);
} }
binary_rep[string_len] = '\0'; binary_rep[string_len] = '\0';
ascii_string = get_bin_arr_to_ascii(binary_rep); ascii_string = get_bin_arr_to_ascii(binary_rep);