diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2017-10-11 22:01:29 -0400 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2017-10-12 10:01:29 +0800 |
| commit | 31034a03227ebfe63f4025cd95137f116cd4236a (patch) | |
| tree | 33454544ff3f1f2eec9b7225a681832dd999ebd3 /src | |
| parent | a87daea52b698a59664d852ecad567a742576265 (diff) | |
| download | cryptography-31034a03227ebfe63f4025cd95137f116cd4236a.tar.gz cryptography-31034a03227ebfe63f4025cd95137f116cd4236a.tar.bz2 cryptography-31034a03227ebfe63f4025cd95137f116cd4236a.zip | |
Inline calls to bit_length now that it's trivial (#3966)
* Inline calls to bit_length now that it's trivial
* unused imports
* An comment
Diffstat (limited to 'src')
| -rw-r--r-- | src/cryptography/hazmat/primitives/asymmetric/dsa.py | 4 | ||||
| -rw-r--r-- | src/cryptography/utils.py | 2 | ||||
| -rw-r--r-- | src/cryptography/x509/base.py | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/cryptography/hazmat/primitives/asymmetric/dsa.py b/src/cryptography/hazmat/primitives/asymmetric/dsa.py index 03e6a53e..f2f600dd 100644 --- a/src/cryptography/hazmat/primitives/asymmetric/dsa.py +++ b/src/cryptography/hazmat/primitives/asymmetric/dsa.py @@ -128,9 +128,9 @@ def generate_private_key(key_size, backend): def _check_dsa_parameters(parameters): - if utils.bit_length(parameters.p) not in [1024, 2048, 3072]: + if parameters.p.bit_length() not in [1024, 2048, 3072]: raise ValueError("p must be exactly 1024, 2048, or 3072 bits long") - if utils.bit_length(parameters.q) not in [160, 256]: + if parameters.q.bit_length() not in [160, 256]: raise ValueError("q must be exactly 160 or 256 bits long") if not (1 < parameters.g < parameters.p): diff --git a/src/cryptography/utils.py b/src/cryptography/utils.py index 02eec209..382905c0 100644 --- a/src/cryptography/utils.py +++ b/src/cryptography/utils.py @@ -100,6 +100,8 @@ def verify_interface(iface, klass): ) +# No longer needed as of 2.2, but retained because we have external consumers +# who use it. def bit_length(x): return x.bit_length() diff --git a/src/cryptography/x509/base.py b/src/cryptography/x509/base.py index 2c96c5bc..45b603f0 100644 --- a/src/cryptography/x509/base.py +++ b/src/cryptography/x509/base.py @@ -469,7 +469,7 @@ class CertificateBuilder(object): # ASN.1 integers are always signed, so most significant bit must be # zero. - if utils.bit_length(number) >= 160: # As defined in RFC 5280 + if number.bit_length() >= 160: # As defined in RFC 5280 raise ValueError('The serial number should not be more than 159 ' 'bits.') return CertificateBuilder( @@ -686,7 +686,7 @@ class RevokedCertificateBuilder(object): # ASN.1 integers are always signed, so most significant bit must be # zero. - if utils.bit_length(number) >= 160: # As defined in RFC 5280 + if number.bit_length() >= 160: # As defined in RFC 5280 raise ValueError('The serial number should not be more than 159 ' 'bits.') return RevokedCertificateBuilder( |