Skip to content

Commit fc340bf

Browse files
tomato42tomato42
authored
Merge pull request #288 from tlsfuzzer/update-black
use new version of black
2 parents 3b49fbe + 259ea77 commit fc340bf

21 files changed

+111
-88
lines changed

‎speed.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ def do(setup_statements, statement):
88
t = timeit.Timer(stmt=statement, setup="\n".join(setup_statements))
99
# determine number so that 0.2 <= total time < 2.0
1010
for i in range(1, 10):
11-
number = 10 ** i
11+
number = 10**i
1212
x = t.timeit(number)
1313
if x >= 0.2:
1414
break

‎src/ecdsa/_compat.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ def int_to_bytes(val, length=None, byteorder="big"):
9090
)
9191
raise ValueError("Only 'big' or 'little' endian supported")
9292

93-
9493
else:
9594
if sys.version_info < (3, 4): # pragma: no branch
9695
# on python 3.3 hmac.hmac.update() accepts only bytes, on newer

‎src/ecdsa/_sha3.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
def shake_256(msg, outlen):
1111
return hashlib.new("shake256", msg).digest(outlen)
1212

13-
1413
except (TypeError, ValueError):
1514

1615
from ._compat import bytes_to_int, int_to_bytes
@@ -21,7 +20,7 @@ def _from_le(s):
2120

2221
# Rotate a word x by b places to the left.
2322
def _rol(x, b):
24-
return ((x << b) | (x >> (64 - b))) & (2 ** 64 - 1)
23+
return ((x << b) | (x >> (64 - b))) & (2**64 - 1)
2524

2625
# Do the SHA-3 state transform on state s.
2726
def _sha3_transform(s):

‎src/ecdsa/curves.py‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -429,12 +429,18 @@ def from_pem(cls, string, valid_encodings=None):
429429

430430

431431
Ed25519 = Curve(
432-
"Ed25519", eddsa.curve_ed25519, eddsa.generator_ed25519, (1, 3, 101, 112),
432+
"Ed25519",
433+
eddsa.curve_ed25519,
434+
eddsa.generator_ed25519,
435+
(1, 3, 101, 112),
433436
)
434437

435438

436439
Ed448 = Curve(
437-
"Ed448", eddsa.curve_ed448, eddsa.generator_ed448, (1, 3, 101, 113),
440+
"Ed448",
441+
eddsa.curve_ed448,
442+
eddsa.generator_ed448,
443+
(1, 3, 101, 113),
438444
)
439445

440446

‎src/ecdsa/der.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ def encode_bitstring(s, unused=_sentry):
8787
if not s:
8888
raise ValueError("unused is non-zero but s is empty")
8989
last = str_idx_as_int(s, -1)
90-
if last & (2 ** unused - 1):
90+
if last & (2**unused - 1):
9191
raise ValueError("unused bits must be zeros in DER")
9292
encoded_unused = int2byte(unused)
9393
len_extra = 1
@@ -348,7 +348,7 @@ def remove_bitstring(string, expect_unused=_sentry):
348348
raise UnexpectedDER("Invalid encoding of empty bit string")
349349
last = str_idx_as_int(body, -1)
350350
# verify that all the unused bits are set to zero (DER requirement)
351-
if last & (2 ** unused - 1):
351+
if last & (2**unused - 1):
352352
raise UnexpectedDER("Non zero padding bits in bit string")
353353
if expect_unused is None:
354354
body = (body, unused)

‎src/ecdsa/ecdsa.py‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ def string_to_int(s):
278278

