permissionlesstech/bitchat
1
0
Fork 0
mirror of https://github.com/permissionlesstech/bitchat.git synced 2026-07-26 05:05:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Capture handshake hash before split() clears symmetric state

Browse Source 
Addresses Codex review feedback on PR #948: the getTransportCiphers()
method now returns the handshake hash as part of its return tuple,
capturing it BEFORE split() calls clearSensitiveData().

Previously, calling getHandshakeHash() after getTransportCiphers()
would return an all-zero value since split() clears the symmetric
state. This broke channel binding functionality.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
jack
2026-01-12 11:32:17 -10:00
co-authored by Claude Opus 4.5
parent f41a390a94
commit b533d9560d
2 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitchat/Noise/NoiseProtocol.swift
+8 -4
View File
@@ -833,16 +833,20 @@ final class NoiseHandshakeState {
return currentPattern >= messagePatterns.count return currentPattern >= messagePatterns.count
} }
func getTransportCiphers(useExtractedNonce: Bool) throws -> (send: NoiseCipherState, receive: NoiseCipherState) { func getTransportCiphers(useExtractedNonce: Bool) throws -> (send: NoiseCipherState, receive: NoiseCipherState, handshakeHash: Data) {
guard isHandshakeComplete() else { guard isHandshakeComplete() else {
throw NoiseError.handshakeNotComplete throw NoiseError.handshakeNotComplete
} }
// BCH-01-010: Capture handshake hash BEFORE split() clears symmetric state
let finalHandshakeHash = symmetricState.getHandshakeHash()
let (c1, c2) = symmetricState.split(useExtractedNonce: useExtractedNonce) let (c1, c2) = symmetricState.split(useExtractedNonce: useExtractedNonce)
// Initiator uses c1 for sending, c2 for receiving // Initiator uses c1 for sending, c2 for receiving
// Responder uses c2 for sending, c1 for receiving // Responder uses c2 for sending, c1 for receiving
return role == .initiator ? (c1, c2) : (c2, c1) let ciphers = role == .initiator ? (c1, c2) : (c2, c1)
return (send: ciphers.0, receive: ciphers.1, handshakeHash: finalHandshakeHash)
} }
func getRemoteStaticPublicKey() -> Curve25519.KeyAgreement.PublicKey? { func getRemoteStaticPublicKey() -> Curve25519.KeyAgreement.PublicKey? {
bitchat/Noise/NoiseSession.swift
+15 -15
View File
@@ -102,23 +102,23 @@ class NoiseSession {
// Check if handshake is complete // Check if handshake is complete
if handshake.isHandshakeComplete() { if handshake.isHandshakeComplete() {
// Get transport ciphers // Get transport ciphers and handshake hash (hash captured before split clears state)
let (send, receive) = try handshake.getTransportCiphers(useExtractedNonce: true) let (send, receive, hash) = try handshake.getTransportCiphers(useExtractedNonce: true)
sendCipher = send sendCipher = send
receiveCipher = receive receiveCipher = receive
// Store remote static key // Store remote static key
remoteStaticPublicKey = handshake.getRemoteStaticPublicKey() remoteStaticPublicKey = handshake.getRemoteStaticPublicKey()
// Store handshake hash for channel binding // Store handshake hash for channel binding
handshakeHash = handshake.getHandshakeHash() handshakeHash = hash
state = .established state = .established
handshakeState = nil // Clear handshake state handshakeState = nil // Clear handshake state
SecureLogger.debug("NoiseSession[\(peerID)]: Handshake complete (no response needed), transitioning to established") SecureLogger.debug("NoiseSession[\(peerID)]: Handshake complete (no response needed), transitioning to established")
SecureLogger.info(.handshakeCompleted(peerID: peerID.id)) SecureLogger.info(.handshakeCompleted(peerID: peerID.id))
return nil return nil
} else { } else {
// Generate response // Generate response
@@ -128,20 +128,20 @@ class NoiseSession {
// Check if handshake is complete after writing // Check if handshake is complete after writing
if handshake.isHandshakeComplete() { if handshake.isHandshakeComplete() {
// Get transport ciphers // Get transport ciphers and handshake hash (hash captured before split clears state)
let (send, receive) = try handshake.getTransportCiphers(useExtractedNonce: true) let (send, receive, hash) = try handshake.getTransportCiphers(useExtractedNonce: true)
sendCipher = send sendCipher = send
receiveCipher = receive receiveCipher = receive
// Store remote static key // Store remote static key
remoteStaticPublicKey = handshake.getRemoteStaticPublicKey() remoteStaticPublicKey = handshake.getRemoteStaticPublicKey()
// Store handshake hash for channel binding // Store handshake hash for channel binding
handshakeHash = handshake.getHandshakeHash() handshakeHash = hash
state = .established state = .established
handshakeState = nil // Clear handshake state handshakeState = nil // Clear handshake state
SecureLogger.debug("NoiseSession[\(peerID)]: Handshake complete after writing response, transitioning to established") SecureLogger.debug("NoiseSession[\(peerID)]: Handshake complete after writing response, transitioning to established")
SecureLogger.info(.handshakeCompleted(peerID: peerID.id)) SecureLogger.info(.handshakeCompleted(peerID: peerID.id))
} }