codext 1.16.2__tar.gz → 1.16.4__tar.gz

{codext-1.16.2 → codext-1.16.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codext
-Version: 1.16.2
+Version: 1.16.4
 Summary: Native codecs extension
 Author-email: Alexandre D'Hondt <alexandre.dhondt@gmail.com>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -1034,6 +1034,7 @@ This category also contains `ascii85`, `adobe`, `[x]btoa`, `zeromq` with the `ba
 - [X] `barbie-N`: aka Barbie Typewriter (*N* belongs to [1, 4])
 - [X] `beaufort`: aka Beaufort Cipher (variant of Vigenere Cipher)
 - [X] `citrix`: aka Citrix CTX1 password encoding
+- [X] `playfair`: aka Playfair Cipher
 - [X] `phillips`: aka Phillips Cipher (polyalphabetic block cipher with 8 key squares)
 - [X] `polybius`: aka Polybius Square Cipher
 - [X] `railfence`: aka Rail Fence Cipher
@@ -1041,6 +1042,7 @@ This category also contains `ascii85`, `adobe`, `[x]btoa`, `zeromq` with the `ba
 - [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] `vic`: aka VIC Cipher
 - [X] `vigenere`: aka Vigenere Cipher
 - [X] `xorN`: XOR with a single byte (*N* belongs to [1,255])
 

{codext-1.16.2 → codext-1.16.4}/README.md

@@ -336,6 +336,7 @@ This category also contains `ascii85`, `adobe`, `[x]btoa`, `zeromq` with the `ba
 - [X] `barbie-N`: aka Barbie Typewriter (*N* belongs to [1, 4])
 - [X] `beaufort`: aka Beaufort Cipher (variant of Vigenere Cipher)
 - [X] `citrix`: aka Citrix CTX1 password encoding
+- [X] `playfair`: aka Playfair Cipher
 - [X] `phillips`: aka Phillips Cipher (polyalphabetic block cipher with 8 key squares)
 - [X] `polybius`: aka Polybius Square Cipher
 - [X] `railfence`: aka Rail Fence Cipher
@@ -343,6 +344,7 @@ This category also contains `ascii85`, `adobe`, `[x]btoa`, `zeromq` with the `ba
 - [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] `vic`: aka VIC Cipher
 - [X] `vigenere`: aka Vigenere Cipher
 - [X] `xorN`: XOR with a single byte (*N* belongs to [1,255])
 

{codext-1.16.2 → codext-1.16.4}/docs/pages/enc/crypto.md

@@ -257,6 +257,25 @@ This is a dynamic encoding, that is, it can be called with an integer to define
 
 -----
 
+### Playfair Cipher
+
+The Playfair cipher is a symmetric encryption method using polygram substitution with bigrams (pairs of letters), invented in 1854 by Charles Wheatstone, but popularized by Lord Playfair.
+
+**Codec** | **Conversions** | **Aliases** | **Comment**
+:---: | :---: | --- | ---
+`playfair` | text <-> Playfair ciphertext | `playfair`, `playfair-playfairexample`, `playfair-keyword` | Dynamic key parameter ; letters only ; `J` is normalized to `I`
+
+```python
+>>> codext.encode("HIDETHEGOLDINTHETREESTUMP", "playfair-playfairexample")
+'BMODZBXDNABEKUDMUIXMMOUVIF'
+>>> codext.decode("BMODZBXDNABEKUDMUIXMMOUVIF", "playfair-playfairexample")
+'HIDETHEGOLDINTHETREXESTUMP'
+>>> codext.decode(codext.encode("INSTRUMENT", "playfair-keyword"), "playfair-keyword")
+'INSTRUMENT'
+```
+
+-----
+
 ### Trithemius Cipher
 
 This is a variant of the [Vigenere Cipher](#vigenere-cipher) with key `"ABCDEFGHIJKLMNOPQRSTUVWXYZ"`.
@@ -274,6 +293,30 @@ This is a variant of the [Vigenere Cipher](#vigenere-cipher) with key `"ABCDEFGH
 
 -----
 
+### VIC Cipher
+
+The VIC cipher combines a straddling checkerboard substitution (converting letters to a stream of digits) and an over-encryption based on a modulo-10 sum with eventually a conversion from digits to text.
+
+**Codec** | **Conversions** | **Aliases** | **Comment**
+:---: | :---: | --- | ---
+`vic` | text <-> VIC digit/text ciphertext | `vic-keyword`, `vic-key-12`, `vic-^-26-0248`, `vic-*-73-534T` | optional checkerboard keyword or alphabet marker, blank positions (exactly 2 distinct digits), over-encryption key (digits), "`T`" marker for text conversion
+
+Alphabet markers:
+- `*`: uses "`ABC[...]XYZ./`" (uppercase letters + "`./`")
+- `^`: uses "`./ZYX[...]CBA`" ("`./`" + reversed uppercase letters)
+
+```python
+>>> import codext
+>>> codext.encode("VICTOR", "vic-^-26-0248T")
+'VVXYWYY.XYJ'
+>>> codext.decode("VVXYWYY.XYJ", "vic-^-26-0248T")
+'VICTOR2'  # trailing superfluous letter because of text conversion
+>>> codext.encode("LONGTESTSTRING", "vic-^-85-72564")
+'5031237844273727064454072378'
+```
+
+-----
+
 ### 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_.
@@ -311,4 +354,3 @@ This is a dynamic encoding, that is, it can be called with an integer to define
 >>> codext.encode("~bcy*cy*k*~oy~", "xor-10")
 'this is a test'
 ```
-

codext-1.16.4/src/codext/VERSION.txt

@@ -0,0 +1 @@
+1.16.4

{codext-1.16.2 → codext-1.16.4}/src/codext/crypto/__init__.py

@@ -4,12 +4,13 @@ from .atbash import *
 from .bacon import *
 from .barbie import *
 from .citrix import *
+from .playfair import *
 from .phillips import *
 from .polybius import *
 from .railfence import *
 from .rot import *
 from .scytale import *
 from .shift import *
+from .vic import *
 from .vigenere import *
 from .xor import *
-

codext-1.16.4/src/codext/crypto/phillips.py

@@ -0,0 +1,108 @@
+# -*- coding: UTF-8 -*-
+"""Phillips Cipher Codec - phillips content encoding.
+
+The Phillips cipher is a polyalphabetic substitution cipher using 8 key squares.  The first square is a 5×5 grid built
+ from a keyword (I and J share one cell).  Seven additional squares are derived by sequentially swapping adjacent rows
+ in a descending bubble pattern.  Plaintext is divided into blocks of T letters (default 5); each letter is individually
+ enciphered by shifting its grid position right by DH columns and down by DV rows (both default to 1), wrapping
+ around with toroidal topology.  J is treated as I.
+
+Parameters:
+  key        -- keyword used to seed the initial 5×5 grid (required)
+  block_size -- number of letters per grid-cycle block, 1–25 (default 5)
+  dh         -- horizontal (column) shift for encryption, 1–4 (default 1)
+  dv         -- vertical (row) shift for encryption, 1–4 (default 1)
+
+This codec:
+- en/decodes strings from str to str
+- en/decodes strings from bytes to bytes
+- decodes file content to str (read)
+- encodes file content from str to bytes (write)
+
+Reference: https://www.dcode.fr/phillips-cipher
+"""
+from ..__common__ import *
+
+
+__examples__ = {
+    'dec(phillips)':               None,
+    'enc(phillips)':               None,
+    'enc(phillips-key)':           {'ATTACK1': None},
+    'enc(phillips-key)':           {'ATTACK': "HUUHLL", 'TESTME': "UFZUSM", 'ABCDEF': "HCLMFA"},
+    'enc(phillips-key-5-1-2)':     {'This is a Test String': "KPVBVHTCRHCHCGQBT"},
+    'dec(phillips-key-5-1-2)':     {'KPVBVHTCRHCHCGQBT': "THISISATESTSTRING"},
+    'enc-dec(phillips-key)':       ["ATTACK", "TESTME", "ABCDEF"],
+    'enc-dec(phillips-secret)':    ["HELLOWORLD", "ATTACKATDAWN"],
+    'enc-dec(phillips-key-2)':     ["ATTACK", "TESTME"],
+    'enc-dec(phillips-key-5-2)':   ["ATTACK"],
+    'enc-dec(phillips-key-5-1-2)': ["ATTACK"],
+}
+__guess__ = ["phillips-key", "phillips-secret", "phillips-password"]
+
+
+_ALPHABET = "ABCDEFGHIKLMNOPQRSTUVWXYZ"
+
+
+def __make_grids(key):
+    """Return all 8 grids built by a descending bubble-swap row permutation."""
+    seen, letters = set(), []
+    for c in key.upper().replace("J", "I") + _ALPHABET:
+        if c in set(_ALPHABET) and c not in seen:
+            letters.append(c)
+            seen.add(c)
+    grid = [letters[i * 5:(i + 1) * 5] for i in range(5)]
+    grids = [grid]
+    for k in range(7):
+        r = k % 4
+        grid = [row[:] for row in grid]
+        grid[r], grid[r + 1] = grid[r + 1], grid[r]
+        grids.append(grid)
+    return grids
+
+
+def __set_params(key, block_size, dh, dv):
+    return (key or "").strip(), \
+           int(block_size) if block_size else 5, \
+           int(dh) if dh else 1, \
+           int(dv) if dv else 1, \
+           __make_grids(key) if key and key.isalpha() else None
+
+
+def __shift_text(text, grids, block_size, dh, dv, errors, decode=False):
+    pos_maps = [{ch: (r, c) for r, row in enumerate(grid) for c, ch in enumerate(row)} for grid in grids]
+    r, i, t = "", 0, ensure_str(text).upper().replace("J", "I").replace(" ", "")
+    _h = handle_error("phillips", errors, decode=decode)
+    for pos, c in enumerate(t):
+        if c not in set(_ALPHABET):
+            r += _h(c, pos, r)
+        else:
+            grid_idx = (i // block_size) % 8
+            grid = grids[grid_idx]
+            s, col = pos_maps[grid_idx][c]
+            r += grid[(s + dv) % 5][(col + dh) % 5]
+            i += 1
+    return r, len(r)
+
+
+def phillips_encode(key, block_size=None, dh=None, dv=None):
+    _key, block_size, dh, dv, grids = __set_params(key, block_size, dh, dv)
+    def encode(text, errors="strict"):
+        if _key == "":
+            raise LookupError("Bad parameter for encoding 'phillips': key cannot be empty")
+        return __shift_text(text, grids, block_size, dh, dv, errors)
+    return encode
+
+
+def phillips_decode(key, block_size=None, dh=None, dv=None):
+    _key, block_size, dh, dv, grids = __set_params(key, block_size, dh, dv)
+    def decode(text, errors="strict"):
+        if _key == "":
+            raise LookupError("Bad parameter for encoding 'phillips': key cannot be empty")
+        return __shift_text(text, grids, block_size, -dh, -dv, errors, True)
+    return decode
+
+
+add("phillips", phillips_encode, phillips_decode,
+    r"^phillips(?:[-_]cipher)?(?:[-_]([a-zA-Z]+))?(?:[-_]([1-9]|1[0-9]|2[0-5]))?(?:[-_]([1-4]))?(?:[-_]([1-4]))?$",
+    printables_rate=1., penalty=.1)
+

codext-1.16.4/src/codext/crypto/playfair.py

@@ -0,0 +1,143 @@
+# -*- coding: UTF-8 -*-
+"""Playfair Cipher Codec - playfair content encoding.
+
+The Playfair cipher is a symmetric encryption method using polygram substitution
+with bigrams (pairs of letters), invented in 1854 by Charles Wheatstone, but
+popularized by his friend Lord Playfair.
+
+This codec:
+- en/decodes strings from str to str
+- en/decodes strings from bytes to bytes
+- decodes file content to str (read)
+- encodes file content from str to bytes (write)
+
+Reference: https://www.dcode.fr/playfair-cipher
+"""
+from string import ascii_uppercase as UC, digits as DG
+
+from ..__common__ import *
+
+
+__examples__ = {
+    'dec(playfair_cipher-testkey-4)': None,
+    'dec(playfair)':                  {'SIHTHTDQCUUTUSHOHW': "THISISATESTSTRINGX", '1a': None, 'a1b': None},
+    'dec(playfair-playfairexample)':  {'BMODZBXDNABEKUDMUIXMMOUVIF': 'HIDETHEGOLDINTHETREXESTUMP'},
+    'enc(playfair-*-5-XQ-IJ)':        {'UDTUTUTGMH': "TESTSTRJNG"},
+    'enc(playfair_cipher-*-5-XX)':    None,
+    'enc(playfair_cipher-*-5-X-JJ)':  None,
+    'enc(playfair)':                  {'String!': None, 'This is a test String': "SIHTHTDQCUUTUSHOHW"},
+    'enc(playfair-*-5-XQ-IJ)':        {'TESTSTRING': "UDTUTUTGMH"},
+    'enc(playfair-playfairexample)':  {'HIDETHEGOLDINTHETREESTUMP': 'BMODZBXDNABEKUDMUIXMMOUVIF'},
+    'enc-dec(playfair-keyword)':      ["TEST"],
+    'enc-dec(playfair-*-5-X-IJ)':     ["TEST", "TESTSENTENCE"],
+}
+__guess__ = ["playfair"]
+
+
+# Standard 5×5 Playfair alphabet (I and J share the same cell)
+_DEFAULT_ALPHABET = {
+    5: UC.replace("J", ""),
+    6: UC + DG,
+}
+
+
+def __build_grid(key=None, grid_size=5, replace_char=('J', 'I')):
+    """Build the Playfair grid from an optional keyword. """
+    seen, grid = set(), []
+    for c in key.upper():
+        if c == replace_char[0]:
+            c = replace_char[1]
+        if c.isalpha() and c not in seen:
+            seen.add(c)
+            grid.append(c)
+    for c in _DEFAULT_ALPHABET[grid_size]:
+        if c not in seen:
+            seen.add(c)
+            grid.append(c)
+    return grid, {grid[i]: (i // grid_size, i % grid_size) for i in range(grid_size ** 2)}
+
+
+def __set_params(key, grid_size, fill_chars, replace_char):
+    if len(fc := str(fill_chars or "XQ").upper()) == 2 and fc[0] == fc[1]:
+        raise LookupError("Bad parameter for encoding 'playfair': filling char must be a single letter or a pair of "
+                          "distinct letters")
+    if len(rc := str(replace_char or "JI").upper()) == 2 and rc[0] == rc[1]:
+        raise LookupError("Bad parameter for encoding 'playfair': replaced char must be a pair of distinct letters")
+    gs = int(grid_size or 5)
+    a = _DEFAULT_ALPHABET[gs]
+    if len(fc) == 1:
+        fc += a[(a.index(fc[0])+1) % len(a)]
+    return (a if key == "*" else a[::-1] if key == "^" else key).upper(), gs, tuple(fc), tuple(rc)
+
+
+def playfair_encode(key=None, grid_size=None, fill_chars=None, replace_char=None):
+    key, gsize, fchars, rchar = __set_params(key, grid_size, fill_chars, replace_char)
+    grid, pos = __build_grid(key, gsize, rchar)
+    def encode(text, errors="strict"):
+        _filler = lambda c: fchars[1] if c == fchars[0] else fchars[0]
+        chars = [rchar[1] if c == rchar[0] else c for c in ensure_str(text).upper().replace(" ", "")]
+        result, i, _h = [], 0, handle_error("playfair", errors)
+        while i < len(chars):
+            a = chars[i]
+            if a not in grid:
+                result.append(_h(a, i))
+                i += 1
+                continue
+            if i + 1 < len(chars):
+                b = chars[i+1]
+                if a == b:
+                    b = _filler(a)
+                else:
+                    i += 1
+            else:
+                b = _filler(a)
+            r_a, c_a = pos[a]
+            r_b, c_b = pos[b]
+            if r_a == r_b:
+                ea, eb = grid[r_a * 5 + (c_a + 1) % 5], grid[r_b * 5 + (c_b + 1) % 5]
+            elif c_a == c_b:
+                ea, eb = grid[((r_a + 1) % 5) * 5 + c_a], grid[((r_b + 1) % 5) * 5 + c_b]
+            else:
+                ea, eb = grid[r_a * 5 + c_b], grid[r_b * 5 + c_a]
+            result.extend([ea, eb])
+            i += 1
+        return (r := "".join(result)), len(r)
+    return encode
+
+
+def playfair_decode(key=None, grid_size=None, fill_chars=None, replace_char=None):
+    key, gsize, _, rchar = __set_params(key, grid_size, fill_chars, replace_char)
+    grid, pos = __build_grid(key, gsize, rchar)
+    def decode(text, errors="strict"):
+        chars = [rchar[1] if c == rchar[0] else c for c in ensure_str(text)]
+        result, i, _h = [], 0, handle_error("playfair", errors, decode=True)
+        while i < len(chars):
+            try:
+                r_a, c_a = pos[chars[i]]
+            except KeyError:
+                result.append(_h(chars[i], i, "".join(result)))
+                i += 1
+                continue
+            try:
+                r_b, c_b = pos[chars[i+1]]
+            except KeyError:
+                result.append(chars[i])
+                result.append(_h(chars[i+1], i+1, "".join(result)))
+                i += 2
+                continue
+            if r_a == r_b:
+                da, db = grid[r_a * 5 + (c_a - 1) % 5], grid[r_b * 5 + (c_b - 1) % 5]
+            elif c_a == c_b:
+                da, db = grid[((r_a - 1) % 5) * 5 + c_a], grid[((r_b - 1) % 5) * 5 + c_b]
+            else:
+                da, db = grid[r_a * 5 + c_b], grid[r_b * 5 + c_a]
+            result.extend([da, db])
+            i += 2
+        return (r := "".join(result)), len(r)
+    return decode
+
+
+add("playfair", playfair_encode, playfair_decode,
+    r"^playfair(?:[-_]cipher)?(?:[-_]([\^*]|[a-zA-Z]+))?(?:[-_]([56]))?(?:[-_]([A-Z]{1,2}))?(?:[-_]([A-Z]{2}))?$",
+    printables_rate=1., penalty=.1)
+

{codext-1.16.2 → codext-1.16.4}/src/codext/crypto/polybius.py

@@ -11,6 +11,8 @@ from ..__common__ import *
 
 
 __examples__ = {
+    'enc(polybius-ABCDEFGHIKLMNOPQRSTUVZZZZ)':       None,
+    'dec(polybius)':                                 {'4423244 24': None},
     'enc(polybius|polybius-square|polybius_square)': {'this is a test': "44232443 2443 11 44154344"},
     'enc(polybius-ABCDEFGHIKLMNOPQRSTUVWXYZ)':       {'this is a test': "44232443 2443 11 44154344"},
     'dec(polybius)':                                 {'44232443 2443 11 44154344': "THIS IS A TEST"},
@@ -59,15 +61,12 @@ def polybius_decode(alphabet=_DEFAULT_ALPHABET):
         _h = handle_error("polybius", errors, decode=True)
         r, t, i = "", ensure_str(text), 0
         while i < len(t):
-            if t[i] == " ":
-                r += " "
-                i += 1
-            elif i + 1 < len(t):
+            if t[i:i+2].isdigit():
                 r += decmap.get(t[i:i+2]) or _h(t[i:i+2], i, r)
-                i += 2
-            else:
-                r += _h(t[i], i, r)
                 i += 1
+            else:
+                r += " " if t[i] == " " else _h(t[i], i, r)
+            i += 1
         return r, len(t)
     return decode
 

codext-1.16.4/src/codext/crypto/vic.py

@@ -0,0 +1,142 @@
+# -*- coding: UTF-8 -*-
+"""Vic Cipher Codec - vic content encoding.
+
+This codec:
+- en/decodes strings from str to str
+- en/decodes strings from bytes to bytes
+- decodes file content to str (read)
+- encodes file content from str to bytes (write)
+"""
+from itertools import cycle
+from string import ascii_uppercase as UC
+
+from ..__common__ import *
+
+
+__examples__ = {
+    'dec(vic-test-33)':         None,
+    'dec(vic-*-12-1234T':       {'BBXMBDMBCBBHEMC': "THISISATEST"},
+    'dec(vic-^-26-0248T)':      {'VVXYWYY.XYJ': "VICTOR2"},  # '2' because of superfluous extra letter from substitution
+    'enc(vic-test-12-ABC)':     None,
+    'enc(vic-*-12-1234T':       {'This is a Test': "BBXMBDMBCBBHEMC"},
+    'enc(vic-^-26-0248)':       {'VICTOR': "88547440546"},
+    'enc(vic-^-26-0248T)':      {'VICTOR': "VVXYWYY.XYJ"},
+    'enc-dec(vic-^-26)':        ["TEST", "LONGTESTSTRING", "VICTOR"],
+    'enc-dec(vic-^-85-72564)':  ["TEST", "LONGTESTSTRING", "VICTOR"],
+    'enc-dec(vic-^-85-54321T)': ["TEST", "LONGTESTSTRING", "VICTOR"],
+}
+__guess__ = ["vic"]
+
+
+def __build_alphabet(key, alphabet=UC, reverse=False):
+    """Return the 28-letter alphabet derived from the input key."""
+    seen, result = set(), ""
+    for c in (key or "").upper():
+        if c.isalpha() and c not in seen:
+            result += c
+            seen.add(c)
+    for c in (alphabet[::-1] if reverse else alphabet):
+        if c not in seen:
+            result += c
+    return "./" + result if reverse else result + "./"
+
+
+def __build_checkerboard(alphabet, blank1=1, blank2=2):
+    """Build encode/decode lookup tables for the straddling checkerboard.
+
+    Layout with digit1=2 and digit2=6:
+         0  1 [2] 3  4  5 [6] 7  8  9
+      0: *  *     *  *  *     *  *  *
+      2: *  *  *  *  *  *  *  *  *  *
+      6: *  *  *  *  *  *  *  *  *  *
+    """
+    if blank1 == blank2:
+        raise LookupError(f"Bad parameter for encoding 'vic': blank1 and blank2 cannot be identical")
+    enc, dec, i = {}, {}, 0
+    # top row
+    for col in range(10):
+        if col not in (blank1, blank2):
+            enc[alphabet[i]] = str(col)
+            i += 1
+    # second row ; header digit is 'blank1'
+    for col in range(10):
+        enc[alphabet[i]] = str(blank1) + str(col)
+        i += 1
+    # third row ; header digit is 'blank2'
+    for col in range(10):
+        enc[alphabet[i]] = str(blank2) + str(col)
+        i += 1
+    return enc, {v: k for k, v in enc.items()}
+
+
+def __set_params(key, blanks, numeric_key):
+    return (UC if key == "*" else UC[::-1] if key == "^" else key).upper(), \
+           tuple(map(int, str(blanks) or "12")), \
+           str(numeric_key or "").rstrip("T"), \
+           key == "^", \
+           str(numeric_key or " ")[-1] == "T"
+
+
+def vic_encode(key=None, blanks=None, numeric_key=None):
+    key, blanks, numeric_key, rev, txt = __set_params(key, blanks, numeric_key)
+    enc_map, dec_map = __build_checkerboard(__build_alphabet(key, reverse=rev), blanks[0], blanks[1])
+    def _encode(text, errors="strict"):
+        _h = handle_error("vic", errors)
+        digits, nk_i, nk_l = [], 0, len(numeric_key or "")
+        for pos, c in enumerate(ensure_str(text).upper().replace(" ", "")):
+            # 1) encode with the straddling checkerboard
+            c = enc_map[c] if c in enc_map else _h(c, pos, "".join(digits))
+            # 2) if numeric_key is defined, over-encrypt digits
+            if numeric_key and c.isdigit():
+                for ci in c:
+                    digits.append(str((int(ci) + int(numeric_key[nk_i % nk_l])) % 10))
+                    nk_i += 1
+            else:
+                digits.append(c)
+        r = "".join(d for d in digits if d)
+        # 3) if text mode, convert digits to text
+        if txt:
+            i, r0, l, r = 0, r, len(r), ""
+            while i < len(r0):
+                if int(r0[i]) in blanks:
+                    r += dec_map[r0[i] + ("0" if i == l - 1 else r0[i+1])]
+                    i += 1
+                else:
+                    r += dec_map[r0[i]]
+                i += 1
+        return r, len(r)
+    return _encode
+
+
+def vic_decode(key=None, blanks=None, numeric_key=None):
+    key, blanks, numeric_key, rev, txt = __set_params(key, blanks, numeric_key)
+    enc_map, dec_map = __build_checkerboard(__build_alphabet(key, reverse=rev), blanks[0], blanks[1])
+    def _decode(text, errors="strict"):
+        _h = handle_error("vic", errors, decode=True)
+        # 1) if text mode, convert text to digits
+        text = "".join(enc_map[c] for c in ensure_str(text)) if txt else ensure_str(text)
+        # 2) if numeric_key is defined, over-decrypt
+        digits, nk_i, nk_l = [], 0, len(numeric_key or "")
+        for pos, c in enumerate(text):
+            if numeric_key and c.isdigit():
+                for ci in c:
+                    digits.append(str((int(c) - int(numeric_key[nk_i % nk_l])) % 10))
+                    nk_i += 1
+            else:
+                digits.append(c if c.isdigit() else _h(c, pos, "".join(digits)))
+        # 3) decode with the straddling checkerboard
+        i, r, r0 = 0, "", "".join(d for d in digits if d)
+        while i < (l := len(r0)):
+            if int(r0[i]) in blanks:
+                r += r0[i] if i == l - 1 else dec_map[r0[i] + r0[i+1]]
+                i += 1
+            else:
+                r += dec_map[r0[i]] if r0[i] in dec_map else _h(r0[i], i, r)
+            i += 1
+        return r, len(r)
+    return _decode
+
+
+add("vic", vic_encode, vic_decode, r"vic(?:[-_]([\^*]|[./a-zA-Z]+))?(?:[-_]([0-9]{2}))?(?:[-_]([0-9]+T?))?$",
+    printables_rate=1., penalty=.1)
+

{codext-1.16.2 → codext-1.16.4}/src/codext/hashing/crypt.py

@@ -13,10 +13,10 @@ from ..__common__ import add, ensure_str, UNIX
 
 if UNIX:
     try:
-        import crypt
+        import legacycrypt as crypt
     except ImportError:
         try:
-            import legacycrypt as crypt
+            import crypt
         except ImportError:
             crypt = None
     

{codext-1.16.2 → codext-1.16.4}/src/codext/languages/ipsum.py

@@ -13,8 +13,9 @@ from ..__common__ import *
 
 
 __examples__ = {
-    'enc-dec(ipsum|lorem-ipsum)': ["This is a test !"],
+    'dec(lorem_ipsum)':           {'orci #': None, 'Auctor babel commodo#': None},
     'enc(ipsum)':                 {'Bad test#': None},
+    'enc-dec(ipsum|lorem-ipsum)': ["This is a test !"],
 }
 
 
@@ -59,7 +60,7 @@ SCHARS = "0123456789.,:;!?+=-*/\\"
 
 
 def ipsum_encode(text, errors="strict"):
-    s, strip = "", False
+    s, strip, _h = "", False, handle_error("ipsum", errors, " ")
     for i, c in enumerate(text):
         try:
             if c == " " or c in SCHARS:
@@ -70,13 +71,12 @@ def ipsum_encode(text, errors="strict"):
                 s += (w.capitalize() if c.isupper() else w) + " "
                 strip = True
         except KeyError:
-            s += handle_error("ipsum", errors, " ")(c, i)
-    return s[:-1] if strip else s, len(text)
+            s += _h(c, i, s)
+    return (s := s[:-1] if strip else s), len(s)
 
 
 def ipsum_decode(text, errors="strict"):
-    s = ""
-    words = text.split(" ")
+    s, words, _h = "", text.split(" "), handle_error("ipsum", errors, decode=True, item="word")
     for i, w in enumerate(words[:-1] if words[-1] == "" else words):
         if w.strip() == "":
             s += " "
@@ -88,8 +88,8 @@ def ipsum_decode(text, errors="strict"):
                     raise KeyError
                 s += w[:len(w)-len(w.lstrip(SCHARS))] + w.strip(SCHARS)[0] + w[len(w.rstrip(SCHARS)):len(w)]
             except KeyError:
-                s += handle_error("ipsum", errors, decode=True, item="word")(w, i)
-    return s, len(text)
+                s += _h(w, i, s)
+    return s, len(s)
 
 
 add("ipsum", ipsum_encode, ipsum_decode, pattern=r"^(?:lorem[-_]?)?ipsum$", printables_rate=1.,

{codext-1.16.2 → codext-1.16.4}/src/codext/others/uuencode.py

@@ -13,10 +13,10 @@ from ..__common__ import *
 
 
 __examples__ = {
-    'enc(uu|uu_codec)': {'this is a test': "begin 666 -\n.=&AI<R!I<R!A('1E<W0 \n \nend\n"},
-    'dec(uu-encode)':   {'.=&AI<R!I<R!A(\'1E<W0 ': "this is a test", '.=&AI<R!I<R!A(\'1E<W0`': "this is a test"},
     'dec(uu-codec)':    {'begin 666 -\n.=&AI<R!I<R!A(\'1E<W0`': None, '.=&AI<R!I<R!A(\'1E<W0`\n\n\n`\nend': None},
     'dec(uu_codec)':    {'begin 777 test.txt\n.=&AI<R!I<R!A(\'1E<W0`\n\n\n`\nend': "this is a test"},
+    'dec(uu-encode)':   {'.=&AI<R!I<R!A(\'1E<W0 ': "this is a test", '.=&AI<R!I<R!A(\'1E<W0`': "this is a test"},
+    'enc(uu|uu_codec)': {'this is a test': "begin 666 -\n.=&AI<R!I<R!A('1E<W0 \n \nend\n"},
     'enc-dec(uu)':      ["begin 666 -\n.=&AI<R!I<R!A(\'1E<W0`", "@random{512,1024,2048}"],
 }
 
