Skip to content

Support Nettle 4 besides version 3 #844

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gsauthof wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Support Nettle 4 besides version 3 #844

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 32 additions & 12 deletions asyncssh/crypto/umac.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,39 @@
from typing import TYPE_CHECKING, Callable, Optional


if TYPE_CHECKING:
_GetMajor = Callable[[], ctypes.c_int]
else:
# only required for Python < 3.14, because of eager evaluation there
_GetMajor = None


for lib in ('nettle', 'libnettle', 'libnettle-6'):
_nettle_lib = ctypes.util.find_library(lib)

if _nettle_lib: # pragma: no branch
break
else: # pragma: no cover
_nettle_lib = None
_major = 3

if _nettle_lib: # pragma: no branch
_nettle = ctypes.cdll.LoadLibrary(_nettle_lib)
_get_major: _GetMajor = getattr(_nettle, 'nettle_version_major')
_major = _get_major()
if _major not in (3, 4):
_nettle_lib = None


if TYPE_CHECKING:
_ByteArray = ctypes.Array[ctypes.c_char]
_SetKey = Callable[[_ByteArray, bytes], None]
_SetNonce = Callable[[_ByteArray, ctypes.c_size_t, bytes], None]
_Update = Callable[[_ByteArray, ctypes.c_size_t, bytes], None]
_Digest = Callable[[_ByteArray, ctypes.c_size_t, _ByteArray], None]
if _major == 3:
_Digest = Callable[[_ByteArray, ctypes.c_size_t, _ByteArray], None]
else:
_Digest = Callable[[_ByteArray, _ByteArray], None]
_New = Callable[[bytes, Optional[bytes], Optional[bytes]], object]


Expand Down Expand Up @@ -113,7 +140,10 @@ def digest(self) -> bytes:
"""

result = ctypes.create_string_buffer(self.digest_size)
_digest(self._ctx, ctypes.c_size_t(self.digest_size), result)
if _major == 3:
_digest(self._ctx, ctypes.c_size_t(self.digest_size), result)
else:
_digest(self._ctx, result)
return result.raw

def hexdigest(self) -> str:
Expand All @@ -125,15 +155,5 @@ def hexdigest(self) -> str:
return _UMAC.new


for lib in ('nettle', 'libnettle', 'libnettle-6'):
_nettle_lib = ctypes.util.find_library(lib)

if _nettle_lib: # pragma: no branch
break
else: # pragma: no cover
_nettle_lib = None

if _nettle_lib: # pragma: no branch
_nettle = ctypes.cdll.LoadLibrary(_nettle_lib)

umac32, umac64, umac96, umac128 = map(_build_umac, (32, 64, 96, 128))
Loading