implement properties

Author: Z0ltrix

key.py

@@ -40,33 +40,16 @@ def __init__(self, modulo, exponent):
         self._modulo = modulo
         self._exponent = exponent
 
+    @property
     def bit_length(self):
         """
         Returns the length of the key in bit
 
-        :return: length of the key in bit
+        :return: Length of the key in bit
         :rtype: int
         """
         return self._modulo.bit_length()
 
-    def _get_modulo(self):
-        """
-        Returns the modulo of the key
-
-        :return: modulo of the key
-        :rtype: int
-        """
-        return self._modulo
-
-    def _get_exponent(self):
-        """
-        Returns the exponent of the key
-
-        :return: exponent of the key
-        :rtype: int
-        """
-        return self._exponent
-
     @staticmethod
     def is_public():
         """
@@ -89,8 +72,25 @@ def is_private():
         """
         return False
 
-    exponent = property(_get_exponent)
-    modulo = property(_get_modulo)
+    @property
+    def exponent(self):
+        """
+        Get the exponent of the key.
+
+        :return: Exponent of the key.
+        :rtype: int
+        """
+        return self._exponent
+
+    @property
+    def modulo(self):
+        """
+        Get the modulo of the key.
+
+        :return: Modulo of the key.
+        :rtype: int
+        """
+        return self._modulo
 
     def modular_exponentiation(self, data):
         """

keypair.py

@@ -66,13 +66,28 @@ def __init__(self, bit_length=2048):
         self._public_key = PublicKey(modulo, encipher_exponent)
 
     def __del__(self):
-        pass
+        """
+        Deletes the key pair.
+        """
+        del self._private_key
+        del self._public_key
 
-    def _get_private_key(self):
+    @property
+    def private_key(self):
+        """
+        Returns the private key of the key pair.
+
+        :return: Private key.
+        :rtype: PrivateKey
+        """
         return self._private_key
 
-    def _get_public_key(self):
-        return self._public_key
+    @property
+    def public_key(self):
+        """
+        Returns the public key of the key pair.
 
-    private_key = property(_get_private_key)
-    public_key = property(_get_public_key)
+        :return: Public key.
+        :rtype: PublicKey
+        """
+        return self._public_key

prime.py

@@ -143,17 +143,16 @@ def __truediv__(self, other):
         else:
             return self._value / other
 
-    def _get_value(self):
+    @property
+    def value(self):
         """
-        Returns the value of the prime number
+        Returns the value of the prime number.
 
-        :return: The value
+        :return: The value.
         :rtype: int
         """
         return self._value
 
-    value = property(_get_value)
-
     def _is_primality(self, maybe):
         """
         Checks if the potential prime number is a prime number via Solovay Strassen Test
@@ -172,4 +171,11 @@ def _is_primality(self, maybe):
 
     @classmethod
     def security(cls):
+        """
+        Calculates the security level in percent.
+        To change the security level, just change the static value SOLOVAY_STRASSEN_ROUNDS.
+
+        :return: The security level in percent.
+        :rtype: float
+        """
         return (100 * (1 - (1 / (pow(2, cls.SOLOVAY_STRASSEN_ROUNDS)))))

privatekey.py

@@ -42,14 +42,15 @@ def __init__(self, modulo, decipher_exponent):
         """
         Key.__init__(self, modulo, decipher_exponent)
 
-    def _get_decipher_exponent(self):
+    @property
+    def decipher_exponent(self):
         """
         Returns the decipher exponent of the private key.
 
         :return: decipher exponent of the private key
         :rtype: int
         """
-        return self._get_exponent()
+        return self._exponent
 
     @staticmethod
     def is_private():
@@ -63,8 +64,6 @@ def is_private():
         """
         return True
 
-    decipher_exponent = property(_get_decipher_exponent)
-
     def decipher_int(self, data):
         """
         Decipher an integer value.

publickey.py

@@ -42,14 +42,15 @@ def __init__(self, modulo, encipher_exponent):
         """
         Key.__init__(self, modulo, encipher_exponent)
 
-    def _get_encipher_exponent(self):
+    @property
+    def encipher_exponent(self):
         """
         Returns the encipher exponent of the public key.
 
         :return: the encipher exponent of the public key
         :rtype: int
         """
-        return self._get_exponent()
+        return self._exponent
 
     @staticmethod
     def is_public():
@@ -63,8 +64,6 @@ def is_public():
         """
         return True
 
-    encipher_exponent = property(_get_encipher_exponent)
-
     def encipher_int(self, data):
         """
         Encipher an integer value.

test/keypair_testcase.py

@@ -35,7 +35,14 @@ def setUp(self):
     def tearDown(self):
         del self.bits
 
-    def test_key_pair(self):
-        key_pair = KeyPair(self.bits)
-        self.assertTrue(key_pair.public_key.modulo.bit_length() == self.bits,
-                        "Key pair constructor creates wrong bitlength modulo")
+    def test_key_pair_bits(self):
+        self.assertTrue(KeyPair(self.bits).public_key.modulo.bit_length() == self.bits,
+                        "Key pair constructor creates wrong bit length modulo")
+
+    def test_public_key_bits(self):
+        self.assertTrue(KeyPair(self.bits).public_key.bit_length == self.bits,
+                        "Key pair constructor creates wrong bit length public key")
+
+    def test_private_key_bits(self):
+        self.assertTrue(KeyPair(self.bits).private_key.bit_length == self.bits,
+                        "Key pair constructor creates wrong bit length private key")