refactor: Make 64-bit shift explicit

hebasto · hebasto · commit d1e48e5474a2 · 2023-05-02T13:35:15.000+01:00
This change fixes MSVC level-3 warning C4334. See: https://learn.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-3-c4334 Required to enable level 3 warnings (/W3).
diff --git a/src/ecmult_impl.h b/src/ecmult_impl.h
@@ -683,7 +683,7 @@ static int secp256k1_ecmult_pippenger_batch(const secp256k1_callback* error_call
     }
     state_space->ps = (struct secp256k1_pippenger_point_state *) secp256k1_scratch_alloc(error_callback, scratch, entries * sizeof(*state_space->ps));
     state_space->wnaf_na = (int *) secp256k1_scratch_alloc(error_callback, scratch, entries*(WNAF_SIZE(bucket_window+1)) * sizeof(int));
-    buckets = (secp256k1_gej *) secp256k1_scratch_alloc(error_callback, scratch, (1<<bucket_window) * sizeof(*buckets));
+    buckets = (secp256k1_gej *) secp256k1_scratch_alloc(error_callback, scratch, ((size_t)1 << bucket_window) * sizeof(*buckets));
     if (state_space->ps == NULL || state_space->wnaf_na == NULL || buckets == NULL) {
         secp256k1_scratch_apply_checkpoint(error_callback, scratch, scratch_checkpoint);
         return 0;
diff --git a/src/tests.c b/src/tests.c
@@ -2221,7 +2221,7 @@ static void scalar_test(void) {
         for (i = 0; i < 100; ++i) {
             int low;
             int shift = 1 + secp256k1_testrand_int(15);
-            int expected = r.d[0] % (1 << shift);
+            int expected = r.d[0] % (1ULL << shift);
             low = secp256k1_scalar_shr_int(&r, shift);
             CHECK(expected == low);
         }

Original file line number	Diff line number	Diff line change
`@@ -683,7 +683,7 @@ static int secp256k1_ecmult_pippenger_batch(const secp256k1_callback* error_call`
`683`	`683`	`}`
`684`	`684`	`state_space->ps = (struct secp256k1_pippenger_point_state ) secp256k1_scratch_alloc(error_callback, scratch, entries sizeof(*state_space->ps));`
`685`	`685`	`state_space->wnaf_na = (int ) secp256k1_scratch_alloc(error_callback, scratch, entries(WNAF_SIZE(bucket_window+1)) * sizeof(int));`
`686`		`- buckets = (secp256k1_gej ) secp256k1_scratch_alloc(error_callback, scratch, (1<<bucket_window) sizeof(*buckets));`
	`686`	`+ buckets = (secp256k1_gej ) secp256k1_scratch_alloc(error_callback, scratch, ((size_t)1 << bucket_window) sizeof(*buckets));`
`687`	`687`	`if (state_space->ps == NULL \|\| state_space->wnaf_na == NULL \|\| buckets == NULL) {`
`688`	`688`	`secp256k1_scratch_apply_checkpoint(error_callback, scratch, scratch_checkpoint);`
`689`	`689`	`return 0;`
Original file line number	Diff line number	Diff line change
`@@ -2221,7 +2221,7 @@ static void scalar_test(void) {`
`2221`	`2221`	`for (i = 0; i < 100; ++i) {`
`2222`	`2222`	`int low;`
`2223`	`2223`	`int shift = 1 + secp256k1_testrand_int(15);`
`2224`		`- int expected = r.d[0] % (1 << shift);`
	`2224`	`+ int expected = r.d[0] % (1ULL << shift);`
`2225`	`2225`	`low = secp256k1_scalar_shr_int(&r, shift);`
`2226`	`2226`	`CHECK(expected == low);`
`2227`	`2227`	`}`