Skip to content

Commit 21f49d9

Browse files
committed
Remove unused secp256k1_scalar_shr_int
1 parent 115fdc7 commit 21f49d9

5 files changed

+3
-71
lines changed

src/scalar.h

-4
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,6 @@ static void secp256k1_scalar_cadd_bit(secp256k1_scalar *r, unsigned int bit, int
5454
/** Multiply two scalars (modulo the group order). */
5555
static void secp256k1_scalar_mul(secp256k1_scalar *r, const secp256k1_scalar *a, const secp256k1_scalar *b);
5656

57-
/** Shift a scalar right by some amount strictly between 0 and 16, returning
58-
* the low bits that were shifted off */
59-
static int secp256k1_scalar_shr_int(secp256k1_scalar *r, int n);
60-
6157
/** Compute the inverse of a scalar (modulo the group order). */
6258
static void secp256k1_scalar_inverse(secp256k1_scalar *r, const secp256k1_scalar *a);
6359

src/scalar_4x64_impl.h

-16
Original file line numberDiff line numberDiff line change
@@ -850,22 +850,6 @@ static void secp256k1_scalar_mul(secp256k1_scalar *r, const secp256k1_scalar *a,
850850
secp256k1_scalar_verify(r);
851851
}
852852

853-
static int secp256k1_scalar_shr_int(secp256k1_scalar *r, int n) {
854-
int ret;
855-
secp256k1_scalar_verify(r);
856-
VERIFY_CHECK(n > 0);
857-
VERIFY_CHECK(n < 16);
858-
859-
ret = r->d[0] & ((1 << n) - 1);
860-
r->d[0] = (r->d[0] >> n) + (r->d[1] << (64 - n));
861-
r->d[1] = (r->d[1] >> n) + (r->d[2] << (64 - n));
862-
r->d[2] = (r->d[2] >> n) + (r->d[3] << (64 - n));
863-
r->d[3] = (r->d[3] >> n);
864-
865-
secp256k1_scalar_verify(r);
866-
return ret;
867-
}
868-
869853
static void secp256k1_scalar_split_128(secp256k1_scalar *r1, secp256k1_scalar *r2, const secp256k1_scalar *k) {
870854
secp256k1_scalar_verify(k);
871855

src/scalar_8x32_impl.h

-20
Original file line numberDiff line numberDiff line change
@@ -662,26 +662,6 @@ static void secp256k1_scalar_mul(secp256k1_scalar *r, const secp256k1_scalar *a,
662662
secp256k1_scalar_verify(r);
663663
}
664664

665-
static int secp256k1_scalar_shr_int(secp256k1_scalar *r, int n) {
666-
int ret;
667-
secp256k1_scalar_verify(r);
668-
VERIFY_CHECK(n > 0);
669-
VERIFY_CHECK(n < 16);
670-
671-
ret = r->d[0] & ((1 << n) - 1);
672-
r->d[0] = (r->d[0] >> n) + (r->d[1] << (32 - n));
673-
r->d[1] = (r->d[1] >> n) + (r->d[2] << (32 - n));
674-
r->d[2] = (r->d[2] >> n) + (r->d[3] << (32 - n));
675-
r->d[3] = (r->d[3] >> n) + (r->d[4] << (32 - n));
676-
r->d[4] = (r->d[4] >> n) + (r->d[5] << (32 - n));
677-
r->d[5] = (r->d[5] >> n) + (r->d[6] << (32 - n));
678-
r->d[6] = (r->d[6] >> n) + (r->d[7] << (32 - n));
679-
r->d[7] = (r->d[7] >> n);
680-
681-
secp256k1_scalar_verify(r);
682-
return ret;
683-
}
684-
685665
static void secp256k1_scalar_split_128(secp256k1_scalar *r1, secp256k1_scalar *r2, const secp256k1_scalar *k) {
686666
secp256k1_scalar_verify(k);
687667

src/scalar_low_impl.h

-13
Original file line numberDiff line numberDiff line change
@@ -139,19 +139,6 @@ static void secp256k1_scalar_mul(secp256k1_scalar *r, const secp256k1_scalar *a,
139139
secp256k1_scalar_verify(r);
140140
}
141141

142-
static int secp256k1_scalar_shr_int(secp256k1_scalar *r, int n) {
143-
int ret;
144-
secp256k1_scalar_verify(r);
145-
VERIFY_CHECK(n > 0);
146-
VERIFY_CHECK(n < 16);
147-
148-
ret = *r & ((1 << n) - 1);
149-
*r >>= n;
150-
151-
secp256k1_scalar_verify(r);
152-
return ret;
153-
}
154-
155142
static void secp256k1_scalar_split_128(secp256k1_scalar *r1, secp256k1_scalar *r2, const secp256k1_scalar *a) {
156143
secp256k1_scalar_verify(a);
157144

src/tests.c

+3-18
Original file line numberDiff line numberDiff line change
@@ -2180,20 +2180,6 @@ static void scalar_test(void) {
21802180
CHECK(secp256k1_scalar_eq(&n, &s));
21812181
}
21822182

2183-
{
2184-
/* test secp256k1_scalar_shr_int */
2185-
secp256k1_scalar r;
2186-
int i;
2187-
random_scalar_order_test(&r);
2188-
for (i = 0; i < 100; ++i) {
2189-
int low;
2190-
int shift = 1 + secp256k1_testrand_int(15);
2191-
int expected = r.d[0] % (1ULL << shift);
2192-
low = secp256k1_scalar_shr_int(&r, shift);
2193-
CHECK(expected == low);
2194-
}
2195-
}
2196-
21972183
{
21982184
/* Test commutativity of add. */
21992185
secp256k1_scalar r1, r2;
@@ -5280,13 +5266,12 @@ static void test_fixed_wnaf(const secp256k1_scalar *number, int w) {
52805266
int wnaf[256] = {0};
52815267
int i;
52825268
int skew;
5283-
secp256k1_scalar num = *number;
5269+
secp256k1_scalar num, unused;
52845270

52855271
secp256k1_scalar_set_int(&x, 0);
52865272
secp256k1_scalar_set_int(&shift, 1 << w);
5287-
for (i = 0; i < 16; ++i) {
5288-
secp256k1_scalar_shr_int(&num, 8);
5289-
}
5273+
/* Make num a 128-bit scalar. */
5274+
secp256k1_scalar_split_128(&num, &unused, number);
52905275
skew = secp256k1_wnaf_fixed(wnaf, &num, w);
52915276

52925277
for (i = WNAF_SIZE(w)-1; i >= 0; --i) {

0 commit comments

Comments
 (0)