Merge pull request #1104 from alex/use-numbers
Use numbers
diff --git a/cryptography/hazmat/primitives/interfaces.py b/cryptography/hazmat/primitives/interfaces.py
index 0dd1d01..d805bd1 100644
--- a/cryptography/hazmat/primitives/interfaces.py
+++ b/cryptography/hazmat/primitives/interfaces.py
@@ -192,24 +192,6 @@
"""
@abc.abstractproperty
- def modulus(self):
- """
- The public modulus of the RSA key.
- """
-
- @abc.abstractproperty
- def public_exponent(self):
- """
- The public exponent of the RSA key.
- """
-
- @abc.abstractproperty
- def private_exponent(self):
- """
- The private exponent of the RSA key.
- """
-
- @abc.abstractproperty
def key_size(self):
"""
The bit length of the public modulus.
@@ -221,58 +203,6 @@
The RSAPublicKey associated with this private key.
"""
- @abc.abstractproperty
- def n(self):
- """
- The public modulus of the RSA key. Alias for modulus.
- """
-
- @abc.abstractproperty
- def p(self):
- """
- One of the two primes used to generate d.
- """
-
- @abc.abstractproperty
- def q(self):
- """
- One of the two primes used to generate d.
- """
-
- @abc.abstractproperty
- def d(self):
- """
- The private exponent. This can be calculated using p and q. Alias for
- private_exponent.
- """
-
- @abc.abstractproperty
- def dmp1(self):
- """
- A Chinese remainder theorem coefficient used to speed up RSA
- calculations. Calculated as: d mod (p-1)
- """
-
- @abc.abstractproperty
- def dmq1(self):
- """
- A Chinese remainder theorem coefficient used to speed up RSA
- calculations. Calculated as: d mod (q-1)
- """
-
- @abc.abstractproperty
- def iqmp(self):
- """
- A Chinese remainder theorem coefficient used to speed up RSA
- calculations. The modular inverse of q modulo p
- """
-
- @abc.abstractproperty
- def e(self):
- """
- The public exponent of the RSA key. Alias for public_exponent.
- """
-
@six.add_metaclass(abc.ABCMeta)
class RSAPublicKey(object):
@@ -283,35 +213,11 @@
"""
@abc.abstractproperty
- def modulus(self):
- """
- The public modulus of the RSA key.
- """
-
- @abc.abstractproperty
- def public_exponent(self):
- """
- The public exponent of the RSA key.
- """
-
- @abc.abstractproperty
def key_size(self):
"""
The bit length of the public modulus.
"""
- @abc.abstractproperty
- def n(self):
- """
- The public modulus of the RSA key. Alias for modulus.
- """
-
- @abc.abstractproperty
- def e(self):
- """
- The public exponent of the RSA key. Alias for public_exponent.
- """
-
@six.add_metaclass(abc.ABCMeta)
class DSAParameters(object):
diff --git a/docs/hazmat/primitives/interfaces.rst b/docs/hazmat/primitives/interfaces.rst
index b2857f5..34e4e93 100644
--- a/docs/hazmat/primitives/interfaces.rst
+++ b/docs/hazmat/primitives/interfaces.rst
@@ -157,81 +157,12 @@
An RSA public key object corresponding to the values of the private key.
- .. attribute:: modulus
-
- :type: int
-
- The public modulus.
-
- .. attribute:: public_exponent
-
- :type: int
-
- The public exponent.
-
- .. attribute:: private_exponent
-
- :type: int
-
- The private exponent.
-
.. attribute:: key_size
:type: int
The bit length of the modulus.
- .. attribute:: p
-
- :type: int
-
- ``p``, one of the two primes composing the :attr:`modulus`.
-
- .. attribute:: q
-
- :type: int
-
- ``q``, one of the two primes composing the :attr:`modulus`.
-
- .. attribute:: d
-
- :type: int
-
- The private exponent. Alias for :attr:`private_exponent`.
-
- .. attribute:: dmp1
-
- :type: int
-
- A `Chinese remainder theorem`_ coefficient used to speed up RSA
- operations. Calculated as: d mod (p-1)
-
- .. attribute:: dmq1
-
- :type: int
-
- A `Chinese remainder theorem`_ coefficient used to speed up RSA
- operations. Calculated as: d mod (q-1)
-
- .. attribute:: iqmp
-
- :type: int
-
- A `Chinese remainder theorem`_ coefficient used to speed up RSA
- operations. Calculated as: q\ :sup:`-1` mod p
-
- .. attribute:: n
-
- :type: int
-
- The public modulus. Alias for :attr:`modulus`.
-
- .. attribute:: e
-
- :type: int
-
- The public exponent. Alias for :attr:`public_exponent`.
-
.. class:: RSAPublicKey
@@ -281,36 +212,12 @@
:return bytes: Encrypted data.
- .. attribute:: modulus
-
- :type: int
-
- The public modulus.
-
.. attribute:: key_size
:type: int
The bit length of the modulus.
- .. attribute:: public_exponent
-
- :type: int
-
- The public exponent.
-
- .. attribute:: n
-
- :type: int
-
- The public modulus. Alias for :attr:`modulus`.
-
- .. attribute:: e
-
- :type: int
-
- The public exponent. Alias for :attr:`public_exponent`.
-
.. class:: DSAParameters