Mirror/Erupe
1
0
Fork 0
mirror of https://github.com/Mezeporta/Erupe.git synced 2026-03-21 23:22:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(channelserver): correct ecdMagic constant byte order (#174)

Browse Source 
The constant used file-order bytes (0x6563641a) instead of the value
produced by binary.LittleEndian.Uint32 (0x1A646365), causing
loadRengokuBinary to reject every real ECD-encrypted rengoku_data.bin.
The unit tests masked this because they round-tripped with the same
wrong constant.
This commit is contained in:
Houmgaor
2026-03-03 18:23:45 +01:00
parent 8717fb9b55
commit 10ac803a45
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/channelserver/sys_channel_server.go
View File

@@ -445,8 +445,9 @@ func (s *Server) Season() uint8 {
return uint8(((TimeAdjusted().Unix() / secsPerDay) + sid) % 3) return uint8(((TimeAdjusted().Unix() / secsPerDay) + sid) % 3)
} }
// ecdMagic is the first 4 bytes of an ECD-encrypted file (little-endian "ecd\x1a"). // ecdMagic is the ECD magic as read by binary.LittleEndian.Uint32.
const ecdMagic = uint32(0x6563641a) // On-disk bytes: 65 63 64 1A ("ecd\x1a"), LE-decoded: 0x1A646365.
const ecdMagic = uint32(0x1A646365)
// loadRengokuBinary reads and validates rengoku_data.bin from binPath. // loadRengokuBinary reads and validates rengoku_data.bin from binPath.
// Returns the raw bytes on success, or nil if the file is missing or invalid. // Returns the raw bytes on success, or nil if the file is missing or invalid.
@@ -465,7 +466,7 @@ func loadRengokuBinary(binPath string, logger *zap.Logger) []byte {
} }
if magic := binary.LittleEndian.Uint32(data[:4]); magic != ecdMagic { if magic := binary.LittleEndian.Uint32(data[:4]); magic != ecdMagic {
logger.Warn("rengoku_data.bin has invalid ECD magic, ignoring", logger.Warn("rengoku_data.bin has invalid ECD magic, ignoring",
zap.String("expected", "0x6563641a"), zap.String("expected", "0x1a646365"),
zap.String("got", fmt.Sprintf("0x%08x", magic))) zap.String("got", fmt.Sprintf("0x%08x", magic)))
return nil return nil
} }