Skip to content

Commit 273986a

Browse files
author
CF Logging And Metrics CI Bot
committed
Bump dependencies
1 parent 1cd48f1 commit 273986a

File tree

5 files changed

+69
-19
lines changed

5 files changed

+69
-19
lines changed

src/go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ toolchain go1.23.6
66

77
require (
88
code.cloudfoundry.org/go-loggregator/v9 v9.2.1
9-
code.cloudfoundry.org/tlsconfig v0.18.0
9+
code.cloudfoundry.org/tlsconfig v0.19.0
1010
git.sr.ht/~nelsam/hel/v3 v3.0.4
1111
github.com/onsi/ginkgo/v2 v2.22.2
1212
github.com/onsi/gomega v1.36.2
@@ -18,23 +18,23 @@ require (
1818
github.com/go-logr/logr v1.4.2 // indirect
1919
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
2020
github.com/google/go-cmp v0.7.0 // indirect
21-
github.com/google/pprof v0.0.0-20250208200701-d0013a598941 // indirect
21+
github.com/google/pprof v0.0.0-20250302191652-9094ed2288e7 // indirect
2222
github.com/inconshreveable/mousetrap v1.1.0 // indirect
2323
github.com/kr/text v0.2.0 // indirect
2424
github.com/pkg/errors v0.9.1 // indirect
2525
github.com/poy/onpar v1.1.2 // indirect
2626
github.com/spf13/cobra v1.9.1 // indirect
2727
github.com/spf13/pflag v1.0.6 // indirect
2828
github.com/square/certstrap v1.3.0 // indirect
29-
go.step.sm/crypto v0.58.0 // indirect
29+
go.step.sm/crypto v0.59.0 // indirect
3030
golang.org/x/crypto v0.35.0 // indirect
3131
golang.org/x/mod v0.23.0 // indirect
3232
golang.org/x/net v0.35.0 // indirect
3333
golang.org/x/sync v0.11.0 // indirect
3434
golang.org/x/sys v0.30.0 // indirect
3535
golang.org/x/text v0.22.0 // indirect
3636
golang.org/x/tools v0.30.0 // indirect
37-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250224174004-546df14abb99 // indirect
37+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250227231956-55c901821b1e // indirect
3838
google.golang.org/protobuf v1.36.5 // indirect
3939
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
4040
gopkg.in/yaml.v3 v3.0.1 // indirect

src/go.sum

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
22
code.cloudfoundry.org/go-loggregator/v9 v9.2.1 h1:S6Lgg5UJbhh2bt2TGQxs6R00CF8PrUA3GFPYDxy56Fk=
33
code.cloudfoundry.org/go-loggregator/v9 v9.2.1/go.mod h1:FTFFruqGeOhVCDFvyLgl8EV8YW63NNwRzLhxJcporu8=
4-
code.cloudfoundry.org/tlsconfig v0.18.0 h1:p2SSvVYOqBXKbFD8f8A+Uky5zdlTSJgSWfpk71q7wts=
5-
code.cloudfoundry.org/tlsconfig v0.18.0/go.mod h1:bhzn8qKcq9voqMOWrCoLuDSpbek31TtcUONu1GDjbDY=
4+
code.cloudfoundry.org/tlsconfig v0.19.0 h1:HOpEtyQ+M0z6XT4F28/b4oY3DKfHy4rh5ITf3zJ/WLE=
5+
code.cloudfoundry.org/tlsconfig v0.19.0/go.mod h1:Tw1bAcguRWrUAtMBX1g9cFbejKWoeHzMjhejZyVUJ0Q=
66
filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
77
filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
88
git.sr.ht/~nelsam/hel/v3 v3.0.4 h1:ElleA4q9XHTskFod5T7cC4oXOULo41jKRjYijTIlJgw=
@@ -56,8 +56,8 @@ github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ
5656
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
5757
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
5858
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
59-
github.com/google/pprof v0.0.0-20250208200701-d0013a598941 h1:43XjGa6toxLpeksjcxs1jIoIyr+vUfOqY2c6HB4bpoc=
60-
github.com/google/pprof v0.0.0-20250208200701-d0013a598941/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
59+
github.com/google/pprof v0.0.0-20250302191652-9094ed2288e7 h1:+J3r2e8+RsmN3vKfo75g0YSY61ms37qzPglu4p0sGro=
60+
github.com/google/pprof v0.0.0-20250302191652-9094ed2288e7/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
6161
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
6262
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
6363
github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
@@ -157,8 +157,8 @@ go.opentelemetry.io/otel/sdk/metric v1.32.0 h1:rZvFnvmvawYb0alrYkjraqJq0Z4ZUJAiy
157157
go.opentelemetry.io/otel/sdk/metric v1.32.0/go.mod h1:PWeZlq0zt9YkYAp3gjKZ0eicRYvOh1Gd+X99x6GHpCQ=
158158
go.opentelemetry.io/otel/trace v1.34.0 h1:+ouXS2V8Rd4hp4580a8q23bg0azF2nI8cqLYnC8mh/k=
159159
go.opentelemetry.io/otel/trace v1.34.0/go.mod h1:Svm7lSjQD7kG7KJ/MUHPVXSDGz2OX4h0M2jHBhmSfRE=
160-
go.step.sm/crypto v0.58.0 h1:PrrtM9fP8Y7A7193WnZDu2bqEZu7jc7M8+CCkDarMtw=
161-
go.step.sm/crypto v0.58.0/go.mod h1:yluOL5OqY7mXGGQ7JUmAv/6h8T8Ge3yXdlEESWHOqDQ=
160+
go.step.sm/crypto v0.59.0 h1:BDEbdyYJpp0yOSx7dmT+9git2/BXfkCsCzJKOj3v9RI=
161+
go.step.sm/crypto v0.59.0/go.mod h1:wz5S8Q0NI/x22TIWQxdGD+ioHa+ge2FbkcPmbXUzNao=
162162
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
163163
go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
164164
go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
@@ -225,8 +225,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T
225225
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
226226
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
227227
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
228-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250224174004-546df14abb99 h1:ZSlhAUqC4r8TPzqLXQ0m3upBNZeF+Y8jQ3c4CR3Ujms=
229-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250224174004-546df14abb99/go.mod h1:LuRYeWDFV6WOn90g357N17oMCaxpgCnbi/44qJvDn2I=
228+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250227231956-55c901821b1e h1:YA5lmSs3zc/5w+xsRcHqpETkaYyK63ivEPzNTcUUlSA=
229+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250227231956-55c901821b1e/go.mod h1:LuRYeWDFV6WOn90g357N17oMCaxpgCnbi/44qJvDn2I=
230230
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
231231
google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
232232
google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ=
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
package utils
2+
3+
// IsPrintableString reports whether the given s is a valid ASN.1 PrintableString.
4+
// If asterisk is allowAsterisk then '*' is also allowed, reflecting existing
5+
// practice. If ampersand is allowAmpersand then '&' is allowed as well.
6+
func IsPrintableString(s string, asterisk, ampersand bool) bool {
7+
for _, b := range s {
8+
valid := 'a' <= b && b <= 'z' ||
9+
'A' <= b && b <= 'Z' ||
10+
'0' <= b && b <= '9' ||
11+
'\'' <= b && b <= ')' ||
12+
'+' <= b && b <= '/' ||
13+
b == ' ' ||
14+
b == ':' ||
15+
b == '=' ||
16+
b == '?' ||
17+
// This is technically not allowed in a PrintableString.
18+
// However, x509 certificates with wildcard strings don't
19+
// always use the correct string type so we permit it.
20+
(asterisk && b == '*') ||
21+
// This is not technically allowed either. However, not
22+
// only is it relatively common, but there are also a
23+
// handful of CA certificates that contain it. At least
24+
// one of which will not expire until 2027.
25+
(ampersand && b == '&')
26+
27+
if !valid {
28+
return false
29+
}
30+
}
31+
32+
return true
33+
}

src/vendor/go.step.sm/crypto/pemutil/pem.go

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ type context struct {
6868
func newContext(name string) *context {
6969
return &context{
7070
filename: name,
71-
perm: 0600,
71+
perm: 0o600,
7272
}
7373
}
7474

@@ -128,7 +128,7 @@ func WithFilename(name string) Options {
128128
ctx.filename = name
129129
// Default perm mode if not set
130130
if ctx.perm == 0 {
131-
ctx.perm = 0600
131+
ctx.perm = 0o600
132132
}
133133
return nil
134134
}
@@ -164,6 +164,23 @@ func WithPasswordFile(filename string) Options {
164164
}
165165
}
166166

167+
// WithMinLengthPasswordFile is a method that adds the password in a file to the
168+
// context. If the password does not meet the minimum length requirement an
169+
// error is returned. If minimum length input is <=0 then the requirement is
170+
// ignored.
171+
func WithMinLengthPasswordFile(filename string, minLength int) Options {
172+
return func(ctx *context) error {
173+
if err := WithPasswordFile(filename)(ctx); err != nil {
174+
return err
175+
}
176+
177+
if minLength > 0 && len(ctx.password) < minLength {
178+
return fmt.Errorf("password does not meet minimum length requirement; must be at least %v characters", minLength)
179+
}
180+
return nil
181+
}
182+
}
183+
167184
// WithPasswordPrompt ask the user for a password and adds it to the context.
168185
func WithPasswordPrompt(prompt string, fn PasswordPrompter) Options {
169186
return func(ctx *context) error {

src/vendor/modules.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# code.cloudfoundry.org/go-loggregator/v9 v9.2.1
22
## explicit; go 1.21
33
code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2
4-
# code.cloudfoundry.org/tlsconfig v0.18.0
5-
## explicit; go 1.22
4+
# code.cloudfoundry.org/tlsconfig v0.19.0
5+
## explicit; go 1.23.0
66
code.cloudfoundry.org/tlsconfig
77
code.cloudfoundry.org/tlsconfig/certtest
88
# filippo.io/edwards25519 v1.1.0
@@ -29,7 +29,7 @@ github.com/google/go-cmp/cmp/internal/diff
2929
github.com/google/go-cmp/cmp/internal/flags
3030
github.com/google/go-cmp/cmp/internal/function
3131
github.com/google/go-cmp/cmp/internal/value
32-
# github.com/google/pprof v0.0.0-20250208200701-d0013a598941
32+
# github.com/google/pprof v0.0.0-20250302191652-9094ed2288e7
3333
## explicit; go 1.22
3434
github.com/google/pprof/profile
3535
# github.com/inconshreveable/mousetrap v1.1.0
@@ -88,7 +88,7 @@ github.com/spf13/pflag
8888
# github.com/square/certstrap v1.3.0
8989
## explicit; go 1.18
9090
github.com/square/certstrap/pkix
91-
# go.step.sm/crypto v0.58.0
91+
# go.step.sm/crypto v0.59.0
9292
## explicit; go 1.22.12
9393
go.step.sm/crypto/fingerprint
9494
go.step.sm/crypto/internal/bcrypt_pbkdf
@@ -180,7 +180,7 @@ golang.org/x/tools/internal/stdlib
180180
golang.org/x/tools/internal/typeparams
181181
golang.org/x/tools/internal/typesinternal
182182
golang.org/x/tools/internal/versions
183-
# google.golang.org/genproto/googleapis/rpc v0.0.0-20250224174004-546df14abb99
183+
# google.golang.org/genproto/googleapis/rpc v0.0.0-20250227231956-55c901821b1e
184184
## explicit; go 1.23.0
185185
google.golang.org/genproto/googleapis/rpc/status
186186
# google.golang.org/grpc v1.70.0

0 commit comments

Comments
 (0)