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

refactor: improve variable initialization and return types in Identity methods for clarity

Browse Source
This commit is contained in:
ivan
2025-11-20 21:45:15 -06:00
parent 5c2ea259b8
commit 1ac5696c80
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/identity/identity.go
View File

@@ -293,7 +293,7 @@ func (i *Identity) GetCurrentRatchetKey() []byte {
// Return the most recently generated ratchet key // Return the most recently generated ratchet key
var latestKey []byte var latestKey []byte
var latestTime int64 = 0 var latestTime int64
for id, expiry := range i.ratchetExpiry { for id, expiry := range i.ratchetExpiry {
if expiry > latestTime { if expiry > latestTime {
latestTime = expiry latestTime = expiry
@@ -412,7 +412,7 @@ func (i *Identity) Decrypt(ciphertextToken []byte, ratchets [][]byte, enforceRat
} }
// Helper function to attempt decryption using a ratchet // Helper function to attempt decryption using a ratchet
func (i *Identity) tryRatchetDecryption(peerPubBytes, ciphertext, ratchet []byte) ([]byte, []byte, error) { func (i *Identity) tryRatchetDecryption(peerPubBytes, ciphertext, ratchet []byte) (plaintext, ratchetID []byte, err error) {
// Convert ratchet to private key // Convert ratchet to private key
ratchetPriv := ratchet ratchetPriv := ratchet
@@ -422,7 +422,7 @@ func (i *Identity) tryRatchetDecryption(peerPubBytes, ciphertext, ratchet []byte
debug.Log(debug.DEBUG_ALL, "Failed to generate ratchet public key", "error", err) debug.Log(debug.DEBUG_ALL, "Failed to generate ratchet public key", "error", err)
return nil, nil, err return nil, nil, err
} }
ratchetID := i.GetRatchetID(ratchetPubBytes) ratchetID = i.GetRatchetID(ratchetPubBytes)
sharedSecret, err := cryptography.DeriveSharedSecret(ratchet, peerPubBytes) sharedSecret, err := cryptography.DeriveSharedSecret(ratchet, peerPubBytes)
if err != nil { if err != nil {
@@ -434,7 +434,7 @@ func (i *Identity) tryRatchetDecryption(peerPubBytes, ciphertext, ratchet []byte
return nil, nil, err return nil, nil, err
} }
plaintext, err := cryptography.DecryptAES256CBC(key, ciphertext) plaintext, err = cryptography.DecryptAES256CBC(key, ciphertext)
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
} }