Refined codec: vigenere

Author: dhondta

README.md

@@ -291,6 +291,7 @@ This category also contains `ascii85`, `adobe`, `[x]btoa`, `zeromq` with the `ba
 - [X] `rotN`: aka Caesar cipher (*N* belongs to [1,25])
 - [X] `scytaleN`: encrypts using the number of letters on the rod (*N* belongs to [1,[)
 - [X] `shiftN`: shift ordinals (*N* belongs to [1,255])
+- [X] `trithemius`: aka Trithemius Cipher (variant of Vigenere Cipher)
 - [X] `vigenere`: aka Vigenere Cipher
 - [X] `xorN`: XOR with a single byte (*N* belongs to [1,255])
 

docs/pages/enc/crypto.md

@@ -109,6 +109,25 @@ It implements the cipher for its 4 different keys.
 
 -----
 
+### Beaufort Cipher
+
+This is a variant of the [Vigenere Cipher](#vigenere-cipher). There is no default key, meaning that `beaufort` as the encoding scheme throws a `LookupError` indicating that the _key must be a non-empty alphabetic string_.
+
+**Codec** | **Conversions** | **Aliases** | **Comment**
+:---: | :---: | --- | ---
+`beaufort` | text <-> Beaufort ciphertext | `beaufort-abcdef`, `beaufort_MySuperSecret` | key only consists of characters, not digits
+
+```python
+>>> codext.encode("This is a test !", "beaufort-abababa")
+'Husj sj a hxii !'
+>>> codext.encode("This is a test !", "beaufort_MySuperSecret")
+'Trkc hm r zaky !'
+>>> codext.decode("Husj sj a hxii !", "vigenere-abababa")
+'This is a test !'
+```
+
+-----
+
 ### Citrix CTX1
 
 This implements the Citrix CTX1 password encoding algorithm.
@@ -202,6 +221,23 @@ This is a dynamic encoding, that is, it can be called with an integer to define
 
 -----
 
+### Trithemius Cipher
+
+This is a variant of the [Vigenere Cipher](#vigenere-cipher) with key `"ABCDEFGHIJKLMNOPQRSTUVWXYZ"`.
+
+**Codec** | **Conversions** | **Aliases** | **Comment**
+:---: | :---: | --- | ---
+`trithemius` | text <-> Trithemius ciphertext | `trithemius`, `trithemius_cipher` | 
+
+```python
+>>> codext.encode("This is a test !", "trithemius")
+'Tikv mx g ambd !'
+>>> codext.decode("Tikv mx g ambd !", "trithemius")
+'This is a test !'
+```
+
+-----
+
 ### Vigenere Cipher
 
 This is a dynamic encoding, that is, it holds the key. There is no default key, meaning that `vigenere` as the encoding scheme throws a `LookupError` indicating that the _key must be a non-empty alphabetic string_.
@@ -216,6 +252,7 @@ This is a dynamic encoding, that is, it holds the key. There is no default key,
 >>> codext.encode("This is a test !", "vigenere_MySuperSecret")
 'Ffam xw r liuk !'
 >>> codext.decode("Tiit it a tfsu !", "vigenere-abababa")
+'This is a test !'
 ```
 
 -----

src/codext/crypto/vigenere.py

@@ -11,41 +11,43 @@
 
 from ..__common__ import *
 
-
 __examples__ = {
     'enc(beaufort)':             None,
     'enc(beaufort-lemon)':       {'ATTACKATDAWN': 'LLTOLBETLNPR'},
     'enc(beaufort-key)':         {'hello': 'danzq'},
     'enc(beaufort_key)':         {'Hello World': 'Danzq Cwnnh'},
-    'enc-dec(beaufort-secret)':  ['hello world', 'ATTACK AT DAWN', 'Test 1234!'],
+    'enc(trithemius-cipher)':    {'this is a test': "tikv mx g ambd"},
+    'enc(trithemius)':           {'HELLO': "HFNOS", '12345!@#$': "12345!@#$"},
     'enc(vigenere)':             None,
     'enc(vigenere-lemon)':       {'ATTACKATDAWN': 'LXFOPVEFRNHR'},
     'enc(vigenere-key)':         {'hello': 'rijvs'},
     'enc(vigenère_key)':         {'Hello World': 'Rijvs Uyvjn'},
+    'enc-dec(beaufort-secret)':  ['hello world', 'ATTACK AT DAWN', 'Test 1234!'],
+    'enc-dec(trithemius)':       ["Hello, World!", "@random"],
     'enc-dec(vigenere-secret)':  ['hello world', 'ATTACK AT DAWN', 'Test 1234!'],
 }
-__guess__ = ["beaufort-key", "beaufort-secret", "beaufort-password",
+__guess__ = ["beaufort-key", "beaufort-secret", "beaufort-password", "trithemius",
              "vigenere-key", "vigenere-secret", "vigenere-password"]
 
 
-def __make(encoding, char_func):
+def __make(enc, cfunc):
     def code(decode=False):
-        def _code(key):
-            def _wrapper(text, errors="strict"):
+        def _wrapper(key):
+            def _subwrapper(text, errors="strict"):
                 k = key.lower()
                 if not k or not k.isalpha():
-                    raise LookupError(f"Bad parameter for encoding '{encoding}': key must be a non-empty alphabetic string")
+                    raise LookupError(f"Bad parameter for encoding '{enc}': key must be a non-empty alphabetic string")
                 result, i = [], 0
                 for c in ensure_str(text):
                     if c in LC or c in UC:
-                        result.append(char_func(c, k, i, decode))
+                        result.append(cfunc(c, k, i, decode))
                         i += 1
                     else:
                         result.append(c)
                 r = "".join(result)
                 return r, len(r)
-            return _wrapper
-        return _code
+            return _subwrapper
+        return _wrapper
     return code(), code(True)
 
 
@@ -55,5 +57,8 @@ def _wrapper(text, errors="strict"):
 
 vchar = lambda c, k, i, d=False: (LC if (b := c in LC) else UC)[(ord(c) - ord("Aa"[b]) + \
                                                                  [1, -1][d] * (ord(k[i % len(k)]) - ord('a'))) % 26]
+enc, dec = __make("trithemius", vchar)
+add("trithemius", enc(k := "ABCDEFGHIJKLMNOPQRSTUVWXYZ"), dec(k), r"trithemius(?:[-_]cipher)?$", penalty=.1)
+
 add("vigenere", *__make("vigenere", vchar), r"vigen[eè]re(?:[-_]cipher)?(?:[-_]([a-zA-Z]+))?$", penalty=.1)