diff --git a/go.mod b/go.mod index 8f07852c..0f5832fb 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.19 require ( github.com/Masterminds/semver v1.5.0 github.com/cloudfoundry/bosh-cli v6.4.1+incompatible - github.com/cloudfoundry/bosh-utils v0.0.350 + github.com/cloudfoundry/bosh-utils v0.0.351 github.com/cppforlife/go-patch v0.2.0 github.com/google/go-github v17.0.0+incompatible github.com/pkg/errors v0.9.1 @@ -18,7 +18,7 @@ require ( ) require ( - code.cloudfoundry.org/tlsconfig v0.0.0-20220621140725-0e6fbd869921 // indirect + code.cloudfoundry.org/tlsconfig v0.0.0-20230125185630-3cc0b1c5221e // indirect github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect github.com/beorn7/perks v1.0.1 // indirect diff --git a/go.sum b/go.sum index e5ac2e19..92b5e53f 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,7 @@ code.cloudfoundry.org/clock v1.0.0 h1:kFXWQM4bxYvdBw2X8BbBeXwQNgfoWv1vqAk2ZZyBN2o= -code.cloudfoundry.org/tlsconfig v0.0.0-20220621140725-0e6fbd869921 h1:1PLAuQR56K2pw0lnlcXe+37uOaGg939W1Lqv8wxYpu4= -code.cloudfoundry.org/tlsconfig v0.0.0-20220621140725-0e6fbd869921/go.mod h1:oItDsgL/IixCV1BTTY9XqyhGojI5wyEgyPcBwXfKbvs= +code.cloudfoundry.org/tlsconfig v0.0.0-20230125185630-3cc0b1c5221e h1:sKAZPglI4trO7yTjpW9TLVMdmFos+FeKDB9z9sC8WdE= +code.cloudfoundry.org/tlsconfig v0.0.0-20230125185630-3cc0b1c5221e/go.mod h1:eEXL1uwhjzQp0klT34gUn0QPSvlYcXP83tgUicS0kVc= +filippo.io/edwards25519 v1.0.0-rc.1 h1:m0VOOB23frXZvAOK44usCgLWvtsxIoMCTBGJZlpmGfU= github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww= github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM= @@ -17,8 +18,8 @@ github.com/charlievieth/fs v0.0.3 h1:3lZQXTj4PbE81CVPwALSn+JoyCNXkZgORHN6h2XHGlg github.com/charlievieth/fs v0.0.3/go.mod h1:hD4sRzto1Hw8zCua76tNVKZxaeZZr1RiKftjAJQRLLo= github.com/cloudfoundry/bosh-cli v6.4.1+incompatible h1:n5/+NIF9QxvGINOrjh6DmO+GTen78MoCj5+LU9L8bR4= github.com/cloudfoundry/bosh-cli v6.4.1+incompatible/go.mod h1:rzIB+e1sn7wQL/TJ54bl/FemPKRhXby5BIMS3tLuWFM= -github.com/cloudfoundry/bosh-utils v0.0.350 h1:gjfOJ4Y+MepXHlAUhbpdTRwda6hg+nzorXWYoReJ7pU= -github.com/cloudfoundry/bosh-utils v0.0.350/go.mod h1:YPo2MrW7d7TbCt6KQhLwTn/TirehIBVydnBM04vvgZo= +github.com/cloudfoundry/bosh-utils v0.0.351 h1:VZrZXBAs7C2RT6UnECx52/yejvWNYPf22vWmrcjxhR8= +github.com/cloudfoundry/bosh-utils v0.0.351/go.mod h1:rkbszAP1YDIxE7eTUKO0ENRaUlf3Tv7rmC95cy5yP7c= github.com/cloudfoundry/go-socks5 v0.0.0-20180221174514-54f73bdb8a8e h1:FQdRViaoDphGRfgrotl2QGsX1gbloe57dbGBS5CG6KY= github.com/cloudfoundry/go-socks5 v0.0.0-20180221174514-54f73bdb8a8e/go.mod h1:PXmcacyJB/pJjSxEl15IU6rEIKXrhZQRzsr0UTkgNNs= github.com/cloudfoundry/socks5-proxy v0.2.83 h1:bphqhVNOU8zHFHJH15I0370bBeUiNI2ClkzcrSFdkxk= @@ -60,8 +61,8 @@ github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d h1:VhgPp6v9qf9Agr/ github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod h1:YUTz3bUH2ZwIWBy3CJBeOBEugqcmXREj14T+iG/4k4U= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= -github.com/onsi/ginkgo/v2 v2.7.0 h1:/XxtEV3I3Eif/HobnVx9YmJgk8ENdRsuUmM+fLCFNow= -github.com/onsi/gomega v1.24.1 h1:KORJXNNTzJXzu4ScJWssJfJMnJ+2QJqhoQSRwNlze9E= +github.com/onsi/ginkgo/v2 v2.8.0 h1:pAM+oBNPrpXRs+E/8spkeGx9QgekbRVyr74EUvRVOUI= +github.com/onsi/gomega v1.25.0 h1:Vw7br2PCDYijJHSfBOWhov+8cAnUf8MfMaIOV323l6Y= github.com/pivotal-cf/paraphernalia v0.0.0-20180203224945-a64ae2051c20 h1:DR5eMfe2+6GzLkVyWytdtgUxgbPiOfvKDuqityTV3y8= github.com/pivotal-cf/paraphernalia v0.0.0-20180203224945-a64ae2051c20/go.mod h1:Y3IqE20LKprEpLkXb7gXinJf4vvDdQe/BS8E4kL/dgE= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= @@ -81,11 +82,12 @@ github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUA github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE= github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= -github.com/square/certstrap v1.2.0 h1:ecgyABrbFLr8jSbOC6oTBmBek0t/HqtgrMUZCPuyfdw= +github.com/square/certstrap v1.3.0 h1:N9P0ZRA+DjT8pq5fGDj0z3FjafRKnBDypP0QHpMlaAk= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= +go.step.sm/crypto v0.16.2 h1:Pr9aazTwWBBZNogUsOqhOrPSdwAa9pPs+lMB602lnDA= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE= golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU= diff --git a/vendor/code.cloudfoundry.org/tlsconfig/.gitignore b/vendor/code.cloudfoundry.org/tlsconfig/.gitignore new file mode 100644 index 00000000..125de6c1 --- /dev/null +++ b/vendor/code.cloudfoundry.org/tlsconfig/.gitignore @@ -0,0 +1,18 @@ +# Binaries for programs and plugins +*.exe +*.exe~ +*.dll +*.so +*.dylib + +# Test binary, built with `go test -c` +*.test + +# Output of the go coverage tool, specifically when used with LiteIDE +*.out + +# Dependency directories +vendor/ + +# Go workspace file +go.work \ No newline at end of file diff --git a/vendor/code.cloudfoundry.org/tlsconfig/README.md b/vendor/code.cloudfoundry.org/tlsconfig/README.md index 4be8c83d..15be084f 100644 --- a/vendor/code.cloudfoundry.org/tlsconfig/README.md +++ b/vendor/code.cloudfoundry.org/tlsconfig/README.md @@ -1,28 +1,40 @@ # tlsconfig -> build tls configurations +[![Go Report Card](https://goreportcard.com/badge/code.cloudfoundry.org/tlsconfig)](https://goreportcard.com/report/code.cloudfoundry.org/tlsconfig) +[![Go Reference](https://pkg.go.dev/badge/code.cloudfoundry.org/tlsconfig.svg)](https://pkg.go.dev/code.cloudfoundry.org/tlsconfig) -## Reporting issues and requesting features +tlsconfig generates shared [crypto/tls configurations](https://pkg.go.dev/crypto/tls#Config) for internal and external-facing services in Cloud Foundry. This module is considered internal to Cloud Foundry, and does not provide any stability guarantees for external usage. -Please report all issues and feature requests in [cloudfoundry/diego-release](https://github.com/cloudfoundry/diego-release/issues). +## Getting Started -## about +### Usage -There are requirements and guidelines for the TLS configurations -we'd like to use for our internal services. This library stays up to date with -those internal requirements so that services just need to link against this. +Import this module as `code.cloudfoundry.org/tlsconfig`. -This repository also includes a sub-package called `certtest` which can be used -to build valid PKIs for test. +Update to the latest version of the library off the main branch with: +``` +go get -u code.cloudfoundry.org/tlsconfig@main +``` -## usage +### Running the tests -**Note**: This repository should be imported as `code.cloudfoundry.org/tlsconfig` +All the tests use the standard go testing library and can be run with: +``` +go test ./... +``` -See [GoDoc][godoc]. +## Contributing -[godoc]: https://godoc.org/code.cloudfoundry.org/tlsconfig +Cloud Foundry uses GitHub to manage reviews of pull requests and issues. -## getting help +* If you have a trivial fix or improvement, go ahead and create a pull request. +* If you plan to do something more involved, first discuss your ideas in [Slack](cloudfoundry.slack.com). This will help avoid unnecessary work :). +* Make sure you've signed the CLA! -Please file an issue! +## Versioning + +This module is not currently versioned. Whatever is on the `main` branch is considered to be the latest release of the module. + +## License + +This project is licensed under the Apache License 2.0 - see the [LICENSE](LICENSE) file for details. diff --git a/vendor/code.cloudfoundry.org/tlsconfig/package.go b/vendor/code.cloudfoundry.org/tlsconfig/package.go deleted file mode 100644 index 0c583457..00000000 --- a/vendor/code.cloudfoundry.org/tlsconfig/package.go +++ /dev/null @@ -1 +0,0 @@ -package tlsconfig // import "code.cloudfoundry.org/tlsconfig" diff --git a/vendor/modules.txt b/vendor/modules.txt index 01083042..866c5d19 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,5 +1,5 @@ -# code.cloudfoundry.org/tlsconfig v0.0.0-20220621140725-0e6fbd869921 -## explicit; go 1.17 +# code.cloudfoundry.org/tlsconfig v0.0.0-20230125185630-3cc0b1c5221e +## explicit; go 1.19 code.cloudfoundry.org/tlsconfig # github.com/Masterminds/semver v1.5.0 ## explicit @@ -30,7 +30,7 @@ github.com/cloudfoundry/bosh-cli/director github.com/cloudfoundry/bosh-cli/director/template github.com/cloudfoundry/bosh-cli/io github.com/cloudfoundry/bosh-cli/uaa -# github.com/cloudfoundry/bosh-utils v0.0.350 +# github.com/cloudfoundry/bosh-utils v0.0.351 ## explicit; go 1.19 github.com/cloudfoundry/bosh-utils/crypto github.com/cloudfoundry/bosh-utils/errors