Skip to content

Commit 4132144

Browse files
author
CF Logging And Metrics CI Bot
committed
Bump dependencies
1 parent 30c3698 commit 4132144

File tree

6 files changed

+119
-42
lines changed

6 files changed

+119
-42
lines changed

src/go.mod

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ require (
88
code.cloudfoundry.org/go-batching v0.0.0-20250217142405-e451d572b3eb
99
code.cloudfoundry.org/go-diodes v0.0.0-20250217093403-cd1363c1f46a
1010
code.cloudfoundry.org/go-envstruct v1.7.0
11-
code.cloudfoundry.org/go-loggregator/v10 v10.0.1
12-
code.cloudfoundry.org/go-metric-registry v0.0.0-20250217183042-3b486222274d
11+
code.cloudfoundry.org/go-loggregator/v10 v10.1.0
12+
code.cloudfoundry.org/go-metric-registry v0.0.0-20250225215424-238194030075
1313
code.cloudfoundry.org/go-pubsub v0.0.0-20250217211141-cd4c6d8fe3c6
14-
code.cloudfoundry.org/tlsconfig v0.18.0
14+
code.cloudfoundry.org/tlsconfig v0.19.0
1515
github.com/cloudfoundry/noaa/v2 v2.5.0
1616
github.com/cloudfoundry/sonde-go v0.0.0-20250217093333-7351ffed9384
1717
github.com/gorilla/handlers v1.5.2
@@ -35,7 +35,7 @@ require (
3535
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
3636
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
3737
github.com/google/go-cmp v0.7.0 // indirect
38-
github.com/google/pprof v0.0.0-20250208200701-d0013a598941 // indirect
38+
github.com/google/pprof v0.0.0-20250302191652-9094ed2288e7 // indirect
3939
github.com/klauspost/compress v1.18.0 // indirect
4040
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
4141
github.com/nxadm/tail v1.4.11 // indirect
@@ -45,12 +45,12 @@ require (
4545
github.com/prometheus/common v0.62.0 // indirect
4646
github.com/prometheus/procfs v0.15.1 // indirect
4747
github.com/square/certstrap v1.3.0 // indirect
48-
go.step.sm/crypto v0.58.0 // indirect
49-
golang.org/x/crypto v0.34.0 // indirect
48+
go.step.sm/crypto v0.59.0 // indirect
49+
golang.org/x/crypto v0.35.0 // indirect
5050
golang.org/x/sys v0.30.0 // indirect
5151
golang.org/x/text v0.22.0 // indirect
5252
golang.org/x/tools v0.30.0 // indirect
53-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250219182151-9fdb1cabc7b2 // indirect
53+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250227231956-55c901821b1e // indirect
5454
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
5555
gopkg.in/yaml.v3 v3.0.1 // indirect
5656
)

src/go.sum

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ code.cloudfoundry.org/go-diodes v0.0.0-20250217093403-cd1363c1f46a h1:i0g4e0LCQx
44
code.cloudfoundry.org/go-diodes v0.0.0-20250217093403-cd1363c1f46a/go.mod h1:0VGmmzbiipVB6xQB/9dFusj8EzMkRG42PgYybL7Xj5Q=
55
code.cloudfoundry.org/go-envstruct v1.7.0 h1:6e90Z+lTPrI2jMJOoKErskL7a+Qm97GFiithcXeVWdk=
66
code.cloudfoundry.org/go-envstruct v1.7.0/go.mod h1:xm6Eto/WB7Qq1iwEN29jUQXDeUCJ+nruwAnnrpY0s4E=
7-
code.cloudfoundry.org/go-loggregator/v10 v10.0.1 h1:rivqd/B1gjA9ihA4p6K5EijRSyv0cUjfvrp9hMkQ4Ys=
8-
code.cloudfoundry.org/go-loggregator/v10 v10.0.1/go.mod h1:DKE0kBqMXWqAzd8CMl5CAbRFUpWGBWPpmOyY4znP6ts=
9-
code.cloudfoundry.org/go-metric-registry v0.0.0-20250217183042-3b486222274d h1:sQ1jAx0ZM+cLGcC1Lxhmux1IIX3CThEUHvOBg2IOEx0=
10-
code.cloudfoundry.org/go-metric-registry v0.0.0-20250217183042-3b486222274d/go.mod h1:Na9QpZ2rIqzvpLzEyTBIMDZ/UghdCijs64SSZRLeJVo=
7+
code.cloudfoundry.org/go-loggregator/v10 v10.1.0 h1:Hwp3dUklynGlkJakzyfmXKiOT+WpPCz4t3fDGQNoegI=
8+
code.cloudfoundry.org/go-loggregator/v10 v10.1.0/go.mod h1:zXRyE5kx5TwI95gePR2p8d5kPYr6NGqoCbby1ly0XWE=
9+
code.cloudfoundry.org/go-metric-registry v0.0.0-20250225215424-238194030075 h1:PcyDN4mg4JEln7PgVM92HGq7MVUhCrjFeRf68/mPULY=
10+
code.cloudfoundry.org/go-metric-registry v0.0.0-20250225215424-238194030075/go.mod h1:5cBxgxm73iKM/A+3QtZVf07adgjgas5Q9y17C9MS2oE=
1111
code.cloudfoundry.org/go-pubsub v0.0.0-20250217211141-cd4c6d8fe3c6 h1:iSJOf26V5HRAoRPm7wtft5DKLXegbWvX93jljrHe0Us=
1212
code.cloudfoundry.org/go-pubsub v0.0.0-20250217211141-cd4c6d8fe3c6/go.mod h1:QxOFtPAFdKuZ2+ZsNW9GcMfxc8wAucVJ7dCuai+H6+s=
13-
code.cloudfoundry.org/tlsconfig v0.18.0 h1:p2SSvVYOqBXKbFD8f8A+Uky5zdlTSJgSWfpk71q7wts=
14-
code.cloudfoundry.org/tlsconfig v0.18.0/go.mod h1:bhzn8qKcq9voqMOWrCoLuDSpbek31TtcUONu1GDjbDY=
13+
code.cloudfoundry.org/tlsconfig v0.19.0 h1:HOpEtyQ+M0z6XT4F28/b4oY3DKfHy4rh5ITf3zJ/WLE=
14+
code.cloudfoundry.org/tlsconfig v0.19.0/go.mod h1:Tw1bAcguRWrUAtMBX1g9cFbejKWoeHzMjhejZyVUJ0Q=
1515
filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
1616
filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
1717
github.com/apoydence/eachers v0.0.0-20181020210610-23942921fe77 h1:afT88tB6u9JCKQZVAAaa9ICz/uGn5Uw9ekn6P22mYKM=
@@ -61,8 +61,8 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
6161
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
6262
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
6363
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
64-
github.com/google/pprof v0.0.0-20250208200701-d0013a598941 h1:43XjGa6toxLpeksjcxs1jIoIyr+vUfOqY2c6HB4bpoc=
65-
github.com/google/pprof v0.0.0-20250208200701-d0013a598941/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
64+
github.com/google/pprof v0.0.0-20250302191652-9094ed2288e7 h1:+J3r2e8+RsmN3vKfo75g0YSY61ms37qzPglu4p0sGro=
65+
github.com/google/pprof v0.0.0-20250302191652-9094ed2288e7/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
6666
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
6767
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
6868
github.com/gorilla/handlers v1.5.2 h1:cLTUSsNkgcwhgRqvCNmdbRWG0A3N4F+M2nWKdScwyEE=
@@ -132,13 +132,13 @@ go.opentelemetry.io/otel/sdk/metric v1.32.0 h1:rZvFnvmvawYb0alrYkjraqJq0Z4ZUJAiy
132132
go.opentelemetry.io/otel/sdk/metric v1.32.0/go.mod h1:PWeZlq0zt9YkYAp3gjKZ0eicRYvOh1Gd+X99x6GHpCQ=
133133
go.opentelemetry.io/otel/trace v1.34.0 h1:+ouXS2V8Rd4hp4580a8q23bg0azF2nI8cqLYnC8mh/k=
134134
go.opentelemetry.io/otel/trace v1.34.0/go.mod h1:Svm7lSjQD7kG7KJ/MUHPVXSDGz2OX4h0M2jHBhmSfRE=
135-
go.step.sm/crypto v0.58.0 h1:PrrtM9fP8Y7A7193WnZDu2bqEZu7jc7M8+CCkDarMtw=
136-
go.step.sm/crypto v0.58.0/go.mod h1:yluOL5OqY7mXGGQ7JUmAv/6h8T8Ge3yXdlEESWHOqDQ=
135+
go.step.sm/crypto v0.59.0 h1:BDEbdyYJpp0yOSx7dmT+9git2/BXfkCsCzJKOj3v9RI=
136+
go.step.sm/crypto v0.59.0/go.mod h1:wz5S8Q0NI/x22TIWQxdGD+ioHa+ge2FbkcPmbXUzNao=
137137
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
138138
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
139139
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
140-
golang.org/x/crypto v0.34.0 h1:+/C6tk6rf/+t5DhUketUbD1aNGqiSX3j15Z6xuIDlBA=
141-
golang.org/x/crypto v0.34.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=
140+
golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=
141+
golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=
142142
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
143143
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
144144
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@@ -177,8 +177,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T
177177
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
178178
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
179179
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
180-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250219182151-9fdb1cabc7b2 h1:DMTIbak9GhdaSxEjvVzAeNZvyc03I61duqNbnm3SU0M=
181-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250219182151-9fdb1cabc7b2/go.mod h1:LuRYeWDFV6WOn90g357N17oMCaxpgCnbi/44qJvDn2I=
180+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250227231956-55c901821b1e h1:YA5lmSs3zc/5w+xsRcHqpETkaYyK63ivEPzNTcUUlSA=
181+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250227231956-55c901821b1e/go.mod h1:LuRYeWDFV6WOn90g357N17oMCaxpgCnbi/44qJvDn2I=
182182
google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ=
183183
google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw=
184184
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
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/golang.org/x/crypto/ssh/handshake.go

Lines changed: 37 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/vendor/modules.txt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,20 @@ code.cloudfoundry.org/go-diodes
77
# code.cloudfoundry.org/go-envstruct v1.7.0
88
## explicit; go 1.21
99
code.cloudfoundry.org/go-envstruct
10-
# code.cloudfoundry.org/go-loggregator/v10 v10.0.1
11-
## explicit; go 1.21
10+
# code.cloudfoundry.org/go-loggregator/v10 v10.1.0
11+
## explicit; go 1.22.0
1212
code.cloudfoundry.org/go-loggregator/v10/conversion
1313
code.cloudfoundry.org/go-loggregator/v10/rpc/loggregator_v2
14-
# code.cloudfoundry.org/go-metric-registry v0.0.0-20250217183042-3b486222274d
14+
# code.cloudfoundry.org/go-metric-registry v0.0.0-20250225215424-238194030075
1515
## explicit; go 1.22.0
1616
code.cloudfoundry.org/go-metric-registry
1717
# code.cloudfoundry.org/go-pubsub v0.0.0-20250217211141-cd4c6d8fe3c6
1818
## explicit; go 1.17
1919
code.cloudfoundry.org/go-pubsub
2020
code.cloudfoundry.org/go-pubsub/internal/node
2121
code.cloudfoundry.org/go-pubsub/pubsub-gen/setters
22-
# code.cloudfoundry.org/tlsconfig v0.18.0
23-
## explicit; go 1.22
22+
# code.cloudfoundry.org/tlsconfig v0.19.0
23+
## explicit; go 1.23.0
2424
code.cloudfoundry.org/tlsconfig
2525
code.cloudfoundry.org/tlsconfig/certtest
2626
# filippo.io/edwards25519 v1.1.0
@@ -66,7 +66,7 @@ github.com/google/go-cmp/cmp/internal/diff
6666
github.com/google/go-cmp/cmp/internal/flags
6767
github.com/google/go-cmp/cmp/internal/function
6868
github.com/google/go-cmp/cmp/internal/value
69-
# github.com/google/pprof v0.0.0-20250208200701-d0013a598941
69+
# github.com/google/pprof v0.0.0-20250302191652-9094ed2288e7
7070
## explicit; go 1.22
7171
github.com/google/pprof/profile
7272
# github.com/gorilla/handlers v1.5.2
@@ -186,7 +186,7 @@ github.com/prometheus/procfs/internal/util
186186
# github.com/square/certstrap v1.3.0
187187
## explicit; go 1.18
188188
github.com/square/certstrap/pkix
189-
# go.step.sm/crypto v0.58.0
189+
# go.step.sm/crypto v0.59.0
190190
## explicit; go 1.22.12
191191
go.step.sm/crypto/fingerprint
192192
go.step.sm/crypto/internal/bcrypt_pbkdf
@@ -197,7 +197,7 @@ go.step.sm/crypto/keyutil
197197
go.step.sm/crypto/pemutil
198198
go.step.sm/crypto/randutil
199199
go.step.sm/crypto/x25519
200-
# golang.org/x/crypto v0.34.0
200+
# golang.org/x/crypto v0.35.0
201201
## explicit; go 1.23.0
202202
golang.org/x/crypto/blowfish
203203
golang.org/x/crypto/chacha20
@@ -256,7 +256,7 @@ golang.org/x/text/unicode/norm
256256
golang.org/x/tools/cover
257257
golang.org/x/tools/go/ast/inspector
258258
golang.org/x/tools/internal/astutil/edge
259-
# google.golang.org/genproto/googleapis/rpc v0.0.0-20250219182151-9fdb1cabc7b2
259+
# google.golang.org/genproto/googleapis/rpc v0.0.0-20250227231956-55c901821b1e
260260
## explicit; go 1.23.0
261261
google.golang.org/genproto/googleapis/rpc/status
262262
# google.golang.org/grpc v1.70.0

0 commit comments

Comments
 (0)