transcrypto 1.8.0__py3-none-any.whl → 2.0.3__py3-none-any.whl

transcrypto/__init__.py

@@ -3,5 +3,5 @@
 """Basic cryptography primitives implementation."""
 
 __all__: list[str] = ['__author__', '__version__']
-__version__ = '1.8.0'  # remember to also update pyproject.toml
+__version__ = '2.0.3'  # remember to also update pyproject.toml
 __author__ = 'Daniel Balparda <balparda@github.com>'

transcrypto/cli/aeshash.py

@@ -10,8 +10,10 @@ import re
 import click
 import typer
 
-from transcrypto import aes, base, transcrypto
+from transcrypto import transcrypto
 from transcrypto.cli import clibase
+from transcrypto.core import aes, hashes
+from transcrypto.utils import base
 
 _HEX_RE = re.compile(r'^[0-9a-fA-F]+$')
 
@@ -39,12 +41,12 @@ transcrypto.app.add_typer(hash_app, name='hash')
 @clibase.CLIErrorGuard
 def Hash256(  # documentation is help/epilog/args # noqa: D103
   *,
-  ctx: typer.Context,
+  ctx: click.Context,
   data: str = typer.Argument(..., help='Input data (raw text; or `--input-format <hex|b64|bin>`)'),
 ) -> None:
   config: transcrypto.TransConfig = ctx.obj
   bt: bytes = transcrypto.BytesFromText(data, config.input_format)
