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

go fmt

Browse Source
This commit is contained in:
ivan
2025-07-06 00:09:14 -05:00
parent cb402e2bb6
commit 6e87fc9bcd
4 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/cryptography/aes.go
View File

@@ -13,7 +13,7 @@ const (
AES128KeySize = 16 // 128 bits AES128KeySize = 16 // 128 bits
AES192KeySize = 24 // 192 bits AES192KeySize = 24 // 192 bits
AES256KeySize = 32 // 256 bits AES256KeySize = 32 // 256 bits
// Default to AES-256 // Default to AES-256
DefaultKeySize = AES256KeySize DefaultKeySize = AES256KeySize
) )
@@ -23,7 +23,7 @@ func GenerateAESKey(keySize int) ([]byte, error) {
if keySize != AES128KeySize && keySize != AES192KeySize && keySize != AES256KeySize { if keySize != AES128KeySize && keySize != AES192KeySize && keySize != AES256KeySize {
return nil, errors.New("invalid key size: must be 16, 24, or 32 bytes") return nil, errors.New("invalid key size: must be 16, 24, or 32 bytes")
} }
key := make([]byte, keySize) key := make([]byte, keySize)
if _, err := io.ReadFull(rand.Reader, key); err != nil { if _, err := io.ReadFull(rand.Reader, key); err != nil {
return nil, err return nil, err
@@ -117,19 +117,18 @@ func DecryptAESCBC(key, ciphertext []byte) ([]byte, error) {
if len(plaintext) == 0 { if len(plaintext) == 0 {
return nil, errors.New("invalid padding: empty plaintext") return nil, errors.New("invalid padding: empty plaintext")
} }
padding := int(plaintext[len(plaintext)-1]) padding := int(plaintext[len(plaintext)-1])
if padding == 0 || padding > aes.BlockSize || padding > len(plaintext) { if padding == 0 || padding > aes.BlockSize || padding > len(plaintext) {
return nil, errors.New("invalid PKCS7 padding") return nil, errors.New("invalid PKCS7 padding")
} }
// Verify all padding bytes are correct // Verify all padding bytes are correct
for i := len(plaintext) - padding; i < len(plaintext); i++ { for i := len(plaintext) - padding; i < len(plaintext); i++ {
if plaintext[i] != byte(padding) { if plaintext[i] != byte(padding) {
return nil, errors.New("invalid PKCS7 padding") return nil, errors.New("invalid PKCS7 padding")
} }
} }
return plaintext[:len(plaintext)-padding], nil return plaintext[:len(plaintext)-padding], nil
} }

10
pkg/cryptography/aes_test.go
View File

@@ -74,7 +74,7 @@ func TestAES256CBCEncryptionDecryption(t *testing.T) {
} }
if !bytes.Equal(tc.plaintext, decrypted) { if !bytes.Equal(tc.plaintext, decrypted) {
t.Errorf("Decrypted text does not match original plaintext.\nGot: %q (%x)\nWant: %q (%x)", t.Errorf("Decrypted text does not match original plaintext.\nGot: %q (%x)\nWant: %q (%x)",
decrypted, decrypted, tc.plaintext, tc.plaintext) decrypted, decrypted, tc.plaintext, tc.plaintext)
} }
}) })
@@ -83,7 +83,7 @@ func TestAES256CBCEncryptionDecryption(t *testing.T) {
func TestAES256CBC_InvalidKeySize(t *testing.T) { func TestAES256CBC_InvalidKeySize(t *testing.T) {
plaintext := []byte("test message") plaintext := []byte("test message")
invalidKeys := [][]byte{ invalidKeys := [][]byte{
make([]byte, 16), // AES-128 make([]byte, 16), // AES-128
make([]byte, 24), // AES-192 make([]byte, 24), // AES-192
@@ -112,7 +112,7 @@ func TestAES256CBC_InvalidKeySize(t *testing.T) {
func TestAESCBCEncryptionDecryption(t *testing.T) { func TestAESCBCEncryptionDecryption(t *testing.T) {
keySizes := []int{AES128KeySize, AES192KeySize, AES256KeySize} keySizes := []int{AES128KeySize, AES192KeySize, AES256KeySize}
for _, keySize := range keySizes { for _, keySize := range keySizes {
t.Run(fmt.Sprintf("AES_%d", keySize*8), func(t *testing.T) { t.Run(fmt.Sprintf("AES_%d", keySize*8), func(t *testing.T) {
key, err := GenerateAESKey(keySize) key, err := GenerateAESKey(keySize)
@@ -166,10 +166,10 @@ func TestDecryptAESCBCErrorCases(t *testing.T) {
}) })
t.Run("InvalidKeySize", func(t *testing.T) { t.Run("InvalidKeySize", func(t *testing.T) {
invalidKey := make([]byte, 17) // Invalid key size invalidKey := make([]byte, 17) // Invalid key size
validCiphertext := make([]byte, 32) // IV + one block validCiphertext := make([]byte, 32) // IV + one block
rand.Read(validCiphertext) rand.Read(validCiphertext)
_, err := DecryptAESCBC(invalidKey, validCiphertext) _, err := DecryptAESCBC(invalidKey, validCiphertext)
if err == nil { if err == nil {
t.Error("DecryptAESCBC should have failed for invalid key size") t.Error("DecryptAESCBC should have failed for invalid key size")

2
pkg/interfaces/tcp_common.go
View File

@@ -11,4 +11,4 @@ import (
// Default implementation for non-Linux platforms // Default implementation for non-Linux platforms
func platformGetRTT(fd uintptr) time.Duration { func platformGetRTT(fd uintptr) time.Duration {
return 0 return 0
} }

2
pkg/interfaces/tcp_linux.go
View File

@@ -29,4 +29,4 @@ func platformGetRTT(fd uintptr) time.Duration {
// RTT is in microseconds, convert to Duration // RTT is in microseconds, convert to Duration
return time.Duration(info.Rtt) * time.Microsecond return time.Duration(info.Rtt) * time.Microsecond
} }