Networks/Reticulum-Go
2
1
Fork 0
Code Issues 5 Pull Requests 1 Actions Packages Projects 1 Releases 1 Wiki Activity

Fix announce data parsing to include ratchet field and update length checks

Browse Source
This commit is contained in:
ivan
2025-09-27 04:26:22 -05:00
parent 982c173760
commit b7cc0c39b4
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/announce/announce.go
View File

@@ -225,9 +225,9 @@ func (a *Announce) HandleAnnounce(data []byte) error {
}
// Now parse the data portion according to the spec
// Public Key (32) + Signing Key (32) + Name Hash (10) + Random Hash (10) + [Ratchet] + Signature (64) + App Data
// Public Key (32) + Signing Key (32) + Name Hash (10) + Random Hash (10) + Ratchet (32) + Signature (64) + App Data
if len(packetData) < 148 { // 32 + 32 + 10 + 10 + 64
if len(packetData) < 180 { // 32 + 32 + 10 + 10 + 32 + 64
return errors.New("announce data too short")
}
@@ -236,16 +236,13 @@ func (a *Announce) HandleAnnounce(data []byte) error {
signKey := packetData[32:64]
nameHash := packetData[64:74]
randomHash := packetData[74:84]
// The next field could be a ratchet (32 bytes) or signature (64 bytes)
// We need to detect this somehow or use a flag
// For now, assume no ratchet
signature := packetData[84:148]
appData := packetData[148:]
ratchetData := packetData[84:116]
signature := packetData[116:180]
appData := packetData[180:]
log.Printf("[DEBUG-7] Announce fields: encKey=%x, signKey=%x", encKey, signKey)
log.Printf("[DEBUG-7] Name hash=%x, random hash=%x", nameHash, randomHash)
log.Printf("[DEBUG-7] Ratchet=%x", ratchetData[:8])
log.Printf("[DEBUG-7] Signature=%x, appDataLen=%d", signature[:8], len(appData))
// Get the destination hash from header
@@ -272,6 +269,7 @@ func (a *Announce) HandleAnnounce(data []byte) error {
signedData = append(signedData, signKey...)
signedData = append(signedData, nameHash...)
signedData = append(signedData, randomHash...)
signedData = append(signedData, ratchetData...)
signedData = append(signedData, appData...)
if !announcedIdentity.Verify(signedData, signature) {