-  config.console.print(transcrypto.BytesToText(base.Hash256(bt), config.output_format))
+  config.console.print(transcrypto.BytesToText(hashes.Hash256(bt), config.output_format))
 
 
 @hash_app.command(
@@ -63,12 +65,12 @@ def Hash256(  # documentation is help/epilog/args # noqa: D103
 @clibase.CLIErrorGuard
 def Hash512(  # documentation is help/epilog/args # noqa: D103
   *,
-  ctx: typer.Context,
+  ctx: click.Context,
   data: str = typer.Argument(..., help='Input data (raw text; or `--input-format <hex|b64|bin>`)'),
 ) -> None:
   config: transcrypto.TransConfig = ctx.obj
   bt: bytes = transcrypto.BytesFromText(data, config.input_format)
-  config.console.print(transcrypto.BytesToText(base.Hash512(bt), config.output_format))
+  config.console.print(transcrypto.BytesToText(hashes.Hash512(bt), config.output_format))
 
 
 @hash_app.command(
@@ -84,7 +86,7 @@ def Hash512(  # documentation is help/epilog/args # noqa: D103
 @clibase.CLIErrorGuard
 def HashFile(  # documentation is help/epilog/args # noqa: D103
   *,
-  ctx: typer.Context,
+  ctx: click.Context,
   path: pathlib.Path = typer.Argument(  # noqa: B008
     ...,
     exists=True,
@@ -104,7 +106,7 @@ def HashFile(  # documentation is help/epilog/args # noqa: D103
 ) -> None:
   config: transcrypto.TransConfig = ctx.obj
   config.console.print(
-    transcrypto.BytesToText(base.FileHash(str(path), digest=digest), config.output_format)
+    transcrypto.BytesToText(hashes.FileHash(str(path), digest=digest), config.output_format)
   )
 
 
@@ -140,7 +142,7 @@ transcrypto.app.add_typer(aes_app, name='aes')
 @clibase.CLIErrorGuard
 def AESKeyFromPass(  # documentation is help/epilog/args # noqa: D103
   *,
-  ctx: typer.Context,
+  ctx: click.Context,
   password: str = typer.Argument(..., help='Password (leading/trailing spaces ignored)'),
 ) -> None:
   config: transcrypto.TransConfig = ctx.obj
@@ -174,7 +176,7 @@ def AESKeyFromPass(  # documentation is help/epilog/args # noqa: D103
 @clibase.CLIErrorGuard
 def AESEncrypt(  # documentation is help/epilog/args # noqa: D103
   *,
-  ctx: typer.Context,
+  ctx: click.Context,
   plaintext: str = typer.Argument(..., help='Input data to encrypt (PT)'),
   key: str | None = typer.Option(
     None, '-k', '--key', help="Key if `-p`/`--key-path` wasn't used (32 bytes)"
@@ -226,7 +228,7 @@ def AESEncrypt(  # documentation is help/epilog/args # noqa: D103
 @clibase.CLIErrorGuard
 def AESDecrypt(  # documentation is help/epilog/args # noqa: D103
   *,
-  ctx: typer.Context,
+  ctx: click.Context,
   ciphertext: str = typer.Argument(..., help='Input data to decrypt (CT)'),
   key: str | None = typer.Option(
     None, '-k', '--key', help="Key if `-p`/`--key-path` wasn't used (32 bytes)"
@@ -287,7 +289,7 @@ aes_app.add_typer(aes_ecb_app, name='ecb')
 @clibase.CLIErrorGuard
 def AESECBEncrypt(  # documentation is help/epilog/args # noqa: D103
   *,
-  ctx: typer.Context,
+  ctx: click.Context,
   plaintext: str = typer.Argument(..., help='Plaintext block as 32 hex chars (16-bytes)'),
   key: str | None = typer.Option(
     None,
@@ -336,7 +338,7 @@ def AESECBEncrypt(  # documentation is help/epilog/args # noqa: D103
 @clibase.CLIErrorGuard
 def AESECBDecrypt(  # documentation is help/epilog/args # noqa: D103
   *,
-  ctx: typer.Context,
+  ctx: click.Context,
   ciphertext: str = typer.Argument(..., help='Ciphertext block as 32 hex chars (16-bytes)'),
   key: str | None = typer.Option(
     None,

transcrypto/cli/bidsecret.py

@@ -6,10 +6,13 @@ from __future__ import annotations
 
 import glob
 
+import click
 import typer
 
-from transcrypto import base, sss, transcrypto
+from transcrypto import transcrypto
 from transcrypto.cli import clibase
+from transcrypto.core import bid, sss
+from transcrypto.utils import base
 
 # ================================== "BID" COMMAND =================================================
 
@@ -39,14 +42,14 @@ transcrypto.app.add_typer(bid_app, name='bid')
 @clibase.CLIErrorGuard
 def BidNew(  # documentation is help/epilog/args # noqa: D103
   *,
-  ctx: typer.Context,
+  ctx: click.Context,
   secret: str = typer.Argument(..., help='Input data to bid to, the protected "secret"'),
 ) -> None:
   config: transcrypto.TransConfig = ctx.obj
   base_path: str = transcrypto.RequireKeyPath(config, 'bid')
   secret_bytes: bytes = transcrypto.BytesFromText(secret, config.input_format)
-  bid_priv: base.PrivateBid512 = base.PrivateBid512.New(secret_bytes)
-  bid_pub: base.PublicBid512 = base.PublicBid512.Copy(bid_priv)
+  bid_priv: bid.PrivateBid512 = bid.PrivateBid512.New(secret_bytes)
+  bid_pub: bid.PublicBid512 = bid.PublicBid512.Copy(bid_priv)
   transcrypto.SaveObj(bid_priv, base_path + '.priv', config.protect)
   transcrypto.SaveObj(bid_pub, base_path + '.pub', config.protect)
   config.console.print(f'Bid private/public commitments saved to {base_path + ".priv/.pub"!r}')
@@ -64,16 +67,16 @@ def BidNew(  # documentation is help/epilog/args # noqa: D103
   ),
 )
 @clibase.CLIErrorGuard
-def BidVerify(*, ctx: typer.Context) -> None:  # documentation is help/epilog/args # noqa: D103
+def BidVerify(*, ctx: click.Context) -> None:  # documentation is help/epilog/args # noqa: D103
   config: transcrypto.TransConfig = ctx.obj
   base_path: str = transcrypto.RequireKeyPath(config, 'bid')
-  bid_priv: base.PrivateBid512 = transcrypto.LoadObj(
-    base_path + '.priv', config.protect, base.PrivateBid512
+  bid_priv: bid.PrivateBid512 = transcrypto.LoadObj(
+    base_path + '.priv', config.protect, bid.PrivateBid512
   )
-  bid_pub: base.PublicBid512 = transcrypto.LoadObj(
-    base_path + '.pub', config.protect, base.PublicBid512
+  bid_pub: bid.PublicBid512 = transcrypto.LoadObj(
+    base_path + '.pub', config.protect, bid.PublicBid512
   )
-  bid_pub_expect: base.PublicBid512 = base.PublicBid512.Copy(bid_priv)
+  bid_pub_expect: bid.PublicBid512 = bid.PublicBid512.Copy(bid_priv)
   config.console.print(
     'Bid commitment: '
     + (
@@ -120,7 +123,7 @@ transcrypto.app.add_typer(sss_app, name='sss')
 @clibase.CLIErrorGuard
 def SSSNew(  # documentation is help/epilog/args # noqa: D103
   *,
-  ctx: typer.Context,
+  ctx: click.Context,
   minimum: int = typer.Argument(
     ..., min=2, help='Minimum number of shares required to recover secret, ≥ 2'
   ),
@@ -161,7 +164,7 @@ def SSSNew(  # documentation is help/epilog/args # noqa: D103
 @clibase.CLIErrorGuard
 def SSSRawShares(  # documentation is help/epilog/args # noqa: D103
   *,
-  ctx: typer.Context,
+  ctx: click.Context,
   secret: str = typer.Argument(..., help='Integer secret to be protected, 1≤`secret`<*modulus*'),
   count: int = typer.Argument(
     ...,
@@ -206,7 +209,7 @@ def SSSRawShares(  # documentation is help/epilog/args # noqa: D103
   ),
 )
 @clibase.CLIErrorGuard
-def SSSRawRecover(*, ctx: typer.Context) -> None:  # documentation is help/epilog/args # noqa: D103
+def SSSRawRecover(*, ctx: click.Context) -> None:  # documentation is help/epilog/args # noqa: D103
   config: transcrypto.TransConfig = ctx.obj
   base_path: str = transcrypto.RequireKeyPath(config, 'sss')
   sss_pub: sss.ShamirSharedSecretPublic = transcrypto.LoadObj(
@@ -241,7 +244,7 @@ def SSSRawRecover(*, ctx: typer.Context) -> None:  # documentation is help/epilo
 @clibase.CLIErrorGuard
 def SSSRawVerify(  # documentation is help/epilog/args # noqa: D103
   *,
-  ctx: typer.Context,
+  ctx: click.Context,
   secret: str = typer.Argument(..., help='Integer secret used to generate the shares, ≥ 1'),
 ) -> None:
   config: transcrypto.TransConfig = ctx.obj
@@ -273,7 +276,7 @@ def SSSRawVerify(  # documentation is help/epilog/args # noqa: D103
 @clibase.CLIErrorGuard
 def SSSShares(  # documentation is help/epilog/args # noqa: D103
   *,
-  ctx: typer.Context,
+  ctx: click.Context,
   secret: str = typer.Argument(..., help='Secret to be protected'),
   count: int = typer.Argument(
     ...,
@@ -314,7 +317,7 @@ def SSSShares(  # documentation is help/epilog/args # noqa: D103
   ),
 )
 @clibase.CLIErrorGuard
-def SSSRecover(*, ctx: typer.Context) -> None:  # documentation is help/epilog/args # noqa: D103
+def SSSRecover(*, ctx: click.Context) -> None:  # documentation is help/epilog/args # noqa: D103
   config: transcrypto.TransConfig = ctx.obj
   base_path: str = transcrypto.RequireKeyPath(config, 'sss')
   subset: list[sss.ShamirSharePrivate] = []

transcrypto/cli/clibase.py

@@ -7,8 +7,6 @@ from __future__ import annotations
 import dataclasses
 import functools
 import logging
-import os
-import threading
 from collections import abc
 from typing import cast
 
@@ -16,139 +14,21 @@ import click
 import typer
 from click import testing as click_testing
 from rich import console as rich_console
-from rich import logging as rich_logging
 
-from transcrypto import base
+from transcrypto.utils import base
+from transcrypto.utils import logging as tc_logging
 
-# Logging
-_LOG_FORMAT_NO_PROCESS: str = '%(funcName)s: %(message)s'
-_LOG_FORMAT_WITH_PROCESS: str = '%(processName)s/' + _LOG_FORMAT_NO_PROCESS
-_LOG_FORMAT_DATETIME: str = '[%Y%m%d-%H:%M:%S]'  # e.g., [20240131-13:45:30]
-_LOG_LEVELS: dict[int, int] = {
-  0: logging.ERROR,
-  1: logging.WARNING,
-  2: logging.INFO,
-  3: logging.DEBUG,
-}
-_LOG_COMMON_PROVIDERS: set[str] = {
-  'werkzeug',
-  'gunicorn.error',
-  'gunicorn.access',
-  'uvicorn',
-  'uvicorn.error',
-  'uvicorn.access',
-  'django.server',
-}
 
-__console_lock: threading.RLock = threading.RLock()
-__console_singleton: rich_console.Console | None = None
-
-
-def Console() -> rich_console.Console:
-  """Get the global console instance.
-
-  Returns:
-    rich.console.Console: The global console instance.
-
-  """
-  with __console_lock:
-    if __console_singleton is None:
-      return rich_console.Console()  # fallback console if InitLogging hasn't been called yet
-    return __console_singleton
-
-
-def ResetConsole() -> None:
-  """Reset the global console instance."""
-  global __console_singleton  # noqa: PLW0603
-  with __console_lock:
-    __console_singleton = None
-
-
-def InitLogging(
-  verbosity: int,
-  /,
-  *,
-  include_process: bool = False,
-  soft_wrap: bool = False,
-  color: bool | None = False,
-) -> tuple[rich_console.Console, int, bool]:
-  """Initialize logger (with RichHandler) and get a rich.console.Console singleton.
-
-  This method will also return the actual decided values for verbosity and color use.
-  If you have a CLI app that uses this, its pytests should call `ResetConsole()` in a fixture, like:
-
-      from transcrypto import logging
-      @pytest.fixture(autouse=True)
-      def _reset_base_logging() -> Generator[None, None, None]:  # type: ignore
-        logging.ResetConsole()
-        yield  # stop
-
-  Args:
-    verbosity (int): Logging verbosity level: 0==ERROR, 1==WARNING, 2==INFO, 3==DEBUG
-    include_process (bool, optional): Whether to include process name in log output.
-    soft_wrap (bool, optional): Whether to enable soft wrapping in the console.
-        Default is False, and it means rich will hard-wrap long lines (by adding line breaks).
-    color (bool | None, optional): Whether to enable/disable color output in the console.
-        If None, respects NO_COLOR env var.
-
-  Returns:
-    tuple[rich_console.Console, int, bool]:
-        (The initialized console instance, actual log level, actual color use)
+@dataclasses.dataclass(kw_only=True, slots=True, frozen=True)
+class CLIConfig:
+  """CLI global context, storing the configuration.
 
-  Raises:
-    RuntimeError: if you call this more than once
+  Attributes:
+    console (rich_console.Console): Rich console instance for output
+    verbose (int): Verbosity level (0-3)
+    color (bool | None): Color preference (None=auto, True=force, False=disable)
 
   """
-  global __console_singleton  # noqa: PLW0603
-  with __console_lock:
-    if __console_singleton is not None:
-      raise RuntimeError(
-        'calling InitLogging() more than once is forbidden; '
-        'use Console() to get a console after first creation'
-      )
-    # set level
-    logging_level: int = _LOG_LEVELS.get(min(verbosity, 3), logging.ERROR)
-    # respect NO_COLOR unless the caller has already decided (treat env presence as "disable color")
-    no_color: bool = (
-      False
-      if (os.getenv('NO_COLOR') is None and color is None)
-      else ((os.getenv('NO_COLOR') is not None) if color is None else (not color))
-    )
-    # create console and configure logging
-    console = rich_console.Console(soft_wrap=soft_wrap, no_color=no_color)
-    logging.basicConfig(
-      level=logging_level,
-      format=_LOG_FORMAT_WITH_PROCESS if include_process else _LOG_FORMAT_NO_PROCESS,
-      datefmt=_LOG_FORMAT_DATETIME,
-      handlers=[
-        rich_logging.RichHandler(  # we show name/line, but want time & level
-          console=console,
-          rich_tracebacks=True,
-          show_time=True,
-          show_level=True,
-          show_path=True,
-        ),
-      ],
-      force=True,  # force=True to override any previous logging config
-    )
-    # configure common loggers
-    logging.captureWarnings(True)
-    for name in _LOG_COMMON_PROVIDERS:
-      log: logging.Logger = logging.getLogger(name)
-      log.handlers.clear()
-      log.propagate = True
-      log.setLevel(logging_level)
-    __console_singleton = console  # need a global statement to re-bind this one
-    logging.info(
-      f'Logging initialized at level {logging.getLevelName(logging_level)} / '
-      f'{"NO " if no_color else ""}COLOR'
-    )
-    return (console, logging_level, not no_color)
-
-
-@dataclasses.dataclass(kw_only=True, slots=True, frozen=True)
-class CLIConfig:
-  """CLI global context, storing the configuration."""
 
   console: rich_console.Console
   verbose: int
@@ -171,10 +51,10 @@ def CLIErrorGuard[**P](fn: abc.Callable[P, None], /) -> abc.Callable[P, None]:
     except (base.Error, ValueError) as err:
       # get context
       ctx: object | None = dict(kwargs).get('ctx')
-      if not isinstance(ctx, typer.Context):
-        ctx = next((a for a in args if isinstance(a, typer.Context)), None)
+      if not isinstance(ctx, click.Context):
+        ctx = next((a for a in args if isinstance(a, click.Context)), None)
       # print error nicely
-      if isinstance(ctx, typer.Context):
+      if isinstance(ctx, click.Context):
         # we have context
         obj: CLIConfig = cast('CLIConfig', ctx.obj)
         if obj.verbose >= 2:  # verbose >= 2 means INFO level or more verbose  # noqa: PLR2004
@@ -183,29 +63,29 @@ def CLIErrorGuard[**P](fn: abc.Callable[P, None], /) -> abc.Callable[P, None]:
           obj.console.print(str(err))  # print only error message
       # no context
       elif logging.getLogger().getEffectiveLevel() < logging.INFO:
-        Console().print(str(err))  # print only error message (DEBUG level is verbose already)
+        tc_logging.Console().print(str(err))  # print only error message (DEBUG is verbose already)
       else:
-        Console().print_exception()  # print full traceback (less verbose mode needs it)
+        tc_logging.Console().print_exception()  # print full traceback (less verbose mode needs it)
 
   return _Wrapper
 
 
 def _ClickWalk(
   command: click.Command,
-  ctx: typer.Context,
+  ctx: click.Context,
   path: list[str],
   /,
-) -> abc.Iterator[tuple[list[str], click.Command, typer.Context]]:
+) -> abc.Iterator[tuple[list[str], click.Command, click.Context]]:
   """Recursively walk Click commands/groups.
 
   Yields:
-    tuple[list[str], click.Command, typer.Context]: path, command, ctx
+    tuple[list[str], click.Command, click.Context]: path, command, ctx
 
   """
   yield (path, command, ctx)  # yield self
   # now walk subcommands, if any
   sub_cmd: click.Command | None
-  sub_ctx: typer.Context
+  sub_ctx: click.Context
   # prefer the explicit `.commands` mapping when present; otherwise fall back to
   # click's `list_commands()`/`get_command()` for dynamic groups
   if not isinstance(command, click.Group):
@@ -213,7 +93,7 @@ def _ClickWalk(
   # explicit commands mapping
   if command.commands:
     for name, sub_cmd in sorted(command.commands.items()):
-      sub_ctx = typer.Context(sub_cmd, info_name=name, parent=ctx)
+      sub_ctx = click.Context(sub_cmd, info_name=name, parent=ctx)
       yield from _ClickWalk(sub_cmd, sub_ctx, [*path, name])
     return
   # dynamic commands
@@ -221,7 +101,7 @@ def _ClickWalk(
     sub_cmd = command.get_command(ctx, name)
     if sub_cmd is None:
       continue  # skip invalid subcommands
-    sub_ctx = typer.Context(sub_cmd, info_name=name, parent=ctx)
+    sub_ctx = click.Context(sub_cmd, info_name=name, parent=ctx)
     yield from _ClickWalk(sub_cmd, sub_ctx, [*path, name])
 
 
@@ -260,14 +140,14 @@ def GenerateTyperHelpMarkdown(
   """
   # prepare Click root command and context
   click_root: click.Command = typer.main.get_command(typer_app)
-  root_ctx: typer.Context = typer.Context(click_root, info_name=prog_name)
+  root_ctx: click.Context = click.Context(click_root, info_name=prog_name)
   runner = click_testing.CliRunner()
   parts: list[str] = []
   for path, _, _ in _ClickWalk(click_root, root_ctx, []):
     # build command path
     command_path: str = ' '.join([prog_name, *path]).strip()
     heading_prefix: str = '#' * max(1, heading_level + len(path))
-    ResetConsole()  # ensure clean state for each command (also it raises on duplicate loggers)
+    tc_logging.ResetConsole()  # ensure clean state for the command
     # invoke --help for this command path
     result: click_testing.Result = runner.invoke(
       click_root,

transcrypto/cli/intmath.py

@@ -4,10 +4,13 @@
 
 from __future__ import annotations
 
+import click
 import typer
 
-from transcrypto import base, modmath, transcrypto
+from transcrypto import transcrypto
 from transcrypto.cli import clibase
+from transcrypto.core import modmath
+from transcrypto.utils import base, saferandom
 
 # =============================== "PRIME"-like COMMANDS ============================================
 
@@ -26,7 +29,7 @@ from transcrypto.cli import clibase
 @clibase.CLIErrorGuard
 def IsPrimeCLI(  # documentation is help/epilog/args # noqa: D103
   *,
-  ctx: typer.Context,
+  ctx: click.Context,
   n: str = typer.Argument(..., help='Integer to test, ≥ 1'),
 ) -> None:
   config: transcrypto.TransConfig = ctx.obj
@@ -42,7 +45,7 @@ def IsPrimeCLI(  # documentation is help/epilog/args # noqa: D103
 @clibase.CLIErrorGuard
 def PrimeGenCLI(  # documentation is help/epilog/args # noqa: D103
   *,
-  ctx: typer.Context,
+  ctx: click.Context,
   start: str = typer.Argument(..., help='Starting integer (inclusive), ≥ 0'),
   count: int = typer.Option(1, '-c', '--count', min=1, help='How many to print, ≥ 1'),
 ) -> None:
@@ -75,7 +78,7 @@ def PrimeGenCLI(  # documentation is help/epilog/args # noqa: D103
 @clibase.CLIErrorGuard
 def MersenneCLI(  # documentation is help/epilog/args # noqa: D103
   *,
-  ctx: typer.Context,
+  ctx: click.Context,
   min_k: int = typer.Option(2, '-k', '--min-k', min=1, help='Starting exponent `k`, ≥ 2'),
   max_k: int = typer.Option(10000, '-m', '--max-k', min=1, help='Stop once `k` > `max-k`, ≥ 2'),
 ) -> None:
@@ -107,7 +110,7 @@ def MersenneCLI(  # documentation is help/epilog/args # noqa: D103
 @clibase.CLIErrorGuard
 def GcdCLI(  # documentation is help/epilog/args # noqa: D103
   *,
-  ctx: typer.Context,
+  ctx: click.Context,
   a: str = typer.Argument(..., help='Integer, ≥ 0'),
   b: str = typer.Argument(..., help="Integer, ≥ 0 (can't be both zero)"),
 ) -> None:
@@ -116,7 +119,7 @@ def GcdCLI(  # documentation is help/epilog/args # noqa: D103
   b_i: int = transcrypto.ParseInt(b, min_value=0)
   if a_i == 0 and b_i == 0:
     raise base.InputError("`a` and `b` can't both be zero")
-  config.console.print(base.GCD(a_i, b_i))
+  config.console.print(modmath.GCD(a_i, b_i))
 
 
 @transcrypto.app.command(
@@ -138,7 +141,7 @@ def GcdCLI(  # documentation is help/epilog/args # noqa: D103
 @clibase.CLIErrorGuard
 def XgcdCLI(  # documentation is help/epilog/args # noqa: D103
   *,
-  ctx: typer.Context,
+  ctx: click.Context,
   a: str = typer.Argument(..., help='Integer, ≥ 0'),
   b: str = typer.Argument(..., help="Integer, ≥ 0 (can't be both zero)"),
 ) -> None:
@@ -147,7 +150,7 @@ def XgcdCLI(  # documentation is help/epilog/args # noqa: D103
   b_i: int = transcrypto.ParseInt(b, min_value=0)
   if a_i == 0 and b_i == 0:
     raise base.InputError("`a` and `b` can't both be zero")
-  config.console.print(str(base.ExtendedGCD(a_i, b_i)))
+  config.console.print(str(modmath.ExtendedGCD(a_i, b_i)))
 
 
 # ================================= "RANDOM" COMMAND ===============================================
@@ -168,11 +171,11 @@ transcrypto.app.add_typer(random_app, name='random')
 @clibase.CLIErrorGuard
 def RandomBits(  # documentation is help/epilog/args # noqa: D103
   *,
-  ctx: typer.Context,
+  ctx: click.Context,
   bits: int = typer.Argument(..., min=8, help='Number of bits, ≥ 8'),
 ) -> None:
   config: transcrypto.TransConfig = ctx.obj
-  config.console.print(base.RandBits(bits))
+  config.console.print(saferandom.RandBits(bits))
 
 
 @random_app.command(
@@ -183,14 +186,14 @@ def RandomBits(  # documentation is help/epilog/args # noqa: D103
 @clibase.CLIErrorGuard
 def RandomInt(  # documentation is help/epilog/args # noqa: D103
   *,
-  ctx: typer.Context,
+  ctx: click.Context,
   min_: str = typer.Argument(..., help='Minimum, ≥ 0'),
   max_: str = typer.Argument(..., help='Maximum, > `min`'),
 ) -> None:
   config: transcrypto.TransConfig = ctx.obj
   min_i: int = transcrypto.ParseInt(min_, min_value=0)
   max_i: int = transcrypto.ParseInt(max_, min_value=min_i + 1)
-  config.console.print(base.RandInt(min_i, max_i))
+  config.console.print(saferandom.RandInt(min_i, max_i))
 
 
 @random_app.command(
@@ -205,11 +208,11 @@ def RandomInt(  # documentation is help/epilog/args # noqa: D103
 @clibase.CLIErrorGuard
 def RandomBytes(  # documentation is help/epilog/args # noqa: D103
   *,
-  ctx: typer.Context,
+  ctx: click.Context,
   n: int = typer.Argument(..., min=1, help='Number of bytes, ≥ 1'),
 ) -> None:
   config: transcrypto.TransConfig = ctx.obj
-  config.console.print(transcrypto.BytesToText(base.RandBytes(n), config.output_format))
+  config.console.print(transcrypto.BytesToText(saferandom.RandBytes(n), config.output_format))
 
 
 @random_app.command(
@@ -220,7 +223,7 @@ def RandomBytes(  # documentation is help/epilog/args # noqa: D103
 @clibase.CLIErrorGuard
 def RandomPrime(  # documentation is help/epilog/args # noqa: D103
   *,
-  ctx: typer.Context,
+  ctx: click.Context,
   bits: int = typer.Argument(..., min=11, help='Bit length, ≥ 11'),
 ) -> None:
   config: transcrypto.TransConfig = ctx.obj
@@ -256,7 +259,7 @@ transcrypto.app.add_typer(mod_app, name='mod')
 @clibase.CLIErrorGuard
 def ModInv(  # documentation is help/epilog/args # noqa: D103
   *,
-  ctx: typer.Context,
+  ctx: click.Context,
   a: str = typer.Argument(..., help='Integer to invert'),
   m: str = typer.Argument(..., help='Modulus `m`, ≥ 2'),
 ) -> None:
@@ -286,7 +289,7 @@ def ModInv(  # documentation is help/epilog/args # noqa: D103
 @clibase.CLIErrorGuard
 def ModDiv(  # documentation is help/epilog/args # noqa: D103
   *,
-  ctx: typer.Context,
+  ctx: click.Context,
   x: str = typer.Argument(..., help='Integer'),
   y: str = typer.Argument(..., help='Integer, cannot be zero'),
   m: str = typer.Argument(..., help='Modulus `m`, ≥ 2'),
@@ -315,7 +318,7 @@ def ModDiv(  # documentation is help/epilog/args # noqa: D103
 @clibase.CLIErrorGuard
 def ModExp(  # documentation is help/epilog/args # noqa: D103
   *,
-  ctx: typer.Context,
+  ctx: click.Context,
   a: str = typer.Argument(..., help='Integer value'),
   e: str = typer.Argument(..., help='Integer exponent, ≥ 0'),
   m: str = typer.Argument(..., help='Modulus `m`, ≥ 2'),
@@ -344,7 +347,7 @@ def ModExp(  # documentation is help/epilog/args # noqa: D103
 @clibase.CLIErrorGuard
 def ModPoly(  # documentation is help/epilog/args # noqa: D103
   *,
-  ctx: typer.Context,
+  ctx: click.Context,
   x: str = typer.Argument(..., help='Evaluation point `x`'),
   m: str = typer.Argument(..., help='Modulus `m`, ≥ 2'),
   coeff: list[str] = typer.Argument(  # noqa: B008
@@ -376,7 +379,7 @@ def ModPoly(  # documentation is help/epilog/args # noqa: D103
 @clibase.CLIErrorGuard
 def ModLagrange(  # documentation is help/epilog/args # noqa: D103
   *,
-  ctx: typer.Context,
+  ctx: click.Context,
   x: str = typer.Argument(..., help='Evaluation point `x`'),
   m: str = typer.Argument(..., help='Modulus `m`, ≥ 2'),
   pt: list[str] = typer.Argument(  # noqa: B008
@@ -410,7 +413,7 @@ def ModLagrange(  # documentation is help/epilog/args # noqa: D103
 @clibase.CLIErrorGuard
 def ModCRT(  # documentation is help/epilog/args # noqa: D103
   *,
-  ctx: typer.Context,
+  ctx: click.Context,
   a1: str = typer.Argument(..., help='Integer residue for first congruence'),
   m1: str = typer.Argument(..., help='Modulus `m1`, ≥ 2'),
   a2: str = typer.Argument(..., help='Integer residue for second congruence'),