diff options
| author | Alex Stapleton <alexs@prol.etari.at> | 2014-02-05 20:31:52 +0000 | 
|---|---|---|
| committer | Alex Stapleton <alexs@prol.etari.at> | 2014-02-05 20:31:52 +0000 | 
| commit | 01fc0814553efe4da1e7f7c3e087dd48b438d2e3 (patch) | |
| tree | 2c96183749fb124aa4b43c961d8592b7044d1ba9 | |
| parent | 940eee2d7109b742a33612c1a1ff4f72e44c3d78 (diff) | |
| download | cryptography-01fc0814553efe4da1e7f7c3e087dd48b438d2e3.tar.gz cryptography-01fc0814553efe4da1e7f7c3e087dd48b438d2e3.tar.bz2 cryptography-01fc0814553efe4da1e7f7c3e087dd48b438d2e3.zip | |
Use a version check when counting bit_length
| -rw-r--r-- | cryptography/hazmat/primitives/asymmetric/rsa.py | 6 | 
1 files changed, 4 insertions, 2 deletions
| diff --git a/cryptography/hazmat/primitives/asymmetric/rsa.py b/cryptography/hazmat/primitives/asymmetric/rsa.py index c5fecbc1..3dd88e91 100644 --- a/cryptography/hazmat/primitives/asymmetric/rsa.py +++ b/cryptography/hazmat/primitives/asymmetric/rsa.py @@ -13,6 +13,8 @@  from __future__ import absolute_import, division, print_function +import sys +  import six  from cryptography import utils @@ -20,9 +22,9 @@ from cryptography.hazmat.primitives import interfaces  def _bit_length(x): -    try: +    if sys.version_info >= (2, 7):          return x.bit_length() -    except AttributeError: +    else:          return len(bin(x)) - (2 + (x <= 0)) | 