@@ -25,11 +25,11 @@ def uu_encode(text, errors="strict"):
     r, t = b"begin 666 -\n", b(text)
     for i in range(0, len(t), 45):
         r += _enc(t[i:i+45])
-    return r + b" \nend\n", len(text)
+    return (r := r + b" \nend\n"), len(r)
 
 
 def uu_decode(text, errors="strict"):
-    h = handle_error("uu", "strict", decode=True, kind="token", item="line")
+    _h = handle_error("uu", "strict", decode=True, kind="token", item="line")
     lines = b(text).strip(b" \t\r\n\f").split(b"\n")
     start, end = re.match(b"^begin [1-7]{3} .*$", lines[0]), re.match(b"^end$", lines[-1])
     if start and end:
@@ -40,15 +40,15 @@ def uu_decode(text, errors="strict"):
         if errors == "ignore":
             lines = lines[1:] if start else lines[:-1]
         elif end:
-            h(lines[0], 0)
+            _h(lines[0], 0)
         elif start:
-            h(lines[-1], len(lines)-1)
+            _h(lines[-1], len(lines)-1)
     while len(lines) > 0 and lines[-1].strip(b" \t\r\n\f") in [b"", b"`"]:
         lines = lines[:-1]
     r = b""
     for l in lines:
         r += _dec(l.strip(b" \t\r\n\f"))
-    return r, len(text)
+    return r, len(r)
 
 
 add("uu", uu_encode, uu_decode, pattern=r"^uu(?:[-_]?encode|[-_]codec)?$",