Skip to content

Commit bfd5f66

Browse files
authored
Merge pull request #12 from Zcholm/master
use math package instead of fractions for gcd
2 parents cdaec5a + 79c5342 commit bfd5f66

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

pkcs1/keys.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import fractions
1+
import math
22
from . import primitives
33
from . import exceptions
44

@@ -146,7 +146,7 @@ def generate_key_pair(size=512, number=2, rnd=default_crypto_random, k=DEFAULT_I
146146
prime = get_prime(bits, rnd, k, algorithm=primality_algorithm)
147147
if prime in primes:
148148
continue
149-
if e is not None and fractions.gcd(e, lbda) != 1:
149+
if e is not None and math.gcd(e, lbda) != 1:
150150
continue
151151
if strict_size and number - len(primes) == 1 and primitives.integer_bit_size(n*prime) != size:
152152
continue
@@ -156,10 +156,10 @@ def generate_key_pair(size=512, number=2, rnd=default_crypto_random, k=DEFAULT_I
156156
if e is None:
157157
e = 0x10001
158158
while e < lbda:
159-
if fractions.gcd(e, lbda) == 1:
159+
if math.gcd(e, lbda) == 1:
160160
break
161161
e += 2
162162
assert 3 <= e <= n-1
163163
public = RsaPublicKey(n, e)
164164
private = MultiPrimeRsaPrivateKey(primes, e, blind=True, rnd=rnd)
165-
return public, private
165+
return public, private

pkcs1/primes.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import fractions
1+
import math
22
from . import primitives
33

44
from .defaults import default_pseudo_random, default_crypto_random
@@ -138,7 +138,7 @@ def miller_rabin(n, k, rnd=default_pseudo_random):
138138
# Find nearest power of 2
139139
s = primitives.integer_bit_size(n)
140140
# Find greatest factor which is a power of 2
141-
s = fractions.gcd(2**s, n-1)
141+
s = math.gcd(2**s, n-1)
142142
d = (n-1) // s
143143
s = primitives.integer_bit_size(s) - 1
144144
while k:
@@ -161,4 +161,4 @@ def miller_rabin(n, k, rnd=default_pseudo_random):
161161
xrange
162162
except NameError:
163163
# Python 3
164-
xrange = range
164+
xrange = range

0 commit comments

Comments
 (0)