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 Jul 10, 2024
1 parent 3a4f13c commit c2b165e
Show file tree
Hide file tree
Showing 5 changed files with 59 additions and 34 deletions.
8 changes: 4 additions & 4 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.1
code.cloudfoundry.org/go-metric-registry v0.0.0-20240604201903-7cef498efb7a
code.cloudfoundry.org/tlsconfig v0.0.0-20240705175211-7a5a6eee6ef2
code.cloudfoundry.org/tlsconfig v0.0.0-20240710175717-1267031d8b88
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 @@ -64,14 +64,14 @@ require (
github.com/tklauser/go-sysconf v0.3.14 // indirect
github.com/tklauser/numcpus v0.8.0 // indirect
github.com/yusufpapurcu/wmi v1.2.4 // indirect
go.step.sm/crypto v0.48.1 // indirect
go.step.sm/crypto v0.49.0 // indirect
golang.org/x/crypto v0.25.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.22.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/tools v0.23.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240708141625-4ad9e859172b // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240708141625-4ad9e859172b // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240709173604-40e1e62336c5 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240709173604-40e1e62336c5 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Expand Down
16 changes: 8 additions & 8 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.1 h1:S6Lgg5UJbhh2bt2TGQxs6R00CF8PrU
code.cloudfoundry.org/go-loggregator/v9 v9.2.1/go.mod h1:FTFFruqGeOhVCDFvyLgl8EV8YW63NNwRzLhxJcporu8=
code.cloudfoundry.org/go-metric-registry v0.0.0-20240604201903-7cef498efb7a h1:XpebbxgIBBy7SrwIGW+gREZuAtnJ9PHWC4Y+k7yje2I=
code.cloudfoundry.org/go-metric-registry v0.0.0-20240604201903-7cef498efb7a/go.mod h1:/Be8VtLiCeMUoYdUzFtmW8GGkk89HAy3zD79KUXzbhs=
code.cloudfoundry.org/tlsconfig v0.0.0-20240705175211-7a5a6eee6ef2 h1:NshqakKzYrzWzyS4/s8dOnApz3K+JQaH08PLJFCNCvc=
code.cloudfoundry.org/tlsconfig v0.0.0-20240705175211-7a5a6eee6ef2/go.mod h1:iEDSnf9426uabZKMY+OdX3nnkJiwBgx1FK6IVfdiZxo=
code.cloudfoundry.org/tlsconfig v0.0.0-20240710175717-1267031d8b88 h1:JxjCPf3ECmPGP1FEfHhfQ/OuJ1QmCqo9iHz2mT9mny4=
code.cloudfoundry.org/tlsconfig v0.0.0-20240710175717-1267031d8b88/go.mod h1:n7UurXnHf6MFMvzfLN1VGT9W7hwL8Pm5EMrURWs6Yig=
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 @@ -430,8 +430,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.48.1 h1:Z13PjRjL4bQN44L1mOIABUYLrpDQexam3yAEcf3q9hE=
go.step.sm/crypto v0.48.1/go.mod h1:np/n/iXF3tBX/WXKyDIgz8iHT7mqmGHppTr9MKqw5gY=
go.step.sm/crypto v0.49.0 h1:J4qW5/ODYeHJFAM4PuNLSHKBMGWh4iwX6Tcrsp42r+U=
go.step.sm/crypto v0.49.0/go.mod h1:NCFMhLS6FJXQ9sD9PP282oHtsBWLrI6wXZY0eOkq7t8=
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 Expand Up @@ -562,10 +562,10 @@ google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRn
google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
google.golang.org/genproto v0.0.0-20190716160619-c506a9f90610/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
google.golang.org/genproto/googleapis/api v0.0.0-20240708141625-4ad9e859172b h1:y/kpOWeX2pWERnbsvh/hF+Zmo69wVmjyZhstreXQQeA=
google.golang.org/genproto/googleapis/api v0.0.0-20240708141625-4ad9e859172b/go.mod h1:mw8MG/Qz5wfgYr6VqVCiZcHe/GJEfI+oGGDCohaVgB0=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240708141625-4ad9e859172b h1:04+jVzTs2XBnOZcPsLnmrTGqltqJbZQ1Ey26hjYdQQ0=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240708141625-4ad9e859172b/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY=
google.golang.org/genproto/googleapis/api v0.0.0-20240709173604-40e1e62336c5 h1:a/Z0jgw03aJ2rQnp5PlPpznJqJft0HyvyrcUcxgzPwY=
google.golang.org/genproto/googleapis/api v0.0.0-20240709173604-40e1e62336c5/go.mod h1:mw8MG/Qz5wfgYr6VqVCiZcHe/GJEfI+oGGDCohaVgB0=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240709173604-40e1e62336c5 h1:SbSDUWW1PAO24TNpLdeheoYPd7kllICcLU52x6eD4kQ=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240709173604-40e1e62336c5/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY=
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
Expand Down
47 changes: 35 additions & 12 deletions src/vendor/go.step.sm/crypto/pemutil/pem.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ package pemutil

import (
"bytes"
"crypto/ecdh"
"crypto/ecdsa"
"crypto/ed25519"
"crypto/elliptic"
Expand Down Expand Up @@ -732,24 +733,48 @@ func ParseSSH(b []byte) (interface{}, error) {
return nil, errors.Wrap(err, "error unmarshaling key")
}

key := new(ecdsa.PublicKey)
var c ecdh.Curve
switch w.Name {
case ssh.KeyAlgoECDSA256:
key.Curve = elliptic.P256()
c = ecdh.P256()
case ssh.KeyAlgoECDSA384:
key.Curve = elliptic.P384()
c = ecdh.P384()
case ssh.KeyAlgoECDSA521:
key.Curve = elliptic.P521()
c = ecdh.P521()
default:
return nil, errors.Errorf("unsupported ecdsa curve %s", w.Name)
}

key.X, key.Y = elliptic.Unmarshal(key.Curve, w.KeyBytes)
if key.X == nil || key.Y == nil {
return nil, errors.New("invalid ecdsa curve point")
var p *ecdh.PublicKey
if p, err = c.NewPublicKey(w.KeyBytes); err != nil {
return nil, errors.Wrapf(err, "failed decoding %s key", w.Name)
}

// convert ECDH public key to ECDSA public key to keep
// the returned type backwards compatible.
rawKey := p.Bytes()
switch p.Curve() {
case ecdh.P256():
return &ecdsa.PublicKey{
Curve: elliptic.P256(),
X: big.NewInt(0).SetBytes(rawKey[1:33]),
Y: big.NewInt(0).SetBytes(rawKey[33:]),
}, nil
case ecdh.P384():
return &ecdsa.PublicKey{
Curve: elliptic.P384(),
X: big.NewInt(0).SetBytes(rawKey[1:49]),
Y: big.NewInt(0).SetBytes(rawKey[49:]),
}, nil
case ecdh.P521():
return &ecdsa.PublicKey{
Curve: elliptic.P521(),
X: big.NewInt(0).SetBytes(rawKey[1:67]),
Y: big.NewInt(0).SetBytes(rawKey[67:]),
}, nil
default:
return nil, errors.New("cannot convert non-NIST *ecdh.PublicKey to *ecdsa.PublicKey")
}
return key, nil

case ssh.KeyAlgoED25519:
var w struct {
Name string
Expand All @@ -759,10 +784,8 @@ func ParseSSH(b []byte) (interface{}, error) {
return nil, errors.Wrap(err, "error unmarshaling key")
}
return ed25519.PublicKey(w.KeyBytes), nil

case ssh.KeyAlgoDSA:
return nil, errors.Errorf("step does not support DSA keys")

return nil, errors.Errorf("DSA keys not supported")
default:
return nil, errors.Errorf("unsupported key type %T", key)
}
Expand Down
10 changes: 6 additions & 4 deletions src/vendor/go.step.sm/crypto/pemutil/ssh.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (
"crypto/cipher"
"crypto/ecdsa"
"crypto/ed25519"
"crypto/elliptic"
"crypto/rand"
"crypto/rsa"
"encoding/binary"
Expand Down Expand Up @@ -188,15 +187,18 @@ func SerializeOpenSSHPrivateKey(key crypto.PrivateKey, opts ...Options) (*pem.Bl
return nil, errors.Errorf("error serializing key: unsupported curve %s", k.Curve.Params().Name)
}

pub := elliptic.Marshal(k.Curve, k.PublicKey.X, k.PublicKey.Y)
p, err := k.PublicKey.ECDH()
if err != nil {
return nil, errors.Wrapf(err, "failed converting *ecdsa.PublicKey to *ecdh.PublicKey")
}

// Marshal public key.
pubKey := struct {
KeyType string
Curve string
Pub []byte
}{
keyType, curve, pub,
keyType, curve, p.Bytes(),
}
w.PubKey = ssh.Marshal(pubKey)

Expand All @@ -207,7 +209,7 @@ func SerializeOpenSSHPrivateKey(key crypto.PrivateKey, opts ...Options) (*pem.Bl
D *big.Int
Comment string
}{
curve, pub, k.D,
curve, p.Bytes(), k.D,
ctx.comment,
}
pk1.Keytype = keyType
Expand Down
12 changes: 6 additions & 6 deletions src/vendor/modules.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ 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-20240705175211-7a5a6eee6ef2
## explicit; go 1.19
# code.cloudfoundry.org/tlsconfig v0.0.0-20240710175717-1267031d8b88
## explicit; go 1.21
code.cloudfoundry.org/tlsconfig
code.cloudfoundry.org/tlsconfig/certtest
# filippo.io/edwards25519 v1.1.0
Expand Down Expand Up @@ -246,8 +246,8 @@ github.com/tklauser/numcpus
# github.com/yusufpapurcu/wmi v1.2.4
## explicit; go 1.16
github.com/yusufpapurcu/wmi
# go.step.sm/crypto v0.48.1
## explicit; go 1.20
# go.step.sm/crypto v0.49.0
## explicit; go 1.21
go.step.sm/crypto/fingerprint
go.step.sm/crypto/internal/bcrypt_pbkdf
go.step.sm/crypto/internal/emoji
Expand Down Expand Up @@ -316,12 +316,12 @@ golang.org/x/text/unicode/norm
## explicit; go 1.19
golang.org/x/tools/cover
golang.org/x/tools/go/ast/inspector
# google.golang.org/genproto/googleapis/api v0.0.0-20240708141625-4ad9e859172b
# google.golang.org/genproto/googleapis/api v0.0.0-20240709173604-40e1e62336c5
## explicit; go 1.20
google.golang.org/genproto/googleapis/api
google.golang.org/genproto/googleapis/api/annotations
google.golang.org/genproto/googleapis/api/httpbody
# google.golang.org/genproto/googleapis/rpc v0.0.0-20240708141625-4ad9e859172b
# google.golang.org/genproto/googleapis/rpc v0.0.0-20240709173604-40e1e62336c5
## explicit; go 1.20
google.golang.org/genproto/googleapis/rpc/status
# google.golang.org/grpc v1.65.0
Expand Down

0 comments on commit c2b165e

Please sign in to comment.