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

Upgrade to ocicrypt 1.1 and add support and test cases for keyprovider #31

Merged
merged 4 commits into from
Jan 26, 2021

Conversation

stefanberger
Copy link
Contributor

This PR upgrades to ocicrypt 1.1 dependency and adds command line support and test cases for the new keyprovider protocol.

Copy link
Collaborator

@lumjjb lumjjb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, we should eventually move to using the helper for the parsing, going to open an issue for it

@stefanberger
Copy link
Contributor Author

I was going to wait for ocicrypt 1.1 to merge this.

@stefanberger stefanberger force-pushed the to_ocicrypt1.1 branch 2 times, most recently from 8e444a2 to d051560 Compare January 20, 2021 18:39
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
@stefanberger stefanberger changed the title WIP: Upgrade to ocicrypt 1.1 and add support and test cases for keyprovider Upgrade to ocicrypt 1.1 and add support and test cases for keyprovider Jan 25, 2021
This patch syncs the parse_helpers.go with ocicrypto's parse_helpers.go.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
@stefanberger stefanberger merged commit 7f55e6e into containerd:master Jan 26, 2021
@stefanberger stefanberger deleted the to_ocicrypt1.1 branch March 9, 2021 14:55
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.

None yet

2 participants