-
Notifications
You must be signed in to change notification settings - Fork 84
Keyring base API #161
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
Keyring base API #161
Changes from 8 commits
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
0d29631
Adding Keyring API
mmegs-amzn 237a2af
Added docstring to public class
mmegs-amzn 9bbdf83
Delete __init__.py
MeghaShetty 1a14a3b
Delete raw_keyring.py
MeghaShetty c1a1c77
Edited docstring
mmegs-amzn 66b348f
Edited docstring again
mmegs-amzn 7730e3e
Changes in docstring statements
mmegs-amzn ea8c972
Docstring changes
mmegs-amzn d7a965a
Changes in docstring
mmegs-amzn 28fa103
Update src/aws_encryption_sdk/keyring/base.py
MeghaShetty 60bed0a
Fixed indentation errors
mmegs-amzn ca4bf34
Fixed another indentation error
mmegs-amzn 5d3b96e
Added encrypted data keys as a parameter
mmegs-amzn 252c483
Update src/aws_encryption_sdk/keyring/base.py
MeghaShetty acc320f
Update src/aws_encryption_sdk/keyring/base.py
MeghaShetty 9fded7f
Update src/aws_encryption_sdk/keyring/base.py
MeghaShetty 20cad30
Update src/aws_encryption_sdk/keyring/base.py
MeghaShetty 050ae86
Changes in docstrings
mmegs-amzn File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
@@ -0,0 +1,41 @@ | ||||||
# Copyright 2017 Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||||||
# | ||||||
# Licensed under the Apache License, Version 2.0 (the "License"). You | ||||||
# may not use this file except in compliance with the License. A copy of | ||||||
# the License is located at | ||||||
# | ||||||
# http://aws.amazon.com/apache2.0/ | ||||||
# | ||||||
# or in the "license" file accompanying this file. This file is | ||||||
# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF | ||||||
# ANY KIND, either express or implied. See the License for the specific | ||||||
# language governing permissions and limitations under the License. | ||||||
"""Base class interface for Keyrings.""" | ||||||
|
||||||
|
||||||
class Keyring(object): | ||||||
"""Parent interface for Keyring classes.""" | ||||||
MeghaShetty marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
|
||||||
def on_encrypt(self, encryption_materials): | ||||||
MeghaShetty marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
"""Generate a data key if not present and encrypt it using any available wrapping key. | ||||||
|
||||||
:param encryption_materials: Contains signing key, encryption context and algorithm suite | ||||||
required to encrypt data key | ||||||
:type : aws_encryption_sdk.materials_managers.EncryptionMaterials | ||||||
mattsb42-aws marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
:returns encryption_materials: Contains signing key, unencrypted data key, encrypted data keys, | ||||||
mattsb42-aws marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
encryption context and algorithm suite required to encrypt data key | ||||||
:rtype : aws_encryption_sdk.materials_managers.EncryptionMaterials | ||||||
:raises AttributeError: if encryption materials not available | ||||||
mattsb42-aws marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
""" | ||||||
raise NotImplementedError("Keyring does not implement on_encrypt function") | ||||||
|
||||||
def on_decrypt(self, decryption_materials): | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. As we discussed offline, per discussion in #163 we need to change this interface.
Suggested change
|
||||||
"""Attempt to decrypt the encrypted data keys. | ||||||
|
||||||
:param decryption_materials: Contains verification key, list of encrypted data keys. | ||||||
:type : aws_encryption_sdk.materials_managers.DecryptionMaterials | ||||||
mattsb42-aws marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
:returns decryption_materials: Contains verification key, list of encrypted data keys and decrypted data key. | ||||||
mattsb42-aws marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
:rtype : aws_encryption_sdk.materials_managers.DecryptionMaterials | ||||||
:raises AttributeError: if decryption materials not available | ||||||
mattsb42-aws marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
""" | ||||||
raise NotImplementedError("Keyring does not implement on_decrypt function") |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.