From 04f1c3067c1db7238e8faac75173e7a7ac572146 Mon Sep 17 00:00:00 2001 From: Leo Vasanko Date: Wed, 12 Nov 2025 11:43:04 -0600 Subject: [PATCH] Ruff formatting. --- pyaegis/aegis128l.py | 12 +++--- pyaegis/aegis128x2.py | 12 +++--- pyaegis/aegis128x4.py | 12 +++--- pyaegis/aegis256.py | 12 +++--- pyaegis/aegis256x2.py | 12 +++--- setup.py | 1 - tests/test-vectors/gen.py | 89 --------------------------------------- 7 files changed, 35 insertions(+), 115 deletions(-) delete mode 100755 tests/test-vectors/gen.py diff --git a/pyaegis/aegis128l.py b/pyaegis/aegis128l.py index b9bd781..d76f940 100644 --- a/pyaegis/aegis128l.py +++ b/pyaegis/aegis128l.py @@ -295,9 +295,7 @@ def decrypt( out = bytearray(expected_out) else: if into.nbytes < expected_out: - raise TypeError( - "into length must be at least ct.nbytes - maclen" - ) + raise TypeError("into length must be at least ct.nbytes - maclen") out = into rc = _lib.aegis128l_decrypt( @@ -582,7 +580,9 @@ class Mac: out = into clone = self.clone() - rc = _lib.aegis128l_mac_final(clone._proxy.ptr, ffi.from_buffer(out), memoryview(out).nbytes) + rc = _lib.aegis128l_mac_final( + clone._proxy.ptr, ffi.from_buffer(out), memoryview(out).nbytes + ) if rc != 0: err_num = ffi.errno err_name = errno.errorcode.get(err_num, f"errno_{err_num}") @@ -851,7 +851,9 @@ class Decryptor: err_name = errno.errorcode.get(err_num, f"errno_{err_num}") raise RuntimeError(f"state decrypt update failed: {err_name}") w = int(written[0]) - assert w == expected_out, f"got {w}, expected {expected_out}, ct.nbytes={ct.nbytes}" + assert w == expected_out, ( + f"got {w}, expected {expected_out}, ct.nbytes={ct.nbytes}" + ) return out if into is None else memoryview(out)[:w] # type: ignore def final(self, mac: Buffer) -> None: diff --git a/pyaegis/aegis128x2.py b/pyaegis/aegis128x2.py index eb9bb80..52f8afa 100644 --- a/pyaegis/aegis128x2.py +++ b/pyaegis/aegis128x2.py @@ -295,9 +295,7 @@ def decrypt( out = bytearray(expected_out) else: if into.nbytes < expected_out: - raise TypeError( - "into length must be at least ct.nbytes - maclen" - ) + raise TypeError("into length must be at least ct.nbytes - maclen") out = into rc = _lib.aegis128x2_decrypt( @@ -582,7 +580,9 @@ class Mac: out = into clone = self.clone() - rc = _lib.aegis128x2_mac_final(clone._proxy.ptr, ffi.from_buffer(out), memoryview(out).nbytes) + rc = _lib.aegis128x2_mac_final( + clone._proxy.ptr, ffi.from_buffer(out), memoryview(out).nbytes + ) if rc != 0: err_num = ffi.errno err_name = errno.errorcode.get(err_num, f"errno_{err_num}") @@ -851,7 +851,9 @@ class Decryptor: err_name = errno.errorcode.get(err_num, f"errno_{err_num}") raise RuntimeError(f"state decrypt update failed: {err_name}") w = int(written[0]) - assert w == expected_out, f"got {w}, expected {expected_out}, ct.nbytes={ct.nbytes}" + assert w == expected_out, ( + f"got {w}, expected {expected_out}, ct.nbytes={ct.nbytes}" + ) return out if into is None else memoryview(out)[:w] # type: ignore def final(self, mac: Buffer) -> None: diff --git a/pyaegis/aegis128x4.py b/pyaegis/aegis128x4.py index 1c5dd1b..d5defc8 100644 --- a/pyaegis/aegis128x4.py +++ b/pyaegis/aegis128x4.py @@ -295,9 +295,7 @@ def decrypt( out = bytearray(expected_out) else: if into.nbytes < expected_out: - raise TypeError( - "into length must be at least ct.nbytes - maclen" - ) + raise TypeError("into length must be at least ct.nbytes - maclen") out = into rc = _lib.aegis128x4_decrypt( @@ -582,7 +580,9 @@ class Mac: out = into clone = self.clone() - rc = _lib.aegis128x4_mac_final(clone._proxy.ptr, ffi.from_buffer(out), memoryview(out).nbytes) + rc = _lib.aegis128x4_mac_final( + clone._proxy.ptr, ffi.from_buffer(out), memoryview(out).nbytes + ) if rc != 0: err_num = ffi.errno err_name = errno.errorcode.get(err_num, f"errno_{err_num}") @@ -851,7 +851,9 @@ class Decryptor: err_name = errno.errorcode.get(err_num, f"errno_{err_num}") raise RuntimeError(f"state decrypt update failed: {err_name}") w = int(written[0]) - assert w == expected_out, f"got {w}, expected {expected_out}, ct.nbytes={ct.nbytes}" + assert w == expected_out, ( + f"got {w}, expected {expected_out}, ct.nbytes={ct.nbytes}" + ) return out if into is None else memoryview(out)[:w] # type: ignore def final(self, mac: Buffer) -> None: diff --git a/pyaegis/aegis256.py b/pyaegis/aegis256.py index 944fddd..e1b9719 100644 --- a/pyaegis/aegis256.py +++ b/pyaegis/aegis256.py @@ -295,9 +295,7 @@ def decrypt( out = bytearray(expected_out) else: if into.nbytes < expected_out: - raise TypeError( - "into length must be at least ct.nbytes - maclen" - ) + raise TypeError("into length must be at least ct.nbytes - maclen") out = into rc = _lib.aegis256_decrypt( @@ -582,7 +580,9 @@ class Mac: out = into clone = self.clone() - rc = _lib.aegis256_mac_final(clone._proxy.ptr, ffi.from_buffer(out), memoryview(out).nbytes) + rc = _lib.aegis256_mac_final( + clone._proxy.ptr, ffi.from_buffer(out), memoryview(out).nbytes + ) if rc != 0: err_num = ffi.errno err_name = errno.errorcode.get(err_num, f"errno_{err_num}") @@ -851,7 +851,9 @@ class Decryptor: err_name = errno.errorcode.get(err_num, f"errno_{err_num}") raise RuntimeError(f"state decrypt update failed: {err_name}") w = int(written[0]) - assert w == expected_out, f"got {w}, expected {expected_out}, ct.nbytes={ct.nbytes}" + assert w == expected_out, ( + f"got {w}, expected {expected_out}, ct.nbytes={ct.nbytes}" + ) return out if into is None else memoryview(out)[:w] # type: ignore def final(self, mac: Buffer) -> None: diff --git a/pyaegis/aegis256x2.py b/pyaegis/aegis256x2.py index 1525917..3a750a7 100644 --- a/pyaegis/aegis256x2.py +++ b/pyaegis/aegis256x2.py @@ -295,9 +295,7 @@ def decrypt( out = bytearray(expected_out) else: if into.nbytes < expected_out: - raise TypeError( - "into length must be at least ct.nbytes - maclen" - ) + raise TypeError("into length must be at least ct.nbytes - maclen") out = into rc = _lib.aegis256x2_decrypt( @@ -582,7 +580,9 @@ class Mac: out = into clone = self.clone() - rc = _lib.aegis256x2_mac_final(clone._proxy.ptr, ffi.from_buffer(out), memoryview(out).nbytes) + rc = _lib.aegis256x2_mac_final( + clone._proxy.ptr, ffi.from_buffer(out), memoryview(out).nbytes + ) if rc != 0: err_num = ffi.errno err_name = errno.errorcode.get(err_num, f"errno_{err_num}") @@ -851,7 +851,9 @@ class Decryptor: err_name = errno.errorcode.get(err_num, f"errno_{err_num}") raise RuntimeError(f"state decrypt update failed: {err_name}") w = int(written[0]) - assert w == expected_out, f"got {w}, expected {expected_out}, ct.nbytes={ct.nbytes}" + assert w == expected_out, ( + f"got {w}, expected {expected_out}, ct.nbytes={ct.nbytes}" + ) return out if into is None else memoryview(out)[:w] # type: ignore def final(self, mac: Buffer) -> None: diff --git a/setup.py b/setup.py index 7fd3de2..00a017d 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,5 @@ """Setup script for pyaegis - builds CFFI extension with libaegis C library.""" -import os import sys from pathlib import Path diff --git a/tests/test-vectors/gen.py b/tests/test-vectors/gen.py deleted file mode 100755 index 243e1f1..0000000 --- a/tests/test-vectors/gen.py +++ /dev/null @@ -1,89 +0,0 @@ -#! /usr/bin/env python3 - -import json -import re - - -def tvdump(topic, tvs): - with open(filename(topic), "w") as f: - f.write(json.dumps(tvs, indent=2)) - - print(json.dumps(tvs, indent=2)) - - -def filename(topic): - return re.sub(r"[^a-z0-9]+", "-", topic.lower()) + ".json" - - -header = True -in_tv = False -tv = {} -tvs = [] -must_fail = False -with open("../draft-irtf-cfrg-aegis-aead.md") as f: - for line in f: - line = line.strip() - if line == "": - continue - if line.startswith("# Test Vectors"): - header = False - continue - if header: - continue - - if line.startswith("## "): - if len(tvs) > 0: - tvdump(topic, tvs) - topic = line[3:] - tv_name = topic - tvs = [] - continue - - if line.startswith("### "): - tv_name = line[4:] - tv = {"test": tv_name} - in_tv = False - continue - - if line == "~~~ test-vectors": - in_tv = True - tv = {"name": tv_name} - if must_fail: - tv["error"] = "verification failed" - must_fail = False - continue - - if line == "~~~": - tvs.append(tv) - in_tv = False - current_key = None - continue - - if line.find("verification failed") != -1: - must_fail = True - continue - - if line == "After initialization:": - tv_name = tv_name + " (after initialization)" - - if not in_tv: - continue - - parts = line.split(":") - if len(parts) == 2: - key = parts[0].strip() - value = parts[1].strip() - if key == "After Update": - continue - if key in tv: - key = key + "_2" - tv[key] = value - current_key = key - continue - - if not current_key: - continue - - tv[key] += line.strip() - -tvdump(topic, tvs)