Enable more warnings and fix some minor issues.

open-quantum-safe · Aug 25, 2016 · dd30ef8 · dd30ef8
1 parent 1133f93
commit dd30ef8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ CURL=curl
 RANLIB=ranlib
 LN=ln -s
 
-DEFAULTS= -std=gnu11 -Wpedantic -Wall -DOQS_RAND_DEFAULT_URANDOM_CHACHA20 -DOQS_KEX_DEFAULT_BCNS15
+DEFAULTS= -std=gnu11 -Wpedantic -Wall -Wextra -DOQS_RAND_DEFAULT_URANDOM_CHACHA20 -DOQS_KEX_DEFAULT_BCNS15
 CFLAGS=$(DEFAULTS) -DCONSTANT_TIME
 LDFLAGS=-lm
 INCLUDES=-Iinclude
@@ -26,7 +26,7 @@ links:
 # CHACHA
 
 CHACHA_OBJS :=  $(addprefix objs/rand_urandom_chacha20/, \
-	            rand_urandom_chacha20.o chacha20.o)
+	            rand_urandom_chacha20.o)
 
 $(CHACHA_OBJS): src/rand_urandom_chacha20/rand_urandom_chacha20.h src/rand_urandom_chacha20/chacha20.c
 

diff --git a/src/kex/test_kex.c b/src/kex/test_kex.c
@@ -92,7 +92,7 @@ static int kex_test_correctness(OQS_RAND *rand, OQS_KEX *(*new_method)(OQS_RAND
 	}
 
 	/* record generated bytes for statistical analysis */
-	for (int i = 0; i < alice_key_len; i++) {
+	for (size_t i = 0; i < alice_key_len; i++) {
 		OQS_RAND_test_record_occurrence(alice_key[i], occurrences);
 	}
 

diff --git a/src/rand/test_rand.c b/src/rand/test_rand.c
@@ -20,7 +20,7 @@ static void rand_test_distribution_32(OQS_RAND *rand, unsigned long occurrences[
 	for (int i = 0; i < iterations; i++) {
 		x = OQS_RAND_32(rand);
 		uint8_t b;
-		for (int j = 0; j < sizeof(uint32_t); j++) {
+		for (size_t j = 0; j < sizeof(uint32_t); j++) {
 			b = (x >> j) & 0xFF;
 			OQS_RAND_test_record_occurrence(b, occurrences);
 		}
@@ -32,7 +32,7 @@ static void rand_test_distribution_64(OQS_RAND *rand, unsigned long occurrences[
 	for (int i = 0; i < iterations; i++) {
 		x = OQS_RAND_64(rand);
 		uint8_t b;
-		for (int j = 0; j < sizeof(uint64_t); j++) {
+		for (size_t j = 0; j < sizeof(uint64_t); j++) {
 			b = (x >> j) & 0xFF;
 			OQS_RAND_test_record_occurrence(b, occurrences);
 		}