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

QR: fix VerificationQR mutability (sigHex var) and remove duplicate Data hex helpers to resolve redeclaration; wire signed payload assembly

Browse Source
This commit is contained in:
jack
2025-08-24 18:09:24 +02:00
parent 652deab8a5
commit e86dbc8d38
1 changed files with 9 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitchat/Services/VerificationService.swift
+9 -22
View File
@@ -21,7 +21,7 @@ final class VerificationService {
let nickname: String let nickname: String
let ts: Int64 let ts: Int64
let nonceB64: String let nonceB64: String
let sigHex: String var sigHex: String
static let context = "bitchat-verify-v1" static let context = "bitchat-verify-v1"
@@ -85,8 +85,14 @@ final class VerificationService {
let payload = VerificationQR(v: 1, noiseKeyHex: noiseKey, signKeyHex: signKey, npub: npub, nickname: nickname, ts: ts, nonceB64: nonceB64, sigHex: "") let payload = VerificationQR(v: 1, noiseKeyHex: noiseKey, signKeyHex: signKey, npub: npub, nickname: nickname, ts: ts, nonceB64: nonceB64, sigHex: "")
let msg = payload.canonicalBytes() let msg = payload.canonicalBytes()
guard let sig = noise.signData(msg) else { return nil } guard let sig = noise.signData(msg) else { return nil }
var signed = payload let signed = VerificationQR(v: payload.v,
signed.sigHex = sig.hexEncodedString() noiseKeyHex: payload.noiseKeyHex,
signKeyHex: payload.signKeyHex,
npub: payload.npub,
nickname: payload.nickname,
ts: payload.ts,
nonceB64: payload.nonceB64,
sigHex: sig.map { String(format: "%02x", $0) }.joined())
return signed.toURLString() return signed.toURLString()
} }
@@ -130,22 +136,3 @@ final class VerificationService {
return NoisePayload(type: .verifyResponse, data: tlv).encode() return NoisePayload(type: .verifyResponse, data: tlv).encode()
} }
} }
private extension Data {
func hexEncodedString() -> String {
self.map { String(format: "%02x", $0) }.joined()
}
init?(hexString: String) {
let len = hexString.count
guard len % 2 == 0 else { return nil }
var data = Data(capacity: len/2)
var i = hexString.startIndex
while i < hexString.endIndex {
let j = hexString.index(i, offsetBy: 2)
if let b = UInt8(hexString[i..<j], radix: 16) { data.append(b) } else { return nil }
i = j
}
self = data
}
}