Skip to content

Replay google/master work since the start of tpmdirect #330

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

Merged
merged 5 commits into from
Jun 13, 2023
Merged

Replay google/master work since the start of tpmdirect #330

merged 5 commits into from
Jun 13, 2023

Conversation

chrisfenner
Copy link
Member

@chrisfenner chrisfenner commented Jun 12, 2023

This PR cherry-picks 4 of the 5 commits that master had since the start of tpmdirect atop main (which has just been created based on tpmdirect).

Big picture: we will release this* as "major prerelease" 0.9.0 of go-tpm, to share the new tpmdirect API with external users.

*minor change, Startup_ will be renamed to Startup, a change that has to be coordinated with go-tpm-tools migrating to use the legacy API via its new path

  • 9bf5605 Bump golangci-lint to 1.52.2
  • e782111 Support ECC EKs for credential activation
  • 23d0180 Accept *ecdsa.PublicKey and transmute to *ecdh.PublicKey
  • 3270509 Check if are available before calling the function

16613e2 is not included because we had already updated to an even more recent version of golang.org/x/sys (0.5.0)

This PR also includes a minor lint-fixing commit based on issues identified by checks on this PR.

This mainly replays some work that happened in tpm2/credactivation into legacy/tpm2/credactivation.

The only interesting conflicts occurred in e782111. I've undone changes to credactivation 0b55c34 in favor of taking the code exactly as-is after @brandonweeks changes. I don't recall why I touched this file as part of introducing tpmdirect; I suspect it was to make a build or linter happy.

@chrisfenner chrisfenner marked this pull request as ready for review June 12, 2023 08:36
@chrisfenner chrisfenner requested review from alexmwu, jkl73 and a team as code owners June 12, 2023 08:36
@chrisfenner chrisfenner requested review from brandonweeks and alexmwu and removed request for alexmwu, jkl73 and a team June 12, 2023 08:37
@chrisfenner chrisfenner merged commit 5115077 into google:main Jun 13, 2023
@chrisfenner chrisfenner deleted the main branch June 13, 2023 06:52
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.

4 participants