Skip to content

ssh, internal: send one KEXINIT per key exchange - #1354

Open
ejohnstown wants to merge 1 commit into
wolfSSL:masterfrom
ejohnstown:kexinit-reentry
Open

ejohnstown wants to merge 1 commit into
wolfSSL:masterfrom
ejohnstown:kexinit-reentry

Conversation

@ejohnstown

Copy link
Copy Markdown
Contributor

Each side sends one KEXINIT per key exchange, as RFC 4253 Section 7.1
requires, so the copy that feeds the exchange hash is never replaced
mid-exchange.

  • wolfSSH_TriggerKeyExchange() is a no-op while keying is in progress
  • SendKexInit() skips once this side's KEXINIT is out, which covers
    the highwater callback firing twice in one rekey
  • regress: second trigger, nested highwater and NEWKEYS-window tests

Issue: F-16775

RFC 4253 7.1 allows one KEXINIT from each side per key exchange.
wolfSSH_TriggerKeyExchange() is now a no-op returning WS_SUCCESS while
any keying is in progress, and SendKexInit() skips once this side's
KEXINIT is out, so the stored copy feeding the exchange hash stays put.

- covers the highwater callback, whose byte and message marks can both
  fire in one rekey
- covers the window after SendNewKeys() clears the self-keying flag
  while the peer's NEWKEYS is still due
- regress: second trigger, nested highwater and NEWKEYS-window tests

Issue: F-16775
Copilot AI balanced review requested due to automatic review settings October 29, 2026 22:28

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot was unable to review this pull request because the user who requested the review has insufficient remaining quota.

@wolfSSL-Fenrir-bot wolfSSL-Fenrir-bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fenrir Automated Review — PR #1354

Scan targets checked: wolfssh-src, wolfssh-bugs
Coverage: 2 of 4 in-scope changed file(s) opened by the reviewer; not opened: tests/regress.c, wolfssh/ssh.h

Fenrir result: Approved ✅

No new issues found in the changed files.

Advisory only — this automated result does not count as a GitHub approval.

Review tier: Lite

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants