change to sub-interface idea

1 files changed, 16 insertions, 16 deletions

diff --git a/cryptography/hazmat/primitives/interfaces.py b/cryptography/hazmat/primitives/interfaces.py
index e827271f..682a36da 100644
--- a/cryptography/hazmat/primitives/interfaces.py
+++ b/cryptography/hazmat/primitives/interfaces.py
@@ -205,6 +205,14 @@ class RSAPrivateKey(object):
 
 
 @six.add_metaclass(abc.ABCMeta)
+class RSAPrivateKeyWithNumbers(RSAPrivateKey):
+    def private_numbers(self):
+        """
+        Returns an RSAPrivateNumbers.
+        """
+
+
+@six.add_metaclass(abc.ABCMeta)
 class RSAPublicKey(object):
     @abc.abstractmethod
     def verifier(self, signature, padding, algorithm, backend):
@@ -220,6 +228,14 @@ class RSAPublicKey(object):
 
 
 @six.add_metaclass(abc.ABCMeta)
+class RSAPublicKeyWithNumbers(RSAPublicKey):
+    def public_numbers(self):
+        """
+        Returns an RSAPublicNumbers
+        """
+
+
+@six.add_metaclass(abc.ABCMeta)
 class DSAParameters(object):
     @abc.abstractproperty
     def modulus(self):
@@ -455,19 +471,3 @@ class EllipticCurvePublicKey(object):
         """
         The EllipticCurve that this key is on.
         """
-
-
-@six.add_metaclass(abc.ABCMeta)
-class RSAPrivateNumbersAvailable(object):
-    def private_numbers(self):
-        """
-        Returns an RSAPrivateNumbers.
-        """
-
-
-@six.add_metaclass(abc.ABCMeta)
-class RSAPublicNumbersAvailable(object):
-    def public_numbers(self):
-        """
-        Returns an RSAPublicNumbers
-        """