From e75e7e7cd6f736595b345ae87a00a611ed307523 Mon Sep 17 00:00:00 2001
From: Mariano Cano <mariano.cano@gmail.com>
Date: Thu, 1 Sep 2022 16:18:13 -0700
Subject: [PATCH] Fix linter warnings

---
 .golangci.yml     |  1 -
 acme/challenge.go | 26 +++++++++++++-------------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index 67aac2df..af723230 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -50,7 +50,6 @@ linters-settings:
 linters:
   disable-all: true
   enable:
-    - deadcode
     - gocritic
     - gofmt
     - gosimple
diff --git a/acme/challenge.go b/acme/challenge.go
index bf2e896d..cd12c5cc 100644
--- a/acme/challenge.go
+++ b/acme/challenge.go
@@ -355,9 +355,8 @@ func deviceAttest01Validate(ctx context.Context, ch *Challenge, db DB, jwk *jose
 					return acmeError
 				}
 				return storeError(ctx, db, ch, true, acmeError)
-			} else {
-				return WrapErrorISE(err, "error validating attestation")
 			}
+			return WrapErrorISE(err, "error validating attestation")
 		}
 
 		// Validate nonce with SHA-256 of the token.
@@ -385,9 +384,8 @@ func deviceAttest01Validate(ctx context.Context, ch *Challenge, db DB, jwk *jose
 					return acmeError
 				}
 				return storeError(ctx, db, ch, true, acmeError)
-			} else {
-				return WrapErrorISE(err, "error validating attestation")
 			}
+			return WrapErrorISE(err, "error validating attestation")
 		}
 
 		// Validate Apple's ClientIdentifier (Identifier.Value) with device
@@ -625,20 +623,22 @@ func doStepAttestationFormat(ctx context.Context, ch *Challenge, jwk *jose.JSONW
 		return nil, NewError(ErrorBadAttestationStatement, "unsupported public key type %T", pub)
 	}
 
-	// Parse attestation data
+	// Parse attestation data:
+	// TODO(mariano): add support for other extensions.
 	data := &stepAttestationData{
 		Certificate: leaf,
 	}
 	for _, ext := range leaf.Extensions {
-		switch {
-		case ext.Id.Equal(oidYubicoSerialNumber):
-			var serialNumber int
-			rest, err := asn1.Unmarshal(ext.Value, &serialNumber)
-			if err != nil || len(rest) > 0 {
-				return nil, WrapError(ErrorBadAttestationStatement, err, "error parsing serial number")
-			}
-			data.SerialNumber = strconv.Itoa(serialNumber)
+		if !ext.Id.Equal(oidYubicoSerialNumber) {
+			continue
+		}
+		var serialNumber int
+		rest, err := asn1.Unmarshal(ext.Value, &serialNumber)
+		if err != nil || len(rest) > 0 {
+			return nil, WrapError(ErrorBadAttestationStatement, err, "error parsing serial number")
 		}
+		data.SerialNumber = strconv.Itoa(serialNumber)
+		break
 	}
 
 	return data, nil