Merge branch 'master' into ti

This commit is contained in:
toddouska 2014-07-10 11:48:39 -07:00
commit 8a9c1ce2fb

View File

@ -1061,9 +1061,9 @@ void bench_ntruKeyGen(void)
double start, total, each, milliEach;
int i;
byte public_key[5951]; /* 2048 key equivalent to rsa */
word16 public_key_len;
byte private_key[5951];
byte public_key[557]; /* 2048 key equivalent to rsa */
word16 public_key_len = sizeof(public_key);
byte private_key[607];
word16 private_key_len = sizeof(private_key);
DRBG_HANDLE drbg;
@ -1071,8 +1071,8 @@ void bench_ntruKeyGen(void)
'C', 'y', 'a', 'S', 'S', 'L', ' ', 't', 'e', 's', 't'
};
word32 rc = ntru_crypto_drbg_instantiate(112, pers_str, sizeof(pers_str), GetEntropy, &drbg);
word32 rc = ntru_crypto_drbg_instantiate(112, pers_str, sizeof(pers_str),
GetEntropy, &drbg);
if(rc != DRBG_OK) {
printf("NTRU drbg instantiate failed\n");
return;