Skip to content

Commit

Permalink
Bump dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
CF Logging And Metrics CI Bot committed Apr 16, 2024
1 parent 41aad62 commit 35408de
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 30 deletions.
4 changes: 2 additions & 2 deletions src/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ require (
code.cloudfoundry.org/go-log-cache/v2 v2.0.7
code.cloudfoundry.org/go-loggregator/v9 v9.2.0
code.cloudfoundry.org/go-metric-registry v0.0.0-20240325232813-eb1144b007e4
code.cloudfoundry.org/tlsconfig v0.0.0-20240410162701-78a97c114f7f
code.cloudfoundry.org/tlsconfig v0.0.0-20240416163159-16b37d67cb91
github.com/Benjamintf1/unmarshalledmatchers v0.0.0-20190408201839-bb1c1f34eaea
github.com/benbjohnson/jmphash v0.0.0-20141216154655-2d58f234cd86
github.com/cespare/xxhash v1.1.0
Expand Down Expand Up @@ -63,7 +63,7 @@ require (
github.com/tklauser/go-sysconf v0.3.13 // indirect
github.com/tklauser/numcpus v0.7.0 // indirect
github.com/yusufpapurcu/wmi v1.2.4 // indirect
go.step.sm/crypto v0.44.4 // indirect
go.step.sm/crypto v0.44.5 // indirect
golang.org/x/crypto v0.22.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.19.0 // indirect
Expand Down
8 changes: 4 additions & 4 deletions src/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ code.cloudfoundry.org/go-loggregator/v9 v9.2.0 h1:YNVD654RhMWzG195DZm0gNnrWAJJhE
code.cloudfoundry.org/go-loggregator/v9 v9.2.0/go.mod h1:AP7PmrWSpyC9ltOQHcwF16BVkAVXS96i8+8gwI4lXRY=
code.cloudfoundry.org/go-metric-registry v0.0.0-20240325232813-eb1144b007e4 h1:Fhvj2Am/ySajwFky5UKix+NNNCO3jqv/0IgrDeovXM8=
code.cloudfoundry.org/go-metric-registry v0.0.0-20240325232813-eb1144b007e4/go.mod h1:kRAQ6GTC/+pAWbgKFK6S7zT6pVlUlMFsnk0HDe3Gehc=
code.cloudfoundry.org/tlsconfig v0.0.0-20240410162701-78a97c114f7f h1:Xftr0ImG0QFvqhzO0OW7fdyTFjVVNWTmDi0DHqykxKY=
code.cloudfoundry.org/tlsconfig v0.0.0-20240410162701-78a97c114f7f/go.mod h1:gWadw3Y5wh7DrpGzH8kxASbXeAQngtnHAcfJXF9YQsE=
code.cloudfoundry.org/tlsconfig v0.0.0-20240416163159-16b37d67cb91 h1:NSjgca6N8Ozg5NjSagMJiHgOOsC6TzVEcm6vVwTxuP8=
code.cloudfoundry.org/tlsconfig v0.0.0-20240416163159-16b37d67cb91/go.mod h1:+tUojmqPan76xFy75nGWE8AgsbTsZO00e72KIzR59Yk=
contrib.go.opencensus.io/exporter/ocagent v0.6.0/go.mod h1:zmKjrJcdo0aYcVS7bmEeSEBLPA9YJp5bjrofdU3pIXs=
filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
Expand Down Expand Up @@ -435,8 +435,8 @@ go.mongodb.org/mongo-driver v1.0.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qL
go.mongodb.org/mongo-driver v1.0.4/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
go.step.sm/crypto v0.44.4 h1:Ls5BOGM16AeZoMuiMbK9hbHbvdIEZIPjrrlpYPY5d94=
go.step.sm/crypto v0.44.4/go.mod h1:gGYw4D+5J8uFhBY6dzOBvDE8iwUo+gaOpKPFLcQwv9Q=
go.step.sm/crypto v0.44.5 h1:pgppm1g/RlNrKCDDNj/Dd7I42RCH95dL5HP2oL0ckDk=
go.step.sm/crypto v0.44.5/go.mod h1:gGYw4D+5J8uFhBY6dzOBvDE8iwUo+gaOpKPFLcQwv9Q=
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20181025213731-e84da0312774/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
Expand Down
38 changes: 16 additions & 22 deletions src/vendor/go.step.sm/crypto/pemutil/pem.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -280,29 +280,23 @@ func ParseCertificateRequest(pemData []byte) (*x509.CertificateRequest, error) {
// ReadCertificate returns a *x509.Certificate from the given filename. It
// supports certificates formats PEM and DER.
func ReadCertificate(filename string, opts ...Options) (*x509.Certificate, error) {
b, err := utils.ReadFile(filename)
if err != nil {
// Populate options
ctx := newContext(filename)
if err := ctx.apply(opts); err != nil {
return nil, err
}

// PEM format
if bytes.Contains(b, PEMBlockHeader) {
var crt interface{}
crt, err = Read(filename, opts...)
if err != nil {
return nil, err
}
switch crt := crt.(type) {
case *x509.Certificate:
return crt, nil
default:
return nil, errors.Errorf("error decoding PEM: file '%s' does not contain a certificate", filename)
}
bundle, err := ReadCertificateBundle(filename)
switch {
case err != nil:
return nil, err
case len(bundle) == 0:
return nil, errors.Errorf("file %s does not contain a valid PEM or DER formatted certificate", filename)
case len(bundle) > 1 && !ctx.firstBlock:
return nil, errors.Errorf("error decoding %s: contains more than one PEM encoded block", filename)
default:
return bundle[0], nil
}

// DER format (binary)
crt, err := x509.ParseCertificate(b)
return crt, errors.Wrapf(err, "error parsing %s", filename)
}

// ReadCertificateBundle returns a list of *x509.Certificate from the given
Expand All @@ -324,7 +318,7 @@ func ReadCertificateBundle(filename string) ([]*x509.Certificate, error) {
break
}
if block.Type != "CERTIFICATE" {
return nil, errors.Errorf("error decoding PEM: file '%s' is not a certificate bundle", filename)
continue
}
var crt *x509.Certificate
crt, err = x509.ParseCertificate(block.Bytes)
Expand All @@ -333,8 +327,8 @@ func ReadCertificateBundle(filename string) ([]*x509.Certificate, error) {
}
bundle = append(bundle, crt)
}
if len(b) > 0 {
return nil, errors.Errorf("error decoding PEM: file '%s' contains unexpected data", filename)
if len(bundle) == 0 {
return nil, errors.Errorf("file %s does not contain a valid PEM formatted certificate", filename)
}
return bundle, nil
}
Expand Down
4 changes: 2 additions & 2 deletions src/vendor/modules.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2
## explicit; go 1.21
code.cloudfoundry.org/go-metric-registry
code.cloudfoundry.org/go-metric-registry/testhelpers
# code.cloudfoundry.org/tlsconfig v0.0.0-20240410162701-78a97c114f7f
# code.cloudfoundry.org/tlsconfig v0.0.0-20240416163159-16b37d67cb91
## explicit; go 1.19
code.cloudfoundry.org/tlsconfig
code.cloudfoundry.org/tlsconfig/certtest
Expand Down Expand Up @@ -244,7 +244,7 @@ github.com/tklauser/numcpus
# github.com/yusufpapurcu/wmi v1.2.4
## explicit; go 1.16
github.com/yusufpapurcu/wmi
# go.step.sm/crypto v0.44.4
# go.step.sm/crypto v0.44.5
## explicit; go 1.20
go.step.sm/crypto/fingerprint
go.step.sm/crypto/internal/bcrypt_pbkdf
Expand Down

0 comments on commit 35408de

Please sign in to comment.