rtty-soda 0.2.3__py3-none-any.whl → 0.2.4__py3-none-any.whl

rtty_soda/cli_io.py

@@ -1,7 +1,7 @@
 import random
 import re
 import string
-from typing import TYPE_CHECKING, TextIO, cast
+from typing import TYPE_CHECKING, BinaryIO, TextIO, cast
 
 if TYPE_CHECKING:
     from pathlib import Path
@@ -15,6 +15,7 @@ __all__ = [
     "pad_newlines",
     "print_stats",
     "read_bytes",
+    "read_ciphertext_bytes",
     "read_encoded_stripped",
     "read_key_bytes",
     "read_password_bytes",
@@ -31,6 +32,11 @@ def read_str(source: Path) -> str:
         return cast("TextIO", fd).read()
 
 
+def read_bytes(source: Path) -> bytes:
+    with click.open_file(source, mode="rb") as fd:
+        return cast("BinaryIO", fd).read()
+
+
 def remove_whitespace(data: str) -> str:
     return re.sub(r"\s", "", data)
 
@@ -41,15 +47,15 @@ def read_encoded_stripped(source: Path) -> bytes:
     return encode_str(data)
 
 
-def read_bytes(source: Path, encoder: Encoder) -> bytes:
+def read_ciphertext_bytes(source: Path, encoder: Encoder) -> bytes:
     if encoder.is_binary:
-        return source.read_bytes()
+        return read_bytes(source)
 
     return read_encoded_stripped(source)
 
 
 def read_key_bytes(source: Path, encoder: Encoder) -> bytes:
-    key = read_bytes(source, encoder)
+    key = read_ciphertext_bytes(source, encoder)
     return encoder.decode(key)
 
 

rtty_soda/main.py

@@ -9,6 +9,7 @@ from rtty_soda.cli_io import (
     format_output,
     print_stats,
     read_bytes,
+    read_ciphertext_bytes,
     read_key_bytes,
     read_password_bytes,
     write_output,
@@ -211,7 +212,7 @@ def encrypt_public_cmd(
     priv = PrivateKey(private_key=priv)
     pub = read_key_bytes(source=public_key_file, encoder=key_enc)
     pub = PublicKey(public_key=pub)
-    plaintext = message_file.read_bytes()
+    plaintext = read_bytes(message_file)
     data = archiver(plaintext)
     data = public.encrypt(private=priv, public=pub, data=data)
     ciphertext = data_enc.encode(data)
@@ -272,7 +273,7 @@ def encrypt_secret_cmd(
     archiver = ARCHIVERS[compression]
 
     key = read_key_bytes(source=key_file, encoder=key_enc)
-    plaintext = message_file.read_bytes()
+    plaintext = read_bytes(message_file)
     data = archiver(plaintext)
     data = secret.encrypt(key=key, data=data)
     ciphertext = data_enc.encode(data)
@@ -336,7 +337,7 @@ def encrypt_password_cmd(
 
     pw = read_password_bytes(password_file)
     key = kdf(password=pw, profile=prof)
-    plaintext = message_file.read_bytes()
+    plaintext = read_bytes(message_file)
     data = archiver(plaintext)
     data = secret.encrypt(key=key, data=data)
     ciphertext = data_enc.encode(data)
@@ -396,7 +397,7 @@ def decrypt_public_cmd(
     priv = PrivateKey(private_key=priv)
     pub = read_key_bytes(source=public_key_file, encoder=key_enc)
     pub = PublicKey(public_key=pub)
-    ciphertext = read_bytes(source=message_file, encoder=data_enc)
+    ciphertext = read_ciphertext_bytes(source=message_file, encoder=data_enc)
     data = data_enc.decode(ciphertext)
     data = public.decrypt(private=priv, public=pub, data=data)
     plaintext = unarchiver(data)
@@ -443,7 +444,7 @@ def decrypt_secret_cmd(
     unarchiver = UNARCHIVERS[compression]
 
     key = read_key_bytes(source=key_file, encoder=key_enc)
-    ciphertext = read_bytes(source=message_file, encoder=data_enc)
+    ciphertext = read_ciphertext_bytes(source=message_file, encoder=data_enc)
     data = data_enc.decode(ciphertext)
     data = secret.decrypt(key=key, data=data)
     plaintext = unarchiver(data)
@@ -493,7 +494,7 @@ def decrypt_password_cmd(
 
     pw = read_password_bytes(password_file)
     key = kdf(password=pw, profile=prof)
-    ciphertext = read_bytes(source=message_file, encoder=data_enc)
+    ciphertext = read_ciphertext_bytes(source=message_file, encoder=data_enc)
     data = data_enc.decode(ciphertext)
     data = secret.decrypt(key=key, data=data)
     plaintext = unarchiver(data)
@@ -532,7 +533,7 @@ def encode_cmd(
     in_enc = ENCODERS[in_encoding]
     out_enc = ENCODERS[out_encoding]
 
-    data = read_bytes(source=file, encoder=in_enc)
+    data = read_ciphertext_bytes(source=file, encoder=in_enc)
     data = in_enc.decode(data)
     data = out_enc.encode(data)
 

{rtty_soda-0.2.3.dist-info → rtty_soda-0.2.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rtty-soda
-Version: 0.2.3
+Version: 0.2.4
 Summary: A CLI tool for Unix-like environments to encrypt a RTTY session using NaCl
 Keywords: cli,encryption,libsodium,nacl,rtty
 Author: Theo Saveliev
@@ -57,8 +57,8 @@ A CLI tool for Unix-like environments to encrypt a RTTY session using NaCl.
 #### Docker
 
 ```
-% docker run -it --rm -h rtty-soda -v .:/app/host nett/rtty-soda:0.2.3
-% docker run -it --rm -h rtty-soda -v .:/app/host nett/rtty-soda:0.2.3-tools
+% docker run -it --rm -h rtty-soda -v .:/app/host nett/rtty-soda:0.2.4
+% docker run -it --rm -h rtty-soda -v .:/app/host nett/rtty-soda:0.2.4-tools
 ```
 
 

{rtty_soda-0.2.3.dist-info → rtty_soda-0.2.4.dist-info}/RECORD

@@ -1,6 +1,6 @@
 rtty_soda/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rtty_soda/archivers.py,sha256=b-qZ6-MAY1rm1Jsosi2XEfjNjkU7acAedHmnSzthf-A,1343
-rtty_soda/cli_io.py,sha256=mkCYMp_Cm9pKvvS7OE2KSeXzRVjoHfTlfqVGjyCnCyY,3040
+rtty_soda/cli_io.py,sha256=d99l3RSXJ5W3H9E-KFJYzAWzW8bn0F3F6o83DtMLfQs,3235
 rtty_soda/cryptography/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rtty_soda/cryptography/kdf.py,sha256=HymfTiK7BD7lhZu0OdtFW_i-v0r7e8XedT8_Q84ClJc,1529
 rtty_soda/cryptography/public.py,sha256=6gwsT4ilaMDHwtdYPOEYlX8IfwHPew8lMIbxRva1mLs,612
@@ -14,10 +14,10 @@ rtty_soda/encoders/base94_encoder.py,sha256=Xbt0chbeAIM9_nRHVhRMVfMBUKS9q1gNSpg2
 rtty_soda/encoders/encoder.py,sha256=trHunjg0uNEQrQWTpRMY5nQEx5_jBrcvfUAcGIKpgms,220
 rtty_soda/encoders/functions.py,sha256=JxtgbZg3kdbFqAhjm59QwJS6zEXYsR1m02k7cg_rFI4,1385
 rtty_soda/encoders/raw_encoder.py,sha256=eJnUSsxf3jichdQ5LqwvBZAX7-qk67p5FMlfKOOGHp8,259
-rtty_soda/main.py,sha256=OEaefD5VxbL6P4NWWtNb9Am9wJegkesg29xzjYy1oxU,17319
+rtty_soda/main.py,sha256=BlyrKtBebzAvZzrJnEt7DII48nIiBfxUnQ-njpFjTU8,17387
 rtty_soda/main.pyi,sha256=SoTM1GXACRafCtwwLOI1X9YhvEo3DPoaPtKSgWacSS0,2242
 rtty_soda/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rtty_soda-0.2.3.dist-info/WHEEL,sha256=M6du7VZflc4UPsGphmOXHANdgk8zessdJG0DBUuoA-U,78
-rtty_soda-0.2.3.dist-info/entry_points.txt,sha256=tFROKkaDoE_p5tM2ko7MoAjWBFurchcw3j-MdObxBU0,45
-rtty_soda-0.2.3.dist-info/METADATA,sha256=BZR-y-ilDaepE0j8RuckR-IHCK1nPeMUCq96ySPxnp0,8603
-rtty_soda-0.2.3.dist-info/RECORD,,
+rtty_soda-0.2.4.dist-info/WHEEL,sha256=M6du7VZflc4UPsGphmOXHANdgk8zessdJG0DBUuoA-U,78
+rtty_soda-0.2.4.dist-info/entry_points.txt,sha256=tFROKkaDoE_p5tM2ko7MoAjWBFurchcw3j-MdObxBU0,45
+rtty_soda-0.2.4.dist-info/METADATA,sha256=kAzdyA6WLijrbBk8TgWGsgnSbAj8PMMA4N4g3Y1IpXU,8603
+rtty_soda-0.2.4.dist-info/RECORD,,