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.

Sign up for GitHub

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

Jump to bottom

fix: Encryption Context changes #148

Merged
merged 15 commits into from
Jul 26, 2019
Merged

fix: Encryption Context changes #148

merged 15 commits into from
Jul 26, 2019

Commits on Jul 15, 2019

  1. fix: Encryption Context changes 

    resolves aws#54

1. browser/node encrypt function public api should match
1. Encryption context should _only_ be optional in the public interface
1. Encryption context moved into cryptographic materials

Internally, it is much more consistent to require an encryption context.
Moving the encryption context onto the cryptographic materials
brings them in line with the python keyring implementation.
It also makes control of the encryption context in the CMM
and **not** the keyrings very clear in the interface.

NOTE: encrypt in encrypt-node now expects `encryptionContext` instead of `context`.
This is **ONLY** done because the project is still in beta.
    @seebees
    seebees committed Jul 15, 2019
    Configuration menu
    Copy the full SHA
    f538dc8 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2019

  1. Merge branch 'master' into encryption_context_on_material

    @seebees
    seebees authored Jul 16, 2019
    Configuration menu
    Copy the full SHA
    572745e View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2019

  1. Merge branch 'master' into encryption_context_on_material

    @seebees
    seebees authored Jul 22, 2019
    Configuration menu
    Copy the full SHA
    56a0a3c View commit details
    Browse the repository at this point in the history

  2. Update modules/material-management/src/cryptographic_material.ts 

    Co-Authored-By: Matt Bullock <[email protected]>
    @seebees @mattsb42-aws
    seebees and mattsb42-aws authored Jul 22, 2019
    Configuration menu
    Copy the full SHA
    dd21128 View commit details
    Browse the repository at this point in the history

  3. Update modules/material-management-node/src/node_cryptographic_materi… 

    …als_manager.ts

Co-Authored-By: Matt Bullock <[email protected]>
    @seebees @mattsb42-aws
    seebees and mattsb42-aws authored Jul 22, 2019
    Configuration menu
    Copy the full SHA
    a9b6259 View commit details
    Browse the repository at this point in the history

  4. Update modules/material-management-browser/src/browser_cryptographic_… 

    …materials_manager.ts

Co-Authored-By: Matt Bullock <[email protected]>
    @seebees @mattsb42-aws
    seebees and mattsb42-aws authored Jul 22, 2019
    Configuration menu
    Copy the full SHA
    2d3d294 View commit details
    Browse the repository at this point in the history

  5. change interface to return material,not nested material

    @seebees
    seebees committed Jul 22, 2019
    Configuration menu
    Copy the full SHA
    b4cca21 View commit details
    Browse the repository at this point in the history

  6. test pass

    @seebees
    seebees committed Jul 22, 2019
    Configuration menu
    Copy the full SHA
    3468cb5 View commit details
    Browse the repository at this point in the history

  7. no .context

    @seebees
    seebees committed Jul 22, 2019
    Configuration menu
    Copy the full SHA
    9d3283e View commit details
    Browse the repository at this point in the history

  8. even better name

    @seebees
    seebees committed Jul 22, 2019
    Configuration menu
    Copy the full SHA
    d8220e3 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2019

  1. Merge branch 'master' into encryption_context_on_material

    @seebees
    seebees authored Jul 23, 2019
    Configuration menu
    Copy the full SHA
    681963f View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2019

  1. insure is not a word

    @seebees
    seebees committed Jul 24, 2019
    Configuration menu
    Copy the full SHA
    1acb20b View commit details
    Browse the repository at this point in the history

  2. more

    @seebees
    seebees committed Jul 24, 2019
    Configuration menu
    Copy the full SHA
    47afaf2 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into encryption_context_on_material

    @seebees
    seebees authored Jul 24, 2019
    Configuration menu
    Copy the full SHA
    ee4fea3 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2019

  1. Merge branch 'master' into encryption_context_on_material

    @seebees
    seebees authored Jul 26, 2019
    Configuration menu
    Copy the full SHA
    a4d0c57 View commit details
    Browse the repository at this point in the history