all: gofmt for go1.18 (fixes missing build-tags)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Author: thaJeztah

api/revoke/revoke_test.go

@@ -142,9 +142,9 @@ func TestOCSPGeneration(t *testing.T) {
 		Subject: pkix.Name{
 			Organization: []string{"cfssl unit test"},
 		},
-		AuthorityKeyId: []byte{42, 42, 42, 42},
-		KeyUsage:       x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign,
-		IsCA:           true,
+		AuthorityKeyId:        []byte{42, 42, 42, 42},
+		KeyUsage:              x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign,
+		IsCA:                  true,
 		BasicConstraintsValid: true,
 	}
 	issuerBytes, err := x509.CreateCertificate(rand.Reader, &issuerTemplate, &issuerTemplate, &privKey.PublicKey, privKey)

bundler/bundle_from_file_test.go

@@ -27,9 +27,11 @@ type fileTest struct {
 	bundleChecking func(*testing.T, *Bundle)
 }
 
-/* ========== BundleFromFile Test Setup =============
+/*
+	========== BundleFromFile Test Setup =============
 
 For each pair of crypto algorithm X and key size Y, a CA chain is constructed:
+
 	Test_root_CA -> inter-L1 -> inter-L2--> cfssl-leaf-ecdsa256
 	                                    |-> cfssl-leaf-ecdsa384
 	                                    |-> cfssl-leaf-ecdsa521
@@ -44,8 +46,10 @@ Two inter-* certs are assembled in intermediates.crt
 
 There is also an expired L1 cert, sharing the same CSR with inter-L1. Also the
 root CA processes the inter-L2 CSR directly to generate inter-L2-direct cert.
-*	Test_root_CA--> inter-L1-expired
+
+	Test_root_CA--> inter-L1-expired
 	            |-> inter-L2-direct
+
 Using inter-L2-direct as additional intermediate cert should shorten the
 bundle chain.
 */

certdb/sql/sql_mysql_test.go

@@ -1,3 +1,4 @@
+//go:build mysql
 // +build mysql
 
 package sql

certdb/sql/sql_pq_test.go

@@ -1,3 +1,4 @@
+//go:build postgresql
 // +build postgresql
 
 package sql

cli/config.go

@@ -69,7 +69,7 @@ type Config struct {
 	AKI               string
 	DBConfigFile      string
 	CRLExpiration     time.Duration
-	Disable     	  string
+	Disable           string
 }
 
 // registerFlags defines all cfssl command flags and associates their values with variables.

cli/crl/crl.go

@@ -1,4 +1,4 @@
-//Package crl implements the crl command
+// Package crl implements the crl command
 package crl
 
 import (

cli/gencrl/gencrl.go

@@ -1,4 +1,4 @@
-//Package gencrl implements the gencrl command
+// Package gencrl implements the gencrl command
 package gencrl
 
 import (

cmd/cfssl/cfssl.go

@@ -4,6 +4,7 @@ also a tool to start a HTTP server to handle web requests for signing, bundling
 and verification.
 
 Usage:
+
 	cfssl command [-flags] arguments
 
 	The commands are

cmd/mkbundle/mkbundle.go

@@ -2,6 +2,7 @@
 // All certificates in the input file paths are checked for revocation and bundled together.
 //
 // Usage:
+//
 //	mkbundle -f bundle_file -nw number_of_workers certificate_file_path ...
 package main
 

crypto/pkcs7/pkcs7.go

@@ -3,17 +3,17 @@
 // to PKCS #7 format from another encoding such as PEM conforms to this implementation.
 // reference: https://www.openssl.org/docs/man1.1.0/apps/crl2pkcs7.html
 //
-//			PKCS #7 Data type, reference: https://tools.ietf.org/html/rfc2315
+// PKCS #7 Data type, reference: https://tools.ietf.org/html/rfc2315
 //
 // The full pkcs#7 cryptographic message syntax allows for cryptographic enhancements,
 // for example data can be encrypted and signed and then packaged through pkcs#7 to be
 // sent over a network and then verified and decrypted.  It is asn1, and the type of
 // PKCS #7 ContentInfo, which comprises the PKCS #7 structure, is:
 //
-//			ContentInfo ::= SEQUENCE {
-//				contentType ContentType,
-//				content [0] EXPLICIT ANY DEFINED BY contentType OPTIONAL
-//			}
+//	ContentInfo ::= SEQUENCE {
+//		contentType ContentType,
+//		content [0] EXPLICIT ANY DEFINED BY contentType OPTIONAL
+//	}
 //
 // There are 6 possible ContentTypes, data, signedData, envelopedData,
 // signedAndEnvelopedData, digestedData, and encryptedData.  Here signedData, Data, and encrypted
@@ -22,15 +22,14 @@
 // formats.
 // The ContentType signedData has the form:
 //
-//
-//			signedData ::= SEQUENCE {
-//				version Version,
-//				digestAlgorithms DigestAlgorithmIdentifiers,
-//				contentInfo ContentInfo,
-//				certificates [0] IMPLICIT ExtendedCertificatesAndCertificates OPTIONAL
-//				crls [1] IMPLICIT CertificateRevocationLists OPTIONAL,
-//				signerInfos SignerInfos
-//			}
+//	signedData ::= SEQUENCE {
+//		version Version,
+//		digestAlgorithms DigestAlgorithmIdentifiers,
+//		contentInfo ContentInfo,
+//		certificates [0] IMPLICIT ExtendedCertificatesAndCertificates OPTIONAL
+//		crls [1] IMPLICIT CertificateRevocationLists OPTIONAL,
+//		signerInfos SignerInfos
+//	}
 //
 // As of yet signerInfos and digestAlgorithms are not parsed, as they are not relevant to
 // this system's use of PKCS #7 data.  Version is an integer type, note that PKCS #7 is