fix line sizes

Author: melg8

.golangci.yml

@@ -10,7 +10,6 @@ linters:
     - wrapcheck
     # planned to fix:
     - err113
-    - lll
     - testpackage
 
   enable:
@@ -44,6 +43,7 @@ linters:
     - inamedparam
     - intrange
     - ireturn
+    - lll
     - nilerr        # Finds redundant nil checks on errors
     - nilnil        # Checks that there is no simultaneous return of nil error and nil value
     - nlreturn
@@ -83,3 +83,5 @@ linters-settings:
   goconst:
     min-len: 3
 
+  lll:
+    line-length: 80

internal/connect/crypt/blowfish.go

@@ -51,7 +51,8 @@ func DefaultAuthKey() *BlowfishCipher {
 // decryption for results to match.
 func flip4BytesEndianInplace(data []byte) {
 	for i := 0; i < len(data); i += 4 {
-		data[i], data[i+1], data[i+2], data[i+3] = data[i+3], data[i+2], data[i+1], data[i]
+		data[i], data[i+3] = data[i+3], data[i]
+		data[i+1], data[i+2] = data[i+2], data[i+1]
 	}
 }
 
@@ -63,7 +64,8 @@ func (b *BlowfishCipher) Decrypt(dst, data []byte) error {
 
 	blockSize := b.cipher.BlockSize()
 	if lenData%blockSize != 0 {
-		return fmt.Errorf("encrypted data length must be a multiple of %d, got %d", blockSize, lenData)
+		return fmt.Errorf("encrypted data len must be multiple of %d, got %d",
+			blockSize, lenData)
 	}
 
 	count := lenData / blockSize

internal/connect/crypt/blowfish_test.go

@@ -29,7 +29,7 @@ func TestBlowfishDataNotMultipleOf8(t *testing.T) {
 	if err == nil {
 		t.Fatal("Decryption should have failed on data not multiple of 8")
 	}
-	expectedPrefix := "encrypted data length must be a multiple of 8"
+	expectedPrefix := "encrypted data len must be multiple of 8"
 	if !strings.HasPrefix(err.Error(), expectedPrefix) {
 		t.Fatalf("Error message should start with '%s', got: %s", expectedPrefix, err.Error())
 	}

internal/connect/crypt/random_unique_bench_test.go

@@ -187,7 +187,8 @@ func NewRandomSequenceOfUnique(seedBase, seedOffset uint32) RandomSequenceOfUniq
 }
 
 func (r *RandomSequenceOfUnique) Next() uint32 {
-	result := permuteQPR((permuteQPR(r.mIndex) + r.mIntermediateOffset) ^ 0x5bf03635)
+	permutation := (permuteQPR(r.mIndex) + r.mIntermediateOffset) ^ 0x5bf03635
+	result := permuteQPR(permutation)
 	r.mIndex++
 
 	return result

internal/connect/helpers/hex_view.go

@@ -85,7 +85,11 @@ func HexASCIIViewFrom(data []byte) string {
 	return sb.String()
 }
 
-func HexViewFromWithLineSplit(data []byte, lineLength int, beforeLine string) string {
+func HexViewFromWithLineSplit(
+	data []byte,
+	lineLength int,
+	beforeLine string,
+) string {
 	var sb strings.Builder
 	for i := 0; i < len(data); i += lineLength {
 		sb.WriteString(beforeLine)

internal/connect/helpers/hex_view_test.go

@@ -56,9 +56,9 @@ func TestHexASCIIView(t *testing.T) {
 	testData := testData()
 	result := HexASCIIViewFrom(testData)
 
-	line1 := "0000: 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f  ................\n"
-	line2 := "0010: 10 11 12 13 14 15 16 17 18 19 1a 1b 1c 1d 1e 1f  ................\n"
-	line3 := "0020: 20 21 22 23 24 25 26 27 28 29 2a 2b 2c 2d 2e      !\"#$%&'()*+,-. \n"
+	line1 := "0000: 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f  ................\n"  //nolint:lll
+	line2 := "0010: 10 11 12 13 14 15 16 17 18 19 1a 1b 1c 1d 1e 1f  ................\n"  //nolint:lll
+	line3 := "0020: 20 21 22 23 24 25 26 27 28 29 2a 2b 2c 2d 2e      !\"#$%&'()*+,-. \n" //nolint:lll
 	line4 := "Size: 47 bytes\n"
 	expected := line1 + line2 + line3 + line4
 
@@ -123,7 +123,8 @@ func TestHexStringFromInt32(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			result := HexStringFromInt32(tt.input)
 			if result != tt.expected {
-				t.Errorf("HexStringFromInt32(%d) = %s, want %s", tt.input, result, tt.expected)
+				t.Errorf("HexStringFromInt32(%d) = %s, want %s",
+					tt.input, result, tt.expected)
 			}
 		})
 	}

internal/connect/packets/from_auth_server/init.go

@@ -68,7 +68,8 @@ func NewInitPacketFromBytes(data []byte) (*InitPacket, error) {
 
 func (p *InitPacket) ToBytes(writer *packet.Writer) error { //nolint:cyclop
 	if len(p.RsaPublicKey) != 128 {
-		return fmt.Errorf("invalid RSA public key length: expected 128 bytes, got %d bytes", len(p.RsaPublicKey))
+		return fmt.Errorf("invalid RSA public key len: %d bytes, expected 128",
+			len(p.RsaPublicKey))
 	}
 	if err := writer.WriteInt32(p.SessionID); err != nil {
 		return err

internal/connect/packets/from_auth_server/init_test.go

@@ -52,7 +52,7 @@ func ExpectedRsaPublicKey() []byte {
 }
 
 func convertBytesToInt32BigEndian(bytes []byte) int32 {
-	//nolint:gosec // G115: Intentionally converting uint32 to int32 for test purposes
+	//nolint:gosec
 	return int32(binary.BigEndian.Uint32(bytes))
 }