Fix linter issues

kayrus · Dec 12, 2024 · 2b51460 · 2b51460
1 parent 16a7631
commit 2b51460
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 12 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -33,7 +33,6 @@ linters:
     - exhaustive
     - exportloopref
     - gci
-    - godot
     - gofmt
     - goheader
     - goimports
@@ -51,6 +50,7 @@ linters:
     - unconvert
     - unused
     - whitespace
+#    - godot
 #    - cyclop
 #    - dupl
 #    - durationcheck

diff --git a/putty.go b/putty.go
@@ -442,16 +442,46 @@ func decryptCBC(cipherKey, cipherIV, macKey, ciphertext []byte) error {
 
 // validateHMAC validates PuTTY key HMAC with a hash function
 func (k Key) validateHMAC(hashFunc hash.Hash) error {
-	binary.Write(hashFunc, binary.BigEndian, uint32(len(k.Algo)))
-	hashFunc.Write([]byte(k.Algo))
-	binary.Write(hashFunc, binary.BigEndian, uint32(len(k.Encryption)))
-	hashFunc.Write([]byte(k.Encryption))
-	binary.Write(hashFunc, binary.BigEndian, uint32(len(k.Comment)))
-	hashFunc.Write([]byte(k.Comment))
-	binary.Write(hashFunc, binary.BigEndian, uint32(len(k.PublicKey)))
-	hashFunc.Write(k.PublicKey)
-	binary.Write(hashFunc, binary.BigEndian, uint32(len(k.PrivateKey)))
-	hashFunc.Write(k.PrivateKey)
+	err := binary.Write(hashFunc, binary.BigEndian, uint32(len(k.Algo)))
+	if err != nil {
+		return err
+	}
+	_, err = hashFunc.Write([]byte(k.Algo))
+	if err != nil {
+		return err
+	}
+	err = binary.Write(hashFunc, binary.BigEndian, uint32(len(k.Encryption)))
+	if err != nil {
+		return err
+	}
+	_, err = hashFunc.Write([]byte(k.Encryption))
+	if err != nil {
+		return err
+	}
+	err = binary.Write(hashFunc, binary.BigEndian, uint32(len(k.Comment)))
+	if err != nil {
+		return err
+	}
+	_, err = hashFunc.Write([]byte(k.Comment))
+	if err != nil {
+		return err
+	}
+	err = binary.Write(hashFunc, binary.BigEndian, uint32(len(k.PublicKey)))
+	if err != nil {
+		return err
+	}
+	_, err = hashFunc.Write(k.PublicKey)
+	if err != nil {
+		return err
+	}
+	err = binary.Write(hashFunc, binary.BigEndian, uint32(len(k.PrivateKey)))
+	if err != nil {
+		return err
+	}
+	_, err = hashFunc.Write(k.PrivateKey)
+	if err != nil {
+		return err
+	}
 
 	mac := hashFunc.Sum(nil)
 	if !bytes.Equal(mac, k.PrivateMac) {

diff --git a/putty_test.go b/putty_test.go
@@ -446,7 +446,6 @@ Comment: a@b`
 	if err == nil {
 		t.Errorf("Invalid key algorithm")
 	}
-
 }
 
 func TestKey_Load(t *testing.T) {

diff --git a/unmarshal.go b/unmarshal.go
@@ -44,6 +44,7 @@ func parseField(v reflect.Value, src *bytes.Reader) error {
 			}
 		}
 		return nil
+	default:
 	}
 
 	switch fieldType {
-Original file line number
+Diff line change
@@ Expand Up / @@ -446,7 +446,6 @@ Comment: a@b` @@
     	if err == nil {
     		t.Errorf("Invalid key algorithm")
     	}
     }
     func TestKey_Load(t *testing.T) {
@@ Expand Down @@