Code

Raw keyrings#165

Code

Merged

mattsb42-aws merged 123 commits intoaws:keyringaws/aws-encryption-sdk-python:keyringfrom

MeghaShetty:raw-keyringsMeghaShetty/aws-encryption-sdk-python:raw-keyringsCopy head branch name to clipboard

Aug 2, 2019

Commits

Commits on Jun 19, 2019

• Adding Keyring API

  mmegs-amzn

  committed
  0d29631

  Copy full SHA for 0d29631

• Added docstring to public class

  mmegs-amzn

  committed
  237a2af

  Copy full SHA for 237a2af

• Delete __init__.py

  

  MeghaShetty

  authored and

  mmegs-amzn

  committed
  9bbdf83

  Copy full SHA for 9bbdf83

• Delete raw_keyring.py

  

  MeghaShetty

  authored and

  mmegs-amzn

  committed
  1a14a3b

  Copy full SHA for 1a14a3b

• Edited docstring

  mmegs-amzn

  committed
  c1a1c77

  Copy full SHA for c1a1c77

• Edited docstring again

  mmegs-amzn

  committed
  66b348f

  Copy full SHA for 66b348f

• Changes in docstring statements

  mmegs-amzn

  committed
  4a0a1c6

  Copy full SHA for 4a0a1c6

• Docstring changes

  mmegs-amzn

  committed
  5f6fcb9

  Copy full SHA for 5f6fcb9

Commits on Jun 20, 2019

• Changes in docstring

  mmegs-amzn

  committed
  9d8d964

  Copy full SHA for 9d8d964

• Raw keyring initial

  mmegs-amzn

  committed
  83ccdd3

  Copy full SHA for 83ccdd3

• Raw keyring encrypt commit

  mmegs-amzn

  committed
  aed1ed7

  Copy full SHA for aed1ed7

• Encrypt functions for Raw RSA and AES

  mmegs-amzn

  committed
  dc9352c

  Copy full SHA for dc9352c

• Raw RSA and AES initial

  mmegs-amzn

  committed
  b9c22b9

  Copy full SHA for b9c22b9

Commits on Jun 27, 2019

• Changes in raw keyrings according to new keyring materials

  mmegs-amzn

  committed
  745c9ed

  Copy full SHA for 745c9ed

• Updated with autoformat

  mmegs-amzn

  committed
  bb163bc

  Copy full SHA for bb163bc

Commits on Jun 28, 2019

• Modified base

  mmegs-amzn

  committed
  27fe8d9

  Copy full SHA for 27fe8d9

• Corrected tox and flake errors

  mmegs-amzn

  committed
  e8286ac

  Copy full SHA for e8286ac

Commits on Jul 1, 2019

• Docstring error correction

  mmegs-amzn

  committed
  eef26e7

  Copy full SHA for eef26e7

• Added docstrings and corrected errors

  mmegs-amzn

  committed
  900a064

  Copy full SHA for 900a064

• Some more changes in docstrings

  mmegs-amzn

  committed
  c500970

  Copy full SHA for c500970

• Updating base API

  mmegs-amzn

  committed
  8a00e15

  Copy full SHA for 8a00e15

Commits on Jul 2, 2019

• Made all suggested changes

  mmegs-amzn

  committed
  250f554

  Copy full SHA for 250f554

Commits on Jul 3, 2019

• Corrected tox and flake8 errors

  mmegs-amzn

  committed
  d8a8389

  Copy full SHA for d8a8389

Commits on Jul 8, 2019

• Minor change in raw-keyrings

  mmegs-amzn

  committed
  8f9f737

  Copy full SHA for 8f9f737

Commits on Jul 12, 2019

• Adding Keyring API

  mmegs-amzn

  committed
  9cd81ea

  Copy full SHA for 9cd81ea

• Added docstring to public class

  mmegs-amzn

  committed
  e3d0757

  Copy full SHA for e3d0757

• Delete __init__.py

  

  MeghaShetty

  authored and

  mmegs-amzn

  committed
  fcb03c2

  Copy full SHA for fcb03c2

• Delete raw_keyring.py

  

  MeghaShetty

  authored and

  mmegs-amzn

  committed
  ae78331

  Copy full SHA for ae78331

• Edited docstring

  mmegs-amzn

  committed
  f668ca4

  Copy full SHA for f668ca4

• Edited docstring again

  mmegs-amzn

  committed
  c06b1fa

  Copy full SHA for c06b1fa

• Changes in docstring statements

  mmegs-amzn

  committed
  1e2a672

  Copy full SHA for 1e2a672

