Fixed some gcc warnings beyond -Wall

CVS-ID: phc.c 1.3
CVS-ID: tests.c 1.4
CVS-ID: userom.c 1.4
CVS-ID: yescrypt-common.c 1.2
CVS-ID: yescrypt-opt.c 1.9
CVS-ID: yescrypt-ref.c 1.6

Author: solardiz

phc.c

@@ -1,5 +1,5 @@
 /*-
- * Copyright 2014-2016 Alexander Peslyak
+ * Copyright 2014-2016,2018 Alexander Peslyak
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -88,9 +88,8 @@ static void print_all_PHS(unsigned int t_cost, unsigned int m_cost)
 	clock_t clk_tck = sysconf(_SC_CLK_TCK);
 	struct tms start_tms, end_tms;
 	clock_t start = times(&start_tms), end, start_v, end_v;
-	const int count = 0x102;
-	size_t inlen;
-	int i, j;
+	const size_t count = 0x102;
+	size_t inlen, i, j;
 
 	inlen = 0;
 	for (i = 0; i < count; i++) {
@@ -127,7 +126,7 @@ static void print_all_PHS(unsigned int t_cost, unsigned int m_cost)
 	    (unsigned long long)count, (double)(end - start) / clk_tck);
 }
 
-int main(int argc, const char * const *argv)
+int main(void)
 {
 #if 0
 	setvbuf(stdout, NULL, _IOLBF, 0);

tests.c

@@ -50,7 +50,7 @@ static void print_PBKDF2_SHA256_raw(const char *passwd, size_t passwdlen,
     const char *salt, size_t saltlen, uint64_t c, size_t dkLen)
 {
 	uint8_t dk[64];
-	int i;
+	size_t i;
 
 	assert(dkLen <= sizeof(dk));
 
@@ -83,7 +83,7 @@ static void print_scrypt(const char *passwd, const char *salt,
     uint64_t N, uint32_t r, uint32_t p)
 {
 	uint8_t dk[64];
-	int i;
+	size_t i;
 
 	printf("scrypt(\"%s\", \"%s\", %llu, %u, %u) =",
 	    passwd, salt, (unsigned long long)N, r, p);
@@ -107,9 +107,9 @@ static void print_yescrypt(const char *passwd, const char *salt,
     uint32_t dklen)
 {
 	yescrypt_local_t local;
-	yescrypt_params_t params = {flags, N, r, p, t, g};
+	yescrypt_params_t params = {flags, N, r, p, t, g, 0};
 	uint8_t dk[64];
-	int i;
+	uint32_t i;
 
 #if 1
 	/* Don't test hash upgrades */
@@ -141,7 +141,7 @@ static void print_yescrypt(const char *passwd, const char *salt,
 }
 #endif
 
-int main(int argc, const char * const *argv)
+int main(void)
 {
 	int i;
 
@@ -234,7 +234,7 @@ int main(int argc, const char * const *argv)
 					N_log2++;
 			}
 			yescrypt_params_t params =
-			    {flags, (uint64_t)1 << N_log2, r, p};
+			    {flags, (uint64_t)1 << N_log2, r, p, 0, 0, 0};
 			setting = yescrypt_encode_params(&params,
 			    (const uint8_t *)"WZaPV7LSUEKMo34.", 16 - (i & 15));
 			if (i == 0)
@@ -361,11 +361,9 @@ int main(int argc, const char * const *argv)
 
 		shared.aligned_size = ((uint64_t)1 << NROM_log2) * 128 * r;
 		shared.base_size = shared.aligned_size + 63;
-		shared.base = malloc(shared.base_size);
-		shared.aligned = (uint8_t *)shared.base + 63;
-		shared.aligned -= (uintptr_t)shared.aligned & 63;
-
-		void *where = shared.aligned;
+		uint8_t *where = shared.base = malloc(shared.base_size);
+		where += 63;
+		where = shared.aligned = where - ((uintptr_t)where & 63);
 
 		printf("Initializing ROM in preallocated memory ...");
 		fflush(stdout);
@@ -379,7 +377,7 @@ int main(int argc, const char * const *argv)
 		printf(" DONE (%02x%02x%02x%02x)\n",
 		    digest->uc[0], digest->uc[1], digest->uc[2], digest->uc[3]);
 
-		if (where != shared.aligned)
+		if ((void *)where != shared.aligned)
 			puts("YESCRYPT_SHARED_PREALLOCATED failed");
 #endif
 

userom.c

@@ -321,15 +321,15 @@ int main(int argc, const char * const *argv)
 				thread_data_s *td = &thread_data[omp_get_thread_num()].s;
 				uint64_t start1 = time_us();
 #if 1
