LeoVasanko/pyaegis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

The update functions of libaegis now return the same number of bytes that went in. Update the binding accordingly.

Browse Source
This commit is contained in:
Leo Vasanko
2025-11-06 16:27:48 -06:00
parent 17a5f45394
commit 3248fccbac
6 changed files with 12 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
pyaegis/aegis128l.py
View File

@@ -26,19 +26,6 @@ ALIGNMENT = 32
RATE = 32
def calc_update_output_size(bytes_in: int, bytes_next: int) -> int:
"""Calculate the number of bytes output by the next incremental update.
Args:
bytes_in: Total number of bytes passed to update so far.
bytes_next: Length of the next input chunk.
Returns:
Number of bytes that the next update will write.
"""
return (((bytes_in % RATE) + bytes_next) // RATE) * RATE
def _ptr(buf):
return ffi.NULL if buf is None else ffi.from_buffer(buf)
@@ -631,8 +618,7 @@ class Encryptor:
RuntimeError: If the C update call fails.
"""
message = memoryview(message)
# Compute exact number of bytes this update can emit (multiple of ALIGNMENT)
expected_out = calc_update_output_size(self._bytes_in, message.nbytes)
expected_out = message.nbytes
out = memoryview(into if into is not None else bytearray(expected_out))
if out.nbytes < expected_out:
raise TypeError(
@@ -812,7 +798,7 @@ class Decryptor:
RuntimeError: If the C update call fails.
"""
ct = memoryview(ct)
expected_out = calc_update_output_size(self._bytes_in, ct.nbytes)
expected_out = ct.nbytes
out = into if into is not None else bytearray(expected_out)
out = memoryview(out)
if out.nbytes < expected_out:
@@ -893,8 +879,6 @@ __all__ = [
"TAILBYTES_MAX",
"ALIGNMENT",
"RATE",
# helpers
"calc_update_output_size",
# one-shot functions
"encrypt_detached",
"decrypt_detached",

20
pyaegis/aegis128x2.py
View File

@@ -26,19 +26,6 @@ ALIGNMENT = 64
RATE = 64
def calc_update_output_size(bytes_in: int, bytes_next: int) -> int:
"""Calculate the number of bytes output by the next incremental update.
Args:
bytes_in: Total number of bytes passed to update so far.
bytes_next: Length of the next input chunk.
Returns:
Number of bytes that the next update will write.
"""
return (((bytes_in % RATE) + bytes_next) // RATE) * RATE
def _ptr(buf):
return ffi.NULL if buf is None else ffi.from_buffer(buf)
@@ -631,8 +618,7 @@ class Encryptor:
RuntimeError: If the C update call fails.
"""
message = memoryview(message)
# Compute exact number of bytes this update can emit (multiple of ALIGNMENT)
expected_out = calc_update_output_size(self._bytes_in, message.nbytes)
expected_out = message.nbytes
out = memoryview(into if into is not None else bytearray(expected_out))
if out.nbytes < expected_out:
raise TypeError(
@@ -812,7 +798,7 @@ class Decryptor:
RuntimeError: If the C update call fails.
"""
ct = memoryview(ct)
expected_out = calc_update_output_size(self._bytes_in, ct.nbytes)
expected_out = ct.nbytes
out = into if into is not None else bytearray(expected_out)
out = memoryview(out)
if out.nbytes < expected_out:
@@ -893,8 +879,6 @@ __all__ = [
"TAILBYTES_MAX",
"ALIGNMENT",
"RATE",
# helpers
"calc_update_output_size",
# one-shot functions
"encrypt_detached",
"decrypt_detached",

20
pyaegis/aegis128x4.py
View File

@@ -26,19 +26,6 @@ ALIGNMENT = 64
RATE = 128
def calc_update_output_size(bytes_in: int, bytes_next: int) -> int:
"""Calculate the number of bytes output by the next incremental update.
Args:
bytes_in: Total number of bytes passed to update so far.
bytes_next: Length of the next input chunk.
Returns:
Number of bytes that the next update will write.
"""
return (((bytes_in % RATE) + bytes_next) // RATE) * RATE
def _ptr(buf):
return ffi.NULL if buf is None else ffi.from_buffer(buf)
@@ -631,8 +618,7 @@ class Encryptor:
RuntimeError: If the C update call fails.
"""
message = memoryview(message)
# Compute exact number of bytes this update can emit (multiple of ALIGNMENT)
expected_out = calc_update_output_size(self._bytes_in, message.nbytes)
expected_out = message.nbytes
out = memoryview(into if into is not None else bytearray(expected_out))
if out.nbytes < expected_out:
raise TypeError(
@@ -812,7 +798,7 @@ class Decryptor:
RuntimeError: If the C update call fails.
"""
ct = memoryview(ct)
expected_out = calc_update_output_size(self._bytes_in, ct.nbytes)
expected_out = ct.nbytes
out = into if into is not None else bytearray(expected_out)
out = memoryview(out)
if out.nbytes < expected_out:
@@ -893,8 +879,6 @@ __all__ = [
"TAILBYTES_MAX",
"ALIGNMENT",
"RATE",
# helpers
"calc_update_output_size",
# one-shot functions
"encrypt_detached",
"decrypt_detached",

20
pyaegis/aegis256.py
View File

@@ -26,19 +26,6 @@ ALIGNMENT = 16
RATE = 16
def calc_update_output_size(bytes_in: int, bytes_next: int) -> int:
"""Calculate the number of bytes output by the next incremental update.
Args:
bytes_in: Total number of bytes passed to update so far.
bytes_next: Length of the next input chunk.
Returns:
Number of bytes that the next update will write.
"""
return (((bytes_in % RATE) + bytes_next) // RATE) * RATE
def _ptr(buf):
return ffi.NULL if buf is None else ffi.from_buffer(buf)
@@ -631,8 +618,7 @@ class Encryptor:
RuntimeError: If the C update call fails.
"""
message = memoryview(message)
# Compute exact number of bytes this update can emit (multiple of ALIGNMENT)
expected_out = calc_update_output_size(self._bytes_in, message.nbytes)
expected_out = message.nbytes
out = memoryview(into if into is not None else bytearray(expected_out))
if out.nbytes < expected_out:
raise TypeError(
@@ -812,7 +798,7 @@ class Decryptor:
RuntimeError: If the C update call fails.
"""
ct = memoryview(ct)
expected_out = calc_update_output_size(self._bytes_in, ct.nbytes)
expected_out = ct.nbytes
out = into if into is not None else bytearray(expected_out)
out = memoryview(out)
if out.nbytes < expected_out:
@@ -893,8 +879,6 @@ __all__ = [
"TAILBYTES_MAX",
"ALIGNMENT",
"RATE",
# helpers
"calc_update_output_size",
# one-shot functions
"encrypt_detached",
"decrypt_detached",

20
pyaegis/aegis256x2.py
View File

@@ -26,19 +26,6 @@ ALIGNMENT = 32
RATE = 32
def calc_update_output_size(bytes_in: int, bytes_next: int) -> int:
"""Calculate the number of bytes output by the next incremental update.
Args:
bytes_in: Total number of bytes passed to update so far.
bytes_next: Length of the next input chunk.
Returns:
Number of bytes that the next update will write.
"""
return (((bytes_in % RATE) + bytes_next) // RATE) * RATE
def _ptr(buf):
return ffi.NULL if buf is None else ffi.from_buffer(buf)
@@ -631,8 +618,7 @@ class Encryptor:
RuntimeError: If the C update call fails.
"""
message = memoryview(message)
# Compute exact number of bytes this update can emit (multiple of ALIGNMENT)
expected_out = calc_update_output_size(self._bytes_in, message.nbytes)
expected_out = message.nbytes
out = memoryview(into if into is not None else bytearray(expected_out))
if out.nbytes < expected_out:
raise TypeError(
@@ -812,7 +798,7 @@ class Decryptor:
RuntimeError: If the C update call fails.
"""
ct = memoryview(ct)
expected_out = calc_update_output_size(self._bytes_in, ct.nbytes)
expected_out = ct.nbytes
out = into if into is not None else bytearray(expected_out)
out = memoryview(out)
if out.nbytes < expected_out:
@@ -893,8 +879,6 @@ __all__ = [
"TAILBYTES_MAX",
"ALIGNMENT",
"RATE",
# helpers
"calc_update_output_size",
# one-shot functions
"encrypt_detached",
"decrypt_detached",

20
pyaegis/aegis256x4.py
View File

@@ -26,19 +26,6 @@ ALIGNMENT = 64
RATE = 64
def calc_update_output_size(bytes_in: int, bytes_next: int) -> int:
"""Calculate the number of bytes output by the next incremental update.
Args:
bytes_in: Total number of bytes passed to update so far.
bytes_next: Length of the next input chunk.
Returns:
Number of bytes that the next update will write.
"""
return (((bytes_in % RATE) + bytes_next) // RATE) * RATE
def _ptr(buf):
return ffi.NULL if buf is None else ffi.from_buffer(buf)
@@ -631,8 +618,7 @@ class Encryptor:
RuntimeError: If the C update call fails.
"""
message = memoryview(message)
# Compute exact number of bytes this update can emit (multiple of ALIGNMENT)
expected_out = calc_update_output_size(self._bytes_in, message.nbytes)
expected_out = message.nbytes
out = memoryview(into if into is not None else bytearray(expected_out))
if out.nbytes < expected_out:
raise TypeError(
@@ -812,7 +798,7 @@ class Decryptor:
RuntimeError: If the C update call fails.
"""
ct = memoryview(ct)
expected_out = calc_update_output_size(self._bytes_in, ct.nbytes)
expected_out = ct.nbytes
out = into if into is not None else bytearray(expected_out)
out = memoryview(out)
if out.nbytes < expected_out:
@@ -893,8 +879,6 @@ __all__ = [
"TAILBYTES_MAX",
"ALIGNMENT",
"RATE",
# helpers
"calc_update_output_size",
# one-shot functions
"encrypt_detached",
"decrypt_detached",