diff options
author | Sybren A. Stüvel <sybren@stuvel.eu> | 2011-07-14 21:34:14 +0200 |
---|---|---|
committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2011-07-14 21:34:14 +0200 |
commit | bcaa1bd46e3be5ba7351c362e834eb8a07424f83 (patch) | |
tree | f3aed17fd749f9571839d25bd8c60dc3e13dbbda | |
parent | 8bb4ec32bbd665032766312c0ff7a1cb6b9ccaf6 (diff) | |
download | rsa-git-bcaa1bd46e3be5ba7351c362e834eb8a07424f83.tar.gz |
Use new-style integer division
-rwxr-xr-x | rsa/__init__.py | 4 | ||||
-rwxr-xr-x | rsa/keygen.py | 8 | ||||
-rw-r--r-- | rsa/prime.py | 2 | ||||
-rw-r--r-- | rsa/randnum.py | 2 | ||||
-rwxr-xr-x | rsa/transform.py | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/rsa/__init__.py b/rsa/__init__.py index bd0358c..063889c 100755 --- a/rsa/__init__.py +++ b/rsa/__init__.py @@ -52,7 +52,7 @@ def block_size(n): # Set aside 2 bits so setting of safebit won't overflow modulo n. nbits = common.bit_size(n) - 2 - nbytes = nbits / 8 + nbytes = nbits // 8 return nbytes @@ -75,7 +75,7 @@ def chopstring(message, key, n, int_op): nbytes = block_size(n) msglen = len(message) - blocks = msglen / nbytes + blocks = msglen // nbytes if msglen % nbytes > 0: blocks += 1 diff --git a/rsa/keygen.py b/rsa/keygen.py index d027a30..1f1c9a7 100755 --- a/rsa/keygen.py +++ b/rsa/keygen.py @@ -25,7 +25,7 @@ def extended_gcd(a, b): oa = a #Remember original a/b to remove ob = b #negative values from return results while b != 0: - q = long(a/b) + q = long(a // b) (a, b) = (b, a % b) (x, lx) = ((lx - (q * x)),x) (y, ly) = ((ly - (q * y)),y) @@ -52,7 +52,7 @@ def find_p_q(nbits): # Make sure that p and q aren't too close or the factoring programs can # factor n. - shift = nbits / 16 + shift = nbits // 16 pbits = nbits + shift qbits = nbits - shift @@ -98,8 +98,8 @@ def gen_keys(nbits): ``q`` will use ``nbits/2`` bits. """ - (p, q) = find_p_q(nbits / 2) - (e, d) = calculate_keys(p, q, nbits / 2) + (p, q) = find_p_q(nbits // 2) + (e, d) = calculate_keys(p, q, nbits // 2) return (p, q, e, d) diff --git a/rsa/prime.py b/rsa/prime.py index 1392284..3edf392 100644 --- a/rsa/prime.py +++ b/rsa/prime.py @@ -42,7 +42,7 @@ def jacobi_witness(x, n): """ j = jacobi(x, n) % n - f = pow(x, (n-1)/2, n) + f = pow(x, (n - 1) // 2, n) if j == f: return False return True diff --git a/rsa/randnum.py b/rsa/randnum.py index 1129a9b..140c22f 100644 --- a/rsa/randnum.py +++ b/rsa/randnum.py @@ -11,7 +11,7 @@ def read_random_int(nbits): resulting number can be stored in ``nbits`` bits. """ - randomdata = os.urandom(nbits / 8) + randomdata = os.urandom(nbits // 8) return transform.bytes2int(randomdata) def randint(maxvalue): diff --git a/rsa/transform.py b/rsa/transform.py index 608d838..a43cfb7 100755 --- a/rsa/transform.py +++ b/rsa/transform.py @@ -192,7 +192,7 @@ def int2str64(number): while number > 0: string = "%s%s" % (to64(number & 0x3F), string) - number /= 64 + number //= 64 return string |