-				const uint8_t *h = yescrypt_r(shared,
-				    &td->local,
+				const char *h = (const char *)yescrypt_r(
+				    shared, &td->local,
 				    (const uint8_t *)p, strlen(p),
 				    setting, &key, hash, sizeof(hash));
 #else
 				yescrypt_local_t local;
 				yescrypt_init_local(&local);
-				const uint8_t *h = yescrypt_r(shared,
-				    &local,
+				const char *h = (const char *)yescrypt_r(
+				    shared, &local,
 				    (const uint8_t *)p, strlen(p),
 				    setting, &key, hash, sizeof(hash));
 				yescrypt_free_local(&local);
@@ -343,10 +343,10 @@ int main(int argc, const char * const *argv)
 					td->min = diff1;
 				if (diff1 > td->max)
 					td->max = diff1;
-				if (j < nsave && strcmp(save[j], (char *)h)) {
+				if (j < nsave && strcmp(save[j], h)) {
 #pragma omp critical
 					printf("Mismatch at %u, %s != %s\n",
-					    j, save[j], (char *)h);
+					    j, save[j], h);
 				}
 			}
 

yescrypt-common.c

@@ -428,7 +428,7 @@ uint8_t *yescrypt_r(const yescrypt_shared_t *shared, yescrypt_local_t *local,
 		saltlen = sizeof(saltbin);
 		saltend = decode64(saltbin, &saltlen, saltstr, saltstrlen);
 
-		if (!saltend || saltend - saltstr != saltstrlen)
+		if (!saltend || (size_t)(saltend - saltstr) != saltstrlen)
 			goto fail;
 
 		salt = saltbin;

yescrypt-opt.c

@@ -194,12 +194,12 @@ static inline void salsa20_simd_unshuffle(const salsa20_blk_t *Bin,
  * Apply the Salsa20 core to the block provided in (X0 ... X3).
  */
 #define SALSA20_wrapper(out, rounds) { \
-	__m128i Y0 = X0, Y1 = X1, Y2 = X2, Y3 = X3; \
+	__m128i Z0 = X0, Z1 = X1, Z2 = X2, Z3 = X3; \
 	rounds \
-	(out).q[0] = X0 = _mm_add_epi32(X0, Y0); \
-	(out).q[1] = X1 = _mm_add_epi32(X1, Y1); \
-	(out).q[2] = X2 = _mm_add_epi32(X2, Y2); \
-	(out).q[3] = X3 = _mm_add_epi32(X3, Y3); \
+	(out).q[0] = X0 = _mm_add_epi32(X0, Z0); \
+	(out).q[1] = X1 = _mm_add_epi32(X1, Z1); \
+	(out).q[2] = X2 = _mm_add_epi32(X2, Z2); \
+	(out).q[3] = X3 = _mm_add_epi32(X3, Z3); \
 }
 
 /**
@@ -1395,8 +1395,10 @@ int yescrypt_kdf(const yescrypt_shared_t *shared, yescrypt_local_t *local,
 	retval = yescrypt_kdf_body(shared, local,
 	    passwd, passwdlen, salt, saltlen,
 	    flags, N, r, p, t, NROM, buf, buflen);
+#ifndef SKIP_MEMZERO
 	if (passwd == dk)
 		insecure_memzero(dk, sizeof(dk));
+#endif
 	return retval;
 }
 
@@ -1440,7 +1442,7 @@ int yescrypt_init_shared(yescrypt_shared_t *shared,
 	half1 = *shared;
 	half1.aligned_size /= 2;
 	half2 = half1;
-	half2.aligned += half1.aligned_size;
+	half2.aligned = (uint8_t *)half2.aligned + half1.aligned_size;
 
 	if (yescrypt_kdf(NULL, &half1,
 	    seed, seedlen, (uint8_t *)"yescrypt-ROMhash", 16, &subparams,

yescrypt-ref.c

@@ -825,7 +825,7 @@ int yescrypt_init_shared(yescrypt_shared_t *shared,
 
 	half1 = half2 = *shared;
 	half1.aligned_size /= 2;
-	half2.aligned += half1.aligned_size;
+	half2.aligned = (uint8_t *)half2.aligned + half1.aligned_size;
 	half2.aligned_size = half1.aligned_size;
 	N /= 2;
 
@@ -918,5 +918,6 @@ int yescrypt_init_local(yescrypt_local_t *local)
 int yescrypt_free_local(yescrypt_local_t *local)
 {
 /* The reference implementation frees its memory in yescrypt_kdf() */
+	(void)local; /* unused */
 	return 0;
 }