• Docstring changes

  mmegs-amzn

  committed
  82feb00

  Copy full SHA for 82feb00

• Changes in docstring

  mmegs-amzn

  committed
  11f9ce6

  Copy full SHA for 11f9ce6

• Raw keyring initial

  mmegs-amzn

  committed
  7a345a5

  Copy full SHA for 7a345a5

• Raw keyring encrypt commit

  mmegs-amzn

  committed
  6ef9ea7

  Copy full SHA for 6ef9ea7

• Encrypt functions for Raw RSA and AES

  mmegs-amzn

  committed
  6576731

  Copy full SHA for 6576731

• Raw RSA and AES initial

  mmegs-amzn

  committed
  5a87c0e

  Copy full SHA for 5a87c0e

• bump attrs to 19.1.0

  

  mattsb42-aws

  authored and

  mmegs-amzn

  committed
  dd01e6b

  Copy full SHA for dd01e6b

• add keyring trace and integrate into updated encrytion/decryption materials

  

  mattsb42-aws

  authored and

  mmegs-amzn

  committed
  82429fe

  Copy full SHA for 82429fe

• s/KeyRing/Keyring/g

  

  mattsb42-aws

  authored and

  mmegs-amzn

  committed
  0dc48a2

  Copy full SHA for 0dc48a2

• align cryptographic materials and add write-only interface

  

  mattsb42-aws

  authored and

  mmegs-amzn

  committed
  ea0b09d

  Copy full SHA for ea0b09d

• encrypted_data_keys must only contain EncryptedDataKey

  

  mattsb42-aws

  authored and

  mmegs-amzn

  committed
  9b3d4e2

  Copy full SHA for 9b3d4e2

• fix test to be Python 2 compatible

  

  mattsb42-aws

  authored and

  mmegs-amzn

  committed
  ac67a6f

  Copy full SHA for ac67a6f

• Changes in raw keyrings according to new keyring materials

  mmegs-amzn

  committed
  0921eff

  Copy full SHA for 0921eff

• Updated with autoformat

  mmegs-amzn

  committed
  8399fea

  Copy full SHA for 8399fea

• Modified base

  mmegs-amzn

  committed
  38c756b

  Copy full SHA for 38c756b

• data encryption key must be set before encrypted data keys can be added to EncryptionMaterials

  

  mattsb42-aws

  authored and

  mmegs-amzn

  committed
  5005cfb

  Copy full SHA for 5005cfb

• Corrected tox and flake errors

  mmegs-amzn

  committed
  242a3a3

  Copy full SHA for 242a3a3

• Docstring error correction

  mmegs-amzn

  committed
  2672567

  Copy full SHA for 2672567

• Added docstrings and corrected errors

  mmegs-amzn

  committed
  2696183

  Copy full SHA for 2696183

• Some more changes in docstrings

  mmegs-amzn

  committed
  f1d1977

  Copy full SHA for f1d1977

• Updating base API

  mmegs-amzn

  committed
  f08239c

  Copy full SHA for f08239c

• add signing/verification key checks to Encryption/DecryptionMaterials

  

  mattsb42-aws

  authored and

  mmegs-amzn

  committed
  881cf5e

  Copy full SHA for 881cf5e

• DecryptionMaterials.algorithm must be set before DecryptionMaterials.add_data_encryption_key can be called

  

  mattsb42-aws

  authored and

  mmegs-amzn

  committed
  5769efa

  Copy full SHA for 5769efa

• update materials docs and typehints

  

  mattsb42-aws

  authored and

  mmegs-amzn

  committed
  00a7678

  Copy full SHA for 00a7678

• Made all suggested changes

  mmegs-amzn

  committed
  36edf5b

  Copy full SHA for 36edf5b

• EncryptionMaterials must not be initialized with encrypted_data_keys but no data_encryption_key

  

  mattsb42-aws

  authored and

  mmegs-amzn

  committed
  98cf791

  Copy full SHA for 98cf791

• add is_complete properties to EncryptionMaterials and DecryptionMaterials

  

  mattsb42-aws

  authored and

  mmegs-amzn

  committed
  e03f38b

  Copy full SHA for e03f38b

• Corrected tox and flake8 errors

  mmegs-amzn

  committed
  f99ac6c

  Copy full SHA for f99ac6c

• Minor change in raw-keyrings

  mmegs-amzn

  committed
  b928fd2

  Copy full SHA for b928fd2

• change KeyringTraceFlag values to bitshifted ints to match other implementations

  

  mattsb42-aws

  authored and

  mmegs-amzn

  committed
  e92db76

  Copy full SHA for e92db76

