Skip to content

fix(hip): PUZZLE and SOLUTION builders must stop inventing wire-format values (#653, #654, #655) #665

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

Merged
JarryShaw merged 1 commit into from
Sep 22, 2026
Merged

fix(hip): PUZZLE and SOLUTION builders must stop inventing wire-format values (#653, #654, #655) #665

Show file tree
Hide file tree
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
28 changes: 24 additions & 4 deletions pcapkit/protocols/data/internet/hip.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,9 +204,16 @@ class PuzzleParameter(Parameter):
opaque: 'bytes'
#: Random number.
random: 'int'
#: On-wire width of :attr:`random`, in bits -- ``RHASH_len`` in
#: :rfc:`7401#section-2.3` terms, which :rfc:`7401#section-5.2.4` makes the
#: exact width of ``Random #I``. Declared rather than recomputed from
#: :meth:`int.bit_length`, which cannot see a leading zero octet: without it
#: a parameter read with ``Length = 12`` re-serialised as ``Length = 5``.
#: See #653.
rhash_len: 'int'

if TYPE_CHECKING:
def __init__(self, type: 'Enum_Parameter', critical: 'bool', length: 'int', index: 'int', lifetime: 'timedelta', opaque: 'bytes', random: 'int') -> 'None': ... # pylint: disable=unused-argument,multiple-statements,redefined-builtin,super-init-not-called,line-too-long
def __init__(self, type: 'Enum_Parameter', critical: 'bool', length: 'int', index: 'int', lifetime: 'timedelta', opaque: 'bytes', random: 'int', rhash_len: 'int') -> 'None': ... # pylint: disable=unused-argument,multiple-statements,redefined-builtin,super-init-not-called,line-too-long


@info_final
Expand All @@ -215,17 +222,30 @@ class SolutionParameter(Parameter):

#: Numeric index.
index: 'int'
#: Lifetime.
lifetime: 'timedelta'
#: Reserved octet -- "zero when sent, ignored when received"
#: (:rfc:`7401#section-5.2.5`, and :rfc:`5201#section-5.2.5` identically).
#: Carried verbatim rather than interpreted, so that re-serialising a parsed
#: parameter reproduces the octet it arrived with. It used to be read as a
#: ``PUZZLE`` ``Lifetime``, which only :rfc:`7401#section-5.2.4` defines, and
#: the conformant ``0x00`` then could not be re-serialised at all. See #654.
reserved: 'int'
#: Solution data.
opaque: 'bytes'
#: Random number.
random: 'int'
#: Puzzle solution.
solution: 'int'
#: On-wire width of :attr:`random` and of :attr:`solution` -- which are equal
#: and each ``RHASH_len / 8`` octets -- in bits. ``RHASH_len`` in
#: :rfc:`7401#section-2.3` terms; :rfc:`7401#section-5.2.5` makes it the exact
#: width of both fields. Declared rather than recomputed from
#: :meth:`int.bit_length`, which cannot see a leading zero octet: without it a
#: parameter read with ``Length = 20`` re-serialised as ``Length = 6``.
#: See #653.
rhash_len: 'int'

if TYPE_CHECKING:
def __init__(self, type: 'Enum_Parameter', critical: 'bool', length: 'int', index: 'int', lifetime: 'timedelta', opaque: 'bytes', random: 'int', solution: 'int') -> 'None': ... # pylint: disable=unused-argument,multiple-statements,redefined-builtin,super-init-not-called,line-too-long
def __init__(self, type: 'Enum_Parameter', critical: 'bool', length: 'int', index: 'int', reserved: 'int', opaque: 'bytes', random: 'int', solution: 'int', rhash_len: 'int') -> 'None': ... # pylint: disable=unused-argument,multiple-statements,redefined-builtin,super-init-not-called,line-too-long


@info_final
Expand Down
Loading
Loading