Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebase on Go 1.22.2 #170

Merged
merged 0 commits into from
Apr 5, 2024
Merged

Rebase on Go 1.22.2 #170

merged 0 commits into from
Apr 5, 2024

Conversation

Lekensteyn
Copy link
Contributor

Trivial rebase.

$ git range-diff go1.22.1..origin/cf go1.22.2..pwu/cf-1.22.2
 1:  1da61bf0b6 =  1:  7e53e51c32 Add README (#158)
 2:  412e6791f0 <  -:  ---------- VERSION: add cf tag
 -:  ---------- >  2:  6bf5772505 VERSION: add cf tag
 3:  afa7242086 =  3:  10d5b0498d cmd/go/internal/imports, go/build: add cfgo build tag
 4:  ea0a548ee8 =  4:  54962442d8 .github: add docker-compose.yaml and GitHub Action for CI
 5:  e5515b0d01 =  5:  60fb640068 .github: replace upstream templates and CODE_OF_CONDUCT.md
 6:  b1d7991558 =  6:  d5e212e3f1 cmd/api: ignore CF-specific API changes
 7:  85a53c6535 =  7:  ba839d109a go/build: don't check dependencies of vendored circl library
 8:  4ba2d738a4 =  8:  ee0634e688 crypto/tls: expose inter-handshake timing via CFEventHandlerContextKey
 9:  0ee3c992de !  9:  de64e8e99c crypto/tls: Add hybrid post-quantum key agreements
    @@ src/go.mod: module std
      require (
     +  github.com/cloudflare/circl v1.3.8-0.20240208083452-454cfdc0f6c7
        golang.org/x/crypto v0.16.1-0.20231129163542-152cdb1503eb
    -   golang.org/x/net v0.19.0
    +   golang.org/x/net v0.19.1-0.20240327214321-ae3c50b55fdf
      )

      ## src/go.sum ##
    @@ src/go.sum
     +github.com/cloudflare/circl v1.3.8-0.20240208083452-454cfdc0f6c7/go.mod h1:uAwUTm6m3uQF5fuJKR6LvFqgxn2wyID+kF6KJAUcZl8=
      golang.org/x/crypto v0.16.1-0.20231129163542-152cdb1503eb h1:1ceSY7sk6sJuiDREHpfyrqDnDljsLfEP2GuTClhBBfI=
      golang.org/x/crypto v0.16.1-0.20231129163542-152cdb1503eb/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
    - golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
    + golang.org/x/net v0.19.1-0.20240327214321-ae3c50b55fdf h1:zcMReZfxLPmppTre5oSNPSOgoTRtOplx+QV25LkyAto=

      ## src/vendor/github.com/cloudflare/circl/LICENSE (new) ##
     @@
10:  1a90cbbea3 = 10:  dc424101b3 crypto: add support for CIRCL signature schemes
11:  8600abfd0d = 11:  3dcd547e63 crypto/tls: implement draft-ietf-tls-subcerts-10
12:  0c33d9e64a = 12:  edf48d6a04 crypto/tls: implement draft-ietf-tls-esni-13
13:  956501e119 = 13:  2bd56d5c49 Set GOTOOLCHAIN to local to prevent auto-download of new Go
14:  84835c7d47 = 14:  cacfd80e42 Add tls.Config.ClientCurveGuess to allow specifying which keyshares to send
15:  93242326a8 = 15:  b55f20d748 Use server's preferred key agreement
16:  087d81079a = 16:  ec0a014545 Add dummy key agreement with codepoint 0xfe33 (#162)

@Lekensteyn Lekensteyn requested review from bwesterb and thibmeu April 5, 2024 10:16
@Lekensteyn Lekensteyn merged commit ec0a014 into cf Apr 5, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants