Skip to content

fix: remove BLE packet deduplication causing chacha20poly1305 auth failure #1

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
dfx01 wants to merge 1 commit into
base: ios-support
Choose a base branch
from
Open

fix: remove BLE packet deduplication causing chacha20poly1305 auth failure #1

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
12 changes: 0 additions & 12 deletions ios/Classes/Bluetooth.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,6 @@ class BLEConnectionContext {
let semaphore = DispatchSemaphore(value: 0)
var readBuffer = Data()
var readBufferLock = NSLock()
// Track received packets to detect and skip duplicates
// Key: packet data hash, Value: true if seen
var seenPackets: Set<Data> = []
}

class BluetoothManager: NSObject, ObservableObject, CBCentralManagerDelegate, CBPeripheralDelegate {
Expand Down Expand Up @@ -108,7 +105,6 @@ class BluetoothManager: NSObject, ObservableObject, CBCentralManagerDelegate, CB
if let ctx = currentContext {
ctx.readBufferLock.lock()
ctx.readBuffer.removeAll()
ctx.seenPackets.removeAll()
// Drain semaphore to match the cleared buffer — prevents stale signals
// from unblocking a future readBlocking() call with no data
while ctx.semaphore.wait(timeout: .now()) == .success {}
Expand Down Expand Up @@ -332,15 +328,7 @@ class BluetoothManager: NSObject, ObservableObject, CBCentralManagerDelegate, CB
print("BLE: ERROR, expected 64 bytes")
}

// Deduplicate: skip if we've already seen this exact packet
ctx.readBufferLock.lock()
if ctx.seenPackets.contains(data) {
print("BLE: skipping duplicate packet: \(data.prefix(8).hexEncodedString())...")
ctx.readBufferLock.unlock()
return
}
ctx.seenPackets.insert(data)

print("BLE: received data: \(data.hexEncodedString())")
ctx.readBuffer.append(data)
// Signal inside lock to keep buffer and semaphore count in sync
Expand Down