• normalize EncryptionMaterials._encrypted_data_keys to list and encrypted_data_keys to tuple

  

  mattsb42-aws

  authored and

  mmegs-amzn

  committed
  bcd4cfe

  Copy full SHA for bcd4cfe

• temporarily pin pydocstyle at <4.0.0 to avoid issue breaking flake8-docstrings

  

  mattsb42-aws

  authored and

  mmegs-amzn

  committed
  be3a391

  Copy full SHA for be3a391

• temporarily cap pydocstyle at <4.0.0 for decrypt oracle

  

  mattsb42-aws

  authored and

  mmegs-amzn

  committed
  402af2c

  Copy full SHA for 402af2c

• Changes to keyring trace in raw keyrings

  mmegs-amzn

  committed
  be4f74c

  Copy full SHA for be4f74c

• Merge branch 'keyring' of github.com:aws/aws-encryption-sdk-python into raw-keyrings

  mmegs-amzn

  committed
  f165e22

  Copy full SHA for f165e22

• Changes to raw keyrings after rebase

  mmegs-amzn

  committed
  b921715

  Copy full SHA for b921715

• Adding test files

  mmegs-amzn

  committed
  c01fb90

  Copy full SHA for c01fb90

• Adding tests

  mmegs-amzn

  committed
  85a0149

  Copy full SHA for 85a0149

• Changed data encryption key type to RawDataKey

  mmegs-amzn

  committed
  af239f6

  Copy full SHA for af239f6

Commits on Jul 14, 2019

• Added keyring trace to pytest encryption materials

  mmegs-amzn

  committed
  1a49427

  Copy full SHA for 1a49427

Commits on Jul 15, 2019

• Changed value of keyring_trace.wrapping_key

  mmegs-amzn

  committed
  ec1d8b5

  Copy full SHA for ec1d8b5

• Few changes to match new API

  mmegs-amzn

  committed
  5ff39d6

  Copy full SHA for 5ff39d6

• Tox errors

  mmegs-amzn

  committed
  64298a7

  Copy full SHA for 64298a7

Commits on Jul 16, 2019

• Functional tests pass

  mmegs-amzn

  committed
  cc5aa44

  Copy full SHA for cc5aa44

• Formatting errors corrected and functional tests pass

  mmegs-amzn

  committed
  7d896d1

  Copy full SHA for 7d896d1

• Corrected too broad exception error and deleted empty return statement from tests

  mmegs-amzn

  committed
  3eb4536

  Copy full SHA for 3eb4536

• Changed Exeception to BaseException to solve broad exception error

  mmegs-amzn

  committed
  b1ad3ed

  Copy full SHA for b1ad3ed

Commits on Jul 17, 2019

• Added suppress broad exception

  mmegs-amzn

  committed
  03aeae3

  Copy full SHA for 03aeae3

• Added pylint disable broad exception

  mmegs-amzn

  committed
  2a248f5

  Copy full SHA for 2a248f5

Commits on Jul 18, 2019

• Changed wrapping keys for RSA keyrings from WrappingKey to cryptography.hazmat.primitives.asymmetric.rsa.RSAPrivateKey/RSAPublicKey

  mmegs-amzn

  committed
  92f419c

  Copy full SHA for 92f419c

• Fixed tox errors

  mmegs-amzn

  committed
  66b56b7

  Copy full SHA for 66b56b7

• More tox errors

  mmegs-amzn

  committed
  0295db5

  Copy full SHA for 0295db5

• Moved code for generation of plaintext to be before the check for key being private or public

  mmegs-amzn

  committed
  4adec20

  Copy full SHA for 4adec20

• Tox errors

  mmegs-amzn

  committed
  22243dc

  Copy full SHA for 22243dc

• Added metaclass to base API and unit tests for base API

  mmegs-amzn

  committed
  07d05f7

  Copy full SHA for 07d05f7

• Changed metaclass to six.add_metaclass in base API

  mmegs-amzn

  committed
  6df10d5

  Copy full SHA for 6df10d5

• Fixed pylint errors

  mmegs-amzn

  committed
  8e47bad

  Copy full SHA for 8e47bad

• Fixed more pylint errors

  mmegs-amzn

  committed
  4aae643

  Copy full SHA for 4aae643

• Removed RawAESKeyring instance

  mmegs-amzn

  committed
  ede165a

  Copy full SHA for ede165a

Commits on Jul 19, 2019

• Changed on_encrypt_helper to generate_data_key and removed on_decrypt_helper. Renamed base API unit test file

  mmegs-amzn

  committed
  39dbfd3

  Copy full SHA for 39dbfd3

