Fix PR remarks

- Root CA error message improved
- Looping through intermediate certs
- Change checking unhandled extensions to using `if`

acme/challenge.go

@@ -539,18 +539,16 @@ func doTPMAttestationFormat(ctx context.Context, prov Provisioner, ch *Challenge
 	}
 
 	intermediates := x509.NewCertPool()
-	if len(x5c[1:]) > 0 {
+	for _, v := range x5c[1:] {
-		for _, v := range x5c[1:] {
+		intCertBytes, vok := v.([]byte)
-			intCertBytes, vok := v.([]byte)
+		if !vok {
-			if !vok {
+			return nil, NewError(ErrorBadAttestationStatementType, "x5c is malformed")
-				return nil, NewError(ErrorBadAttestationStatementType, "x5c is malformed")
+		}
-			}
+		intCert, err := x509.ParseCertificate(intCertBytes)
-			intCert, err := x509.ParseCertificate(intCertBytes)
+		if err != nil {
-			if err != nil {
+			return nil, WrapError(ErrorBadAttestationStatementType, err, "x5c is malformed")
-				return nil, WrapError(ErrorBadAttestationStatementType, err, "x5c is malformed")
-			}
-			intermediates.AddCert(intCert)
 		}
+		intermediates.AddCert(intCert)
 	}
 
 	// TODO(hs): this can be removed when permanent-identifier/hardware-module-name are handled correctly in
@@ -559,11 +557,8 @@ func doTPMAttestationFormat(ctx context.Context, prov Provisioner, ch *Challenge
 	if len(akCert.UnhandledCriticalExtensions) > 0 {
 		unhandledCriticalExtensions := akCert.UnhandledCriticalExtensions[:0]
 		for _, extOID := range akCert.UnhandledCriticalExtensions {
-			switch {
+			if !extOID.Equal(oidSubjectAlternativeName) {
-			case extOID.Equal(oidSubjectAlternativeName):
+				// critical extensions other than the Subject Alternative Name remain unhandled
-				// allow Subject Alternative Names, including PermanentIdentifier, HardwareModuleName, TPM attributes, etc
-			default:
-				// OIDs that are not in the switch with explicitly allowed OIDs remain unhandled
 				unhandledCriticalExtensions = append(unhandledCriticalExtensions, extOID)
 			}
 		}
@@ -572,7 +567,7 @@ func doTPMAttestationFormat(ctx context.Context, prov Provisioner, ch *Challenge
 
 	roots, ok := prov.GetAttestationRoots()
 	if !ok {
-		return nil, NewErrorISE("failed getting TPM attestation root CAs")
+		return nil, NewErrorISE("no root CA bundle available to verify the attestation certificate")
 	}
 
 	verifiedChains, err := akCert.Verify(x509.VerifyOptions{
@@ -646,8 +641,6 @@ func doTPMAttestationFormat(ctx context.Context, prov Provisioner, ch *Challenge
 	switch alg {
 	case -257: // RS256
 		hash = crypto.SHA256
-	case -8: // EdDSA
-		hash = crypto.Hash(0)
 	case -7: // ES256
 		hash = crypto.SHA256
 	default:

acme/challenge_tpmsimulator_test.go

@@ -644,7 +644,7 @@ func Test_doTPMAttestationFormat(t *testing.T) {
 				"certInfo": params.CreateAttestation,
 				"pubArea":  params.Public,
 			},
-		}}, nil, newInternalServerError("failed getting TPM attestation root CAs")},
+		}}, nil, newInternalServerError("no root CA bundle available to verify the attestation certificate")},
 		{"fail verify", args{ctx, mustAttestationProvisioner(t, acaRoot), &Challenge{Token: "token"}, jwk, &attestationObject{
 			Format: "step",
 			AttStatement: map[string]interface{}{