279279
def digest_integer(m):
280280
"""Convert an integer into a string of bytes, compute
281-
its SHA-1 hash, and convert the result to an integer."""
281+
its SHA-1 hash, and convert the result to an integer."""
282282
#
283283
# I don't expect this function to be used much. I wrote
284284
# it in order to be able to duplicate the examples
@@ -363,13 +363,16 @@ def point_is_valid(generator, x, y):
363363
# _a = -3
364364
_b = int(remove_whitespace("1C97BEFC 54BD7A8B 65ACF89F 81D4D4AD C565FA45"), 16)
365365
_Gx = int(
366-
remove_whitespace("4A96B568 8EF57328 46646989 68C38BB9 13CBFC82"), 16,
366+
remove_whitespace("4A96B568 8EF57328 46646989 68C38BB9 13CBFC82"),
367+
16,
367368
)
368369
_Gy = int(
369-
remove_whitespace("23A62855 3168947D 59DCC912 04235137 7AC5FB32"), 16,
370+
remove_whitespace("23A62855 3168947D 59DCC912 04235137 7AC5FB32"),
371+
16,
370372
)
371373
_r = int(
372-
remove_whitespace("01 00000000 00000000 0001F4C8 F927AED3 CA752257"), 16,
374+
remove_whitespace("01 00000000 00000000 0001F4C8 F927AED3 CA752257"),
375+
16,
373376
)
374377
_h = 1
375378
curve_160r1 = ellipticcurve.CurveFp(_p, -3, _b, _h)

‎src/ecdsa/eddsa.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
)
1313

1414
# edwards25519, defined in RFC7748
15-
_p = 2 ** 255 - 19
15+
_p = 2**255 - 19
1616
_a = -1
1717
_d = int(
1818
remove_whitespace(
@@ -34,7 +34,7 @@
3434
"03165251855960"
3535
)
3636
)
37-
_r = 2 ** 252 + 0x14DEF9DEA2F79CD65812631A5CF5D3ED
37+
_r = 2**252 + 0x14DEF9DEA2F79CD65812631A5CF5D3ED
3838

3939

4040
def _sha512(data):
@@ -48,7 +48,7 @@ def _sha512(data):
4848

4949

5050
# edwards448, defined in RFC7748
51-
_p = 2 ** 448 - 2 ** 224 - 1
51+
_p = 2**448 - 2**224 - 1
5252
_a = 1
5353
_d = -39081 % _p
5454
_h = 4
@@ -67,7 +67,7 @@ def _sha512(data):
6767
"832660"
6868
)
6969
)
70-
_r = 2 ** 446 - 0x8335DC163BB124B65129C96FDE933D8D723A70AADC873D6D54A7BB0D
70+
_r = 2**446 - 0x8335DC163BB124B65129C96FDE933D8D723A70AADC873D6D54A7BB0D
7171

7272

7373
def _shake256(data):

‎src/ecdsa/ellipticcurve.py‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,10 @@ def cofactor(self):
217217

218218
def __str__(self):
219219
return "CurveEdTw(p={0}, a={1}, d={2}, h={3})".format(
220-
self.__p, self.__a, self.__d, self.__h,
220+
self.__p,
221+
self.__a,
222+
self.__d,
223+
self.__h,
221224
)
222225

223226

@@ -665,7 +668,7 @@ def x(self):
665668
return x
666669
p = self.__curve.p()
667670
z = numbertheory.inverse_mod(z, p)
668-
return x * z ** 2 % p
671+
return x * z**2 % p
669672

670673
def y(self):
671674
"""
@@ -681,7 +684,7 @@ def y(self):
681684
return y
682685
p = self.__curve.p()
683686
z = numbertheory.inverse_mod(z, p)
684-
return y * z ** 3 % p
687+
return y * z**3 % p
685688

686689
def scale(self):
687690
"""
@@ -800,7 +803,7 @@ def _add_with_z_1(self, X1, Y1, X2, Y2, p):
800803
if not H and not r:
801804
return self._double_with_z_1(X1, Y1, p, self.__curve.a())
802805
V = X1 * I
803-
X3 = (r ** 2 - J - 2 * V) % p
806+
X3 = (r**2 - J - 2 * V) % p
804807
Y3 = (r * (V - X3) - 2 * Y1 * J) % p
805808
Z3 = 2 * H % p
806809
return X3, Y3, Z3

‎src/ecdsa/keys.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -781,7 +781,9 @@ def verify_digest(
781781
# it, the decoders will do that
782782
digest = normalise_bytes(digest)
783783
number = _truncate_and_convert_digest(
784-
digest, self.curve, allow_truncate,
784+
digest,
785+
self.curve,
786+
allow_truncate,
785787
)
786788

787789
try:
@@ -1624,7 +1626,9 @@ def sign_digest(
16241626
raise ValueError("Method unsupported for Edwards curves")
16251627
digest = normalise_bytes(digest)
16261628
number = _truncate_and_convert_digest(
1627-
digest, self.curve, allow_truncate,
1629+
digest,
1630+
self.curve,
1631+
allow_truncate,
16281632
)
16291633
r, s = self.sign_number(number, entropy, k)
16301634
return sigencode(r, s, self.privkey.order)

‎src/ecdsa/numbertheory.py‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,6 @@ def inverse_mod(a, m):
231231
return 0
232232
return powmod(a, -1, m)
233233

234-
235234
elif GMPY: # pragma: no branch
236235

237236
def inverse_mod(a, m):
@@ -253,7 +252,6 @@ def inverse_mod(a, m):
253252

254253
return lm % m
255254

256-
257255
elif sys.version_info >= (3, 8): # pragma: no branch
258256

259257
def inverse_mod(a, m):
@@ -262,7 +260,6 @@ def inverse_mod(a, m):
262260
return 0
263261
return pow(a, -1, m)
264262

265-
266263
else: # pragma: no branch
267264

268265
def inverse_mod(a, m):

0 commit comments

Comments
 (0)