Skip to content

Commit cfd0e9a

Browse files
nickysemenzanickysemenza
authored
Merge pull request #1255 from thaJeztah/update_gomod
go.mod: update for go1.18 and update/remove obsolete dependencies
2 parents c71f9f6 + 052932c commit cfd0e9a

File tree

2,826 files changed

+79608
-663092
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,826 files changed

+79608
-663092
lines changed

‎Makefile‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@ serve: bin/cfssl
2323
serve:
2424
./bin/cfssl serve
2525

26-
bin/golint: $(shell find vendor -type f -name '*.go')
27-
@mkdir -p $(dir $@)
28-
go build -o $@ ./vendor/golang.org/x/lint/golint
29-
3026
bin/goose: $(shell find vendor -type f -name '*.go')
3127
@mkdir -p $(dir $@)
3228
go build -o $@ ./vendor/bitbucket.org/liamstask/goose/cmd/goose

‎bundler/bundle_from_file_test.go‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,11 @@ type fileTest struct {
2727
bundleChecking func(*testing.T, *Bundle)
2828
}
2929

30-
/* ========== BundleFromFile Test Setup =============
30+
/*
31+
========== BundleFromFile Test Setup =============
3132
3233
For each pair of crypto algorithm X and key size Y, a CA chain is constructed:
34+
3335
Test_root_CA -> inter-L1 -> inter-L2--> cfssl-leaf-ecdsa256
3436
|-> cfssl-leaf-ecdsa384
3537
|-> cfssl-leaf-ecdsa521
@@ -44,8 +46,10 @@ Two inter-* certs are assembled in intermediates.crt
4446
4547
There is also an expired L1 cert, sharing the same CSR with inter-L1. Also the
4648
root CA processes the inter-L2 CSR directly to generate inter-L2-direct cert.
47-
* Test_root_CA--> inter-L1-expired
49+
50+
Test_root_CA--> inter-L1-expired
4851
|-> inter-L2-direct
52+
4953
Using inter-L2-direct as additional intermediate cert should shorten the
5054
bundle chain.
5155
*/

‎certdb/sql/sql_mysql_test.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build mysql
12
// +build mysql
23

34
package sql

‎certdb/sql/sql_pq_test.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build postgresql
12
// +build postgresql
23

34
package sql

‎cli/config.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ type Config struct {
6969
AKI string
7070
DBConfigFile string
7171
CRLExpiration time.Duration
72-
Disable string
72+
Disable string
7373
}
7474

7575
// registerFlags defines all cfssl command flags and associates their values with variables.

‎cli/crl/crl.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//Package crl implements the crl command
1+
// Package crl implements the crl command
22
package crl
33

44
import (

‎cli/gencrl/gencrl.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//Package gencrl implements the gencrl command
1+
// Package gencrl implements the gencrl command
22
package gencrl
33

44
import (

‎cmd/cfssl/cfssl.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ also a tool to start a HTTP server to handle web requests for signing, bundling
44
and verification.
55
66
Usage:
7+
78
cfssl command [-flags] arguments
89
910
The commands are

‎crypto/pkcs7/pkcs7.go‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
// to PKCS #7 format from another encoding such as PEM conforms to this implementation.
44
// reference: https://www.openssl.org/docs/man1.1.0/apps/crl2pkcs7.html
55
//
6-
// PKCS #7 Data type, reference: https://tools.ietf.org/html/rfc2315
6+
// PKCS #7 Data type, reference: https://tools.ietf.org/html/rfc2315
77
//
88
// The full pkcs#7 cryptographic message syntax allows for cryptographic enhancements,
99
// for example data can be encrypted and signed and then packaged through pkcs#7 to be
1010
// sent over a network and then verified and decrypted. It is asn1, and the type of
1111
// PKCS #7 ContentInfo, which comprises the PKCS #7 structure, is:
1212
//
13-
// ContentInfo ::= SEQUENCE {
14-
// contentType ContentType,
15-
// content [0] EXPLICIT ANY DEFINED BY contentType OPTIONAL
16-
// }
13+
// ContentInfo ::= SEQUENCE {
14+
// contentType ContentType,
15+
// content [0] EXPLICIT ANY DEFINED BY contentType OPTIONAL
16+
// }
1717
//
1818
// There are 6 possible ContentTypes, data, signedData, envelopedData,
1919
// signedAndEnvelopedData, digestedData, and encryptedData. Here signedData, Data, and encrypted
@@ -22,15 +22,14 @@
2222
// formats.
2323
// The ContentType signedData has the form:
2424
//
25-
//
26-
// signedData ::= SEQUENCE {
27-
// version Version,
28-
// digestAlgorithms DigestAlgorithmIdentifiers,
29-
// contentInfo ContentInfo,
30-
// certificates [0] IMPLICIT ExtendedCertificatesAndCertificates OPTIONAL
31-
// crls [1] IMPLICIT CertificateRevocationLists OPTIONAL,
32-
// signerInfos SignerInfos
33-
// }
25+
// signedData ::= SEQUENCE {
26+
// version Version,
27+
// digestAlgorithms DigestAlgorithmIdentifiers,
28+
// contentInfo ContentInfo,
29+
// certificates [0] IMPLICIT ExtendedCertificatesAndCertificates OPTIONAL
30+
// crls [1] IMPLICIT CertificateRevocationLists OPTIONAL,
31+
// signerInfos SignerInfos
32+
// }
3433
//
3534
// As of yet signerInfos and digestAlgorithms are not parsed, as they are not relevant to
3635
// this system's use of PKCS #7 data. Version is an integer type, note that PKCS #7 is

‎csr/csr_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ func TestParseRequest(t *testing.T) {
113113
Hosts: []string{"cloudflare.com", "www.cloudflare.com", "192.168.0.1", "[email protected]", "https://www.cloudflare.com"},
114114
KeyRequest: NewKeyRequest(),
115115
Extensions: []pkix.Extension{
116-
pkix.Extension{
116+
{
117117
Id: asn1.ObjectIdentifier{1, 2, 3, 4, 5},
118118
Value: []byte("AgEB"),
119119
},

0 commit comments

Comments
 (0)