passphera-core 0.3.3__tar.gz → 0.4.0__tar.gz

{passphera-core-0.3.3 → passphera-core-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: passphera-core
-Version: 0.3.3
+Version: 0.4.0
 Summary: The core system of passphera project
 Home-page: https://github.com/passphera/core
 Author: Fathi Abdelmalek
@@ -14,6 +14,6 @@ Classifier: Topic :: Security
 Classifier: Topic :: Security :: Cryptography
 Description-Content-Type: text/markdown
 
-# passphera-cre
+# passphera-core
 
 The core system of passphera project

{passphera-core-0.3.3 → passphera-core-0.4.0}/README.md

@@ -1,3 +1,3 @@
-# passphera-cre
+# passphera-core
 
 The core system of passphera project

passphera-core-0.4.0/passphera_core/__init__.py

@@ -0,0 +1,2 @@
+from passphera_core.generator import PasswordGenerator
+from passphera_core.exceptions import InvalidAlgorithmException

{passphera-core-0.3.3 → passphera-core-0.4.0}/passphera_core/exceptions.py

@@ -1,3 +1,3 @@
 class InvalidAlgorithmException(Exception):
     def __init__(self, algorithm: str) -> None:
-        super().__init__(f"Invalid algorithm name {algorithm}")
+        super().__init__(f"Invalid algorithm name [{algorithm}]")

{passphera-core-0.3.3 → passphera-core-0.4.0}/passphera_core/generator.py

@@ -12,24 +12,21 @@ class PasswordGenerator:
             text: str = None,
             shift: int = 3,
             multiplier: int = 3,
-            key_str: str = "secret",
-            key_iter: iter = (9, 4, 5, 7),
-            algorithm: str = 'playfair'
+            key: str = "hill",
+            algorithm: str = 'hill'
     ):
         """
         :param text: plain text to be ciphered
         :param shift: number of characters to shift each character (default 3)
         :param multiplier: number of characters to shift each character (default 3)
-        :param key_str: cipher key string (default "secret")
-        :param key_iter: cipher key matrix (default (9, 4, 5, 7))
+        :param key: cipher key string (default "secret")
         :param algorithm: main cipher algorithm name (default 'playfair')
         """
         self._chars_replacements: dict = {}
         self._text: str = text
         self._shift: int = shift
         self._multiplier: int = multiplier
-        self._key_str: str = key_str
-        self._key_iter: iter = key_iter
+        self._key: str = key
         self._algorithm_name: str = algorithm.lower()
         self._algorithm = self._set_algorithm()
         if text:
@@ -96,42 +93,23 @@ class PasswordGenerator:
         self._multiplier = multiplier
 
     @property
-    def key_str(self) -> str:
+    def key(self) -> str:
         """
         Returns the key string for the cipher algorithm
         Eg: ```key_str = pg.key_str```
         :return: str: The key string for the cipher algorithm
         """
-        return self._key_str
+        return self._key
 
-    @key_str.setter
-    def key_str(self, key_str: str) -> None:
+    @key.setter
+    def key(self, key: str) -> None:
         """
         Sets the key string for the cipher algorithm
-        Eg: ```pg.key_str = 'secret key'```
-        :param key_str: The key string for the cipher algorithm
+        Eg: ```pg.key = 'secret key'```
+        :param key: The key string for the cipher algorithm
         :return:
         """
-        self._key_str = key_str
-
-    @property
-    def key_iter(self) -> iter:
-        """
-        Returns the key matrix for the cipher algorithm
-        Eg: ```key_iter = pg.key_iter```
-        :return: iter: The key matrix for the cipher algorithm
-        """
-        return self._key_iter
-
-    @key_iter.setter
-    def key_iter(self, key_iter: iter) -> None:
-        """
-        Sets the key matrix for the cipher algorithm
-        Eg: ```pg.key_iter = (9, 5, 2, 4)```
-        :param key_iter: The key matrix for the cipher algorithm
-        :return:
-        """
-        self._key_iter = key_iter
+        self._key = key
 
     @property
     def algorithm(self) -> str:
@@ -173,9 +151,9 @@ class PasswordGenerator:
             case 'affine':
                 return AffineCipher(self._multiplier, self._shift)
             case 'playfair':
-                return PlayfairCipher(self._key_str)
+                return PlayfairCipher(self._key)
             case 'hill':
-                return HillCipher(self._key_iter)
+                return HillCipher(self._key)
             case _:
                 raise InvalidAlgorithmException(self._algorithm_name)
 
@@ -222,9 +200,9 @@ class PasswordGenerator:
         self._password = self.generate_raw_password()
         self._algorithm_name = old_algorithm
         self._password = self.generate_raw_password()
-        for char, replacement in self._chars_replacements.items():
-            self._password = self._password.replace(char, replacement)
         for char in self._password:
             if char in self._text:
                 self._password = self._password.replace(char, char.upper())
+        for char, replacement in self._chars_replacements.items():
+            self._password = self._password.replace(char, replacement)
         return self._password

{passphera-core-0.3.3 → passphera-core-0.4.0}/passphera_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: passphera-core
-Version: 0.3.3
+Version: 0.4.0
 Summary: The core system of passphera project
 Home-page: https://github.com/passphera/core
 Author: Fathi Abdelmalek
@@ -14,6 +14,6 @@ Classifier: Topic :: Security
 Classifier: Topic :: Security :: Cryptography
 Description-Content-Type: text/markdown
 
-# passphera-cre
+# passphera-core
 
 The core system of passphera project

{passphera-core-0.3.3 → passphera-core-0.4.0}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setup(
     name='passphera-core',
-    version='0.3.3',
+    version='0.4.0',
     author='Fathi Abdelmalek',
     author_email='abdelmalek.fathi.2001@gmail.com',
     url='https://github.com/passphera/core',

passphera-core-0.3.3/passphera_core/__init__.py

@@ -1,2 +0,0 @@
-from .generator import PasswordGenerator
-from .exceptions import InvalidAlgorithmException