From d0f7e2ac7a1906950ce02ba983185537e48b7cce Mon Sep 17 00:00:00 2001
From: riccardom <riccardomanfrin@gmail.com>
Date: Wed, 7 Oct 2026 13:26:57 +0200
Subject: [PATCH] [client] pqkem: route a failed PSK application through
 convergence recovery

Both sides recorded the exchange as converged and then called OnNewPSKReady,
returning its error but leaving the "converged" state in place. A host failure to
program the PSK therefore left the peers split between the old data-path key and
the new stored value, with no failure raised and no re-bootstrap.

Treat applying the PSK as part of the commit. On the initiator, a failed
OnNewPSKReady now drops the exchange and raises the failure so recovery
re-bootstraps. On the responder, it drops the exchange and withholds the answer,
so the initiator times out and re-bootstraps rather than converging on a key the
responder could not apply.

Found in cubic review on #7098 (client/internal/pqkem/convergence.go:228).
---
 client/internal/pqkem/convergence.go | 30 ++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/client/internal/pqkem/convergence.go b/client/internal/pqkem/convergence.go
index 894552797..fe7d309a6 100644
--- a/client/internal/pqkem/convergence.go
+++ b/client/internal/pqkem/convergence.go
@@ -153,8 +153,19 @@ func (m *Manager) processOffer(remoteID RemoteID, o *OfferMsg, via string) ([]by
 
 	m.debug("pqkem: PSK derived", "peer", remoteID, "exchange", idHex(o.ExchangeID), "role", "responder", "via", via, "kind", kind, "psk_fp", pskFingerprint(psk))
 
-	// Commit optimistically so our data path can rekey to the new PSK.
+	// Commit optimistically so our data path can rekey to the new PSK. Applying the PSK is
+	// part of the commit: if the host can't program it, drop the exchange and do NOT send
+	// the answer, so the initiator times out and re-bootstraps instead of converging on a
+	// key we could not apply. Route it through the failure path.
 	if err := m.cbHandler.OnNewPSKReady(remoteID, psk); err != nil {
+		m.mu.Lock()
+		if c := m.exchanges[remoteID]; c != nil && c.id == o.ExchangeID {
+			delete(m.exchanges, remoteID)
+		}
+		initial := !m.established[remoteID]
+		fail := m.registerFailureLocked(remoteID)
+		m.mu.Unlock()
+		m.raiseFailure(remoteID, fail, initial)
 		return nil, err
 	}
 	m.trace("pqkem: answer sent", "peer", remoteID, "exchange", idHex(o.ExchangeID))
@@ -226,6 +237,7 @@ func (m *Manager) processAnswer(remoteID RemoteID, a *AnswerMsg, via string) err
 		m.trace("pqkem: exchange superseded during finish, dropping PSK", "peer", remoteID, "exchange", idHex(a.ExchangeID))
 		return nil
 	}
+	wasEstablished := m.established[remoteID]
 	cur.state = stateAwaitingRekey
 	m.established[remoteID] = true
 	m.failures[remoteID] = 0
@@ -235,7 +247,21 @@ func (m *Manager) processAnswer(remoteID RemoteID, a *AnswerMsg, via string) err
 
 	m.debug("pqkem: PSK derived", "peer", remoteID, "exchange", idHex(a.ExchangeID), "role", "initiator", "via", via, "kind", kind, "psk_fp", pskFingerprint(psk))
 
-	return m.cbHandler.OnNewPSKReady(remoteID, psk)
+	if err := m.cbHandler.OnNewPSKReady(remoteID, psk); err != nil {
+		// Applying the PSK is part of the commit: if the host fails to program it, the
+		// exchange is not really converged. Drop it and route the failure through recovery
+		// so a re-bootstrap re-derives and re-applies, instead of leaving the peer parked
+		// in awaitingRekey on a key the data path never adopted.
+		m.mu.Lock()
+		if c := m.exchanges[remoteID]; c != nil && c.id == a.ExchangeID {
+			delete(m.exchanges, remoteID)
+		}
+		fail := m.registerFailureLocked(remoteID)
+		m.mu.Unlock()
+		m.raiseFailure(remoteID, fail, !wasEstablished)
+		return err
+	}
+	return nil
 }
 
 // ackConverged (responder) records convergence of the exchange named by ackID: a