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

Merge branch 'aes' into frodo-aes

Browse Source
This commit is contained in:
Douglas Stebila 2019-04-10 12:31:12 -04:00
commit 0ee03d4c3f
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/Makefile
View File

@ -61,5 +61,6 @@ $(DEST_DIR)/printparams_$(SCHEME)_$(IMPLEMENTATION): build-scheme crypto_$(TYPE)
clean: clean:
$(RM) $(DEST_DIR)/functest_$(SCHEME)_$(IMPLEMENTATION) $(RM) $(DEST_DIR)/functest_$(SCHEME)_$(IMPLEMENTATION)
$(RM) $(DEST_DIR)/testvectors_$(SCHEME)_$(IMPLEMENTATION) $(RM) $(DEST_DIR)/testvectors_$(SCHEME)_$(IMPLEMENTATION)
$(RM) $(DEST_DIR)/test_aes
$(RM) $(DEST_DIR)/test_fips202 $(RM) $(DEST_DIR)/test_fips202
$(RM) $(DEST_DIR)/test_sha2 $(RM) $(DEST_DIR)/test_sha2

10
test/common/fips202.c
View File

@ -54,8 +54,8 @@ const unsigned char expected[512] = {
static int test_sha3_256_incremental(void) { static int test_sha3_256_incremental(void) {
unsigned char input[512]; unsigned char input[512];
unsigned char check[512]; unsigned char check[32];
unsigned char output[512]; unsigned char output[32];
uint64_t s_inc[26]; uint64_t s_inc[26];
int i; int i;
int absorbed; int absorbed;
@ -78,15 +78,15 @@ static int test_sha3_256_incremental(void) {
sha3_256_inc_finalize(output, s_inc); sha3_256_inc_finalize(output, s_inc);
if (memcmp(check, output, 512)) { if (memcmp(check, output, 32)) {
printf("ERROR sha3_256 incremental did not match sha3_256.\n"); printf("ERROR sha3_256 incremental did not match sha3_256.\n");
printf(" Expected: "); printf(" Expected: ");
for (i = 0; i < 512; i++) { for (i = 0; i < 32; i++) {
printf("%02X", check[i]); printf("%02X", check[i]);
} }
printf("\n"); printf("\n");
printf(" Received: "); printf(" Received: ");
for (i = 0; i < 512; i++) { for (i = 0; i < 32; i++) {
printf("%02X", output[i]); printf("%02X", output[i]);
} }
printf("\n"); printf("\n");