Skip to content

Commit a4a846a

Browse files
authored
Merge pull request #1436 from smallstep/dependabot/go_modules/golang.org/x/crypto-0.39.0
Bump golang.org/x/crypto from 0.38.0 to 0.39.0
2 parents f90649e + f8c1eaf commit a4a846a

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

command/crypto/key/format.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ func formatAction(ctx *cli.Context) error {
286286
func isSSHPublicKey(in []byte) bool {
287287
switch {
288288
case bytes.HasPrefix(in, []byte(ssh.KeyAlgoRSA)),
289-
bytes.HasPrefix(in, []byte(ssh.KeyAlgoDSA)),
289+
bytes.HasPrefix(in, []byte(ssh.InsecureKeyAlgoDSA)), //nolint:staticcheck // compatibility with older tooling
290290
bytes.HasPrefix(in, []byte(ssh.KeyAlgoECDSA256)),
291291
bytes.HasPrefix(in, []byte(ssh.KeyAlgoECDSA384)),
292292
bytes.HasPrefix(in, []byte(ssh.KeyAlgoECDSA521)),

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ require (
2929
github.com/urfave/cli v1.22.16
3030
go.mozilla.org/pkcs7 v0.9.0
3131
go.step.sm/crypto v0.66.0
32-
golang.org/x/crypto v0.38.0
32+
golang.org/x/crypto v0.39.0
3333
golang.org/x/sys v0.33.0
3434
golang.org/x/term v0.32.0
3535
google.golang.org/protobuf v1.36.6
@@ -134,8 +134,8 @@ require (
134134
golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 // indirect
135135
golang.org/x/net v0.40.0 // indirect
136136
golang.org/x/oauth2 v0.30.0 // indirect
137-
golang.org/x/sync v0.14.0 // indirect
138-
golang.org/x/text v0.25.0 // indirect
137+
golang.org/x/sync v0.15.0 // indirect
138+
golang.org/x/text v0.26.0 // indirect
139139
golang.org/x/time v0.11.0 // indirect
140140
google.golang.org/api v0.234.0 // indirect
141141
google.golang.org/genproto v0.0.0-20250505200425-f936aa4a68b2 // indirect

go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -387,8 +387,8 @@ golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDf
387387
golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
388388
golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
389389
golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M=
390-
golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8=
391-
golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw=
390+
golang.org/x/crypto v0.39.0 h1:SHs+kF4LP+f+p14esP5jAoDpHU8Gu/v9lFRK6IT5imM=
391+
golang.org/x/crypto v0.39.0/go.mod h1:L+Xg3Wf6HoL4Bn4238Z6ft6KfEpN0tJGo53AAPC632U=
392392
golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 h1:R84qjqJb5nVJMxqWYb3np9L5ZsaDtB+a39EqjV0JSUM=
393393
golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0/go.mod h1:S9Xr4PYopiDyqSyp5NjCrhFrqg6A5zA2E/iPHPhqnS8=
394394
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
@@ -417,8 +417,8 @@ golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
417417
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
418418
golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
419419
golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
420-
golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ=
421-
golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
420+
golang.org/x/sync v0.15.0 h1:KWH3jNZsfyT6xfAfKiz6MRNmd46ByHDYaZ7KSkCtdW8=
421+
golang.org/x/sync v0.15.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
422422
golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
423423
golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
424424
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -464,8 +464,8 @@ golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
464464
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
465465
golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
466466
golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
467-
golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
468-
golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
467+
golang.org/x/text v0.26.0 h1:P42AVeLghgTYr4+xUnTRKDMqpar+PtX7KWuNQL21L8M=
468+
golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA=
469469
golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0=
470470
golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
471471
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

internal/sshutil/sshutil.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func PublicKey(key ssh.PublicKey) (crypto.PublicKey, error) {
5858
return parseECDSA(in)
5959
case ssh.KeyAlgoED25519, ssh.KeyAlgoSKED25519:
6060
return parseED25519(in)
61-
case ssh.KeyAlgoDSA:
61+
case ssh.InsecureKeyAlgoDSA: //nolint:staticcheck // compatibility with older tooling
6262
return parseDSA(in)
6363
default:
6464
return nil, errors.Errorf("public key %s is not supported", key.Type())
@@ -98,7 +98,7 @@ func publicKeyTypeAndSize(key ssh.PublicKey) (string, int, error) {
9898
return "", 0, err
9999
}
100100
size = 8 * k.Size()
101-
case ssh.KeyAlgoDSA:
101+
case ssh.InsecureKeyAlgoDSA: //nolint:staticcheck // compatibility with older tooling
102102
typ = "DSA"
103103
_, in, ok := parseString(key.Marshal())
104104
if !ok {

0 commit comments

Comments
 (0)