• Changed docstring for generate_data_key

  mmegs-amzn

  committed
  61e8fe5

  Copy full SHA for 61e8fe5

• Changed decryption_materials.data_key to decryption_materials.data_encryption_key and fixed pylint errors

  mmegs-amzn

  committed
  e61f4a2

  Copy full SHA for e61f4a2

• Fixed pylint errors

  mmegs-amzn

  committed
  89f8a2c

  Copy full SHA for 89f8a2c

Commits on Jul 20, 2019

• Changed raw keyrings to have class methods for PEM and DER encoded keys

  mmegs-amzn

  committed
  fbf351f

  Copy full SHA for fbf351f

Commits on Jul 22, 2019

• Unit tests for raw keyrings

  mmegs-amzn

  committed
  fb8b7b8

  Copy full SHA for fb8b7b8

• Changes for PEM encoding

  mmegs-amzn

  committed
  41dd140

  Copy full SHA for 41dd140

Commits on Jul 23, 2019

• Made suggested changes to raw keyrings

  mmegs-amzn

  committed
  9fa50cf

  Copy full SHA for 9fa50cf

• partial commit for raw keyrings

  mmegs-amzn

  committed
  3b28bea

  Copy full SHA for 3b28bea

• Made suggested changes

  mmegs-amzn

  committed
  8f65947

  Copy full SHA for 8f65947

• Changed wrapping_key_id in deserialize_wrapped_key() back to self.key_name

  mmegs-amzn

  committed
  40eb8cc

  Copy full SHA for 40eb8cc

Commits on Jul 24, 2019

• Decryption and PEM input now works

  mmegs-amzn

  committed
  96979b1

  Copy full SHA for 96979b1

• Adding sample

  mmegs-amzn

  committed
  f592956

  Copy full SHA for f592956

• Removed test comments

  mmegs-amzn

  committed
  dbbb840

  Copy full SHA for dbbb840

Commits on Jul 26, 2019

• Unit tests for raw aes and rsa

  mmegs-amzn

  committed
  b71e09c

  Copy full SHA for b71e09c

• All unit tests working

  mmegs-amzn

  committed
  866755d

  Copy full SHA for 866755d

Commits on Jul 27, 2019

• All unit tests done. Functional tests - key_info_prefix_vectors for AES and compatibility with MKP for RSA remaining

  mmegs-amzn

  committed
  dae98c3

  Copy full SHA for dae98c3

• Delete sample_aes.py

  MeghaShetty

  authored
  00a7dad

  Copy full SHA for 00a7dad

• Corrected tox and pylint errors

  mmegs-amzn

  committed
  29f69e0

  Copy full SHA for 29f69e0

• Removed print statements used while debugging

  mmegs-amzn

  committed
  2e43c1e

  Copy full SHA for 2e43c1e

Commits on Aug 1, 2019

• Partial commit for changes to tests

  mmegs-amzn

  committed
  8ce5cc6

  Copy full SHA for 8ce5cc6

• Partial commit for tests for raw keyrings

  mmegs-amzn

  committed
  9fcf529

  Copy full SHA for 9fcf529

Commits on Aug 2, 2019

• All tests except compatibility of raw rsa with mkp and key info prefix in raw aes

  mmegs-amzn

  committed
  d5d186e

  Copy full SHA for d5d186e

• Pulled from keyring branch

  mmegs-amzn

  committed
  69acc1a

  Copy full SHA for 69acc1a

• Merge branch 'keyring' into raw-keyrings

  MeghaShetty

  authored
  d89bc61

  Copy full SHA for d89bc61

• Updated base API

  mmegs-amzn

  committed
  7ea1bd6

  Copy full SHA for 7ea1bd6

• Merge branch 'raw-keyrings' of github.com:MeghaShetty/aws-encryption-sdk-python into raw-keyrings

  mmegs-amzn

  committed
  f4ee7f0

  Copy full SHA for f4ee7f0

• Added test for key info prefix

  mmegs-amzn

  committed
  acbd5b4

  Copy full SHA for acbd5b4

• Changed unittest.mock to mock

  mmegs-amzn

  committed
  8374130

  Copy full SHA for 8374130

• Raw keyrings test partial commit

  mmegs-amzn

  committed
  1dc5a77

  Copy full SHA for 1dc5a77

• All tests for raw keyrings work

  mmegs-amzn

  committed
  5a7e4b2

  Copy full SHA for 5a7e4b2

• Removed unused imports

  mmegs-amzn

  committed
  ced07c4

  Copy full SHA for ced07c4

• Removed unused imports

  mmegs-amzn

  committed
  88cd097

  Copy full SHA for 88cd097