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

Reject supplied nonces for non-convergent encryption operations #22852

Merged
merged 27 commits into from Sep 8, 2023
Merged

Reject supplied nonces for non-convergent encryption operations #22852

merged 27 commits into from Sep 8, 2023

Commits on Aug 31, 2023

  1. Ignore nonces when encrypting without convergence or with convergence… 

    … versions > 1
    @sgmiller
    sgmiller committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    428d55b View commit details
    Browse the repository at this point in the history

  2. Honor nonce use warning in non-FIPS modes

    @sgmiller
    sgmiller committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    2aee3db View commit details
    Browse the repository at this point in the history

  3. Revert "Honor nonce use warning in non-FIPS modes" 

    This reverts commit 2aee3db.
    @sgmiller
    sgmiller committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    cebb858 View commit details
    Browse the repository at this point in the history

  4. Add a test func that removes a nonce when not needed

    @sgmiller
    sgmiller committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    7b82f58 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/main' into sgm/transit-nonce-guard

    @sgmiller
    sgmiller committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    8e66f6a View commit details
    Browse the repository at this point in the history

  6. err out rather than ignore the nonce

    @sgmiller
    sgmiller committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    9ef1561 View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2023

  1. Merge remote-tracking branch 'origin/main' into sgm/transit-nonce-guard

    @sgmiller
    sgmiller committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    d1dee03 View commit details
    Browse the repository at this point in the history

  2. Alter unit test to cover, also cover convergent version 3

    @sgmiller
    sgmiller committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    9de75fa View commit details
    Browse the repository at this point in the history

  3. More unit test work

    @sgmiller
    sgmiller committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    0f6819e View commit details
    Browse the repository at this point in the history

  4. Fix test 14

    @sgmiller
    sgmiller committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    e505737 View commit details
    Browse the repository at this point in the history

  5. changelog

    @sgmiller
    sgmiller committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    958298f View commit details
    Browse the repository at this point in the history

  6. Merge branch 'main' into transit-nonce-guard

    @sgmiller
    sgmiller committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    ecf30f4 View commit details
    Browse the repository at this point in the history

  7. tests not already in a nonce present path

    @sgmiller
    sgmiller committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    17160a9 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'transit-nonce-guard' of github.com:/hashicorp/vault int… 

    …o transit-nonce-guard
    @sgmiller
    sgmiller committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    8a503f3 View commit details
    Browse the repository at this point in the history

  9. Merge remote-tracking branch 'origin/main' into transit-nonce-guard

    @sgmiller
    sgmiller committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    68a988d View commit details
    Browse the repository at this point in the history

  10. Update unit test to not assume warning when nonce provided incorrectly

    @sgmiller
    sgmiller committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    7dd93c1 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'main' into transit-nonce-guard

    @sgmiller
    sgmiller committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    fef7429 View commit details
    Browse the repository at this point in the history

  12. remove unused test field

    @sgmiller
    sgmiller committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    eb68659 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'transit-nonce-guard' of github.com:/hashicorp/vault int… 

    …o transit-nonce-guard
    @sgmiller
    sgmiller committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    d498e5e View commit details
    Browse the repository at this point in the history

  14. Merge branch 'main' into transit-nonce-guard

    @sgmiller
    sgmiller committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    c09d54d View commit details
    Browse the repository at this point in the history

  15. Fix auto-squash events experiments 

    When #22835 was merged, it was auto-squashed, so the `experiments`
import was removed, but the test still referenced it.

This removes the (now unnecessary) experiment from the test.
    Christopher Swenson committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    6d869ec View commit details
    Browse the repository at this point in the history

  16. Merge branch 'main' into transit-nonce-guard

    @sgmiller
    sgmiller committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    92b8341 View commit details
    Browse the repository at this point in the history

  17. Merge remote-tracking branch 'origin/vault-19136/events-b-expr-test-f… 

    …ix' into transit-nonce-guard
    @sgmiller
    sgmiller committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    88ff4dd View commit details
    Browse the repository at this point in the history

  18. Merge branch 'transit-nonce-guard' of github.com:/hashicorp/vault int… 

    …o transit-nonce-guard
    @sgmiller
    sgmiller committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    a3a588d View commit details
    Browse the repository at this point in the history

  19. Merge branch 'main' into transit-nonce-guard

    @sgmiller
    sgmiller committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    1c0ee3d View commit details
    Browse the repository at this point in the history

  20. Allow nonces for managed keys, because we have no way of knowing if t… 

    …he backing cipher/mode needs one
    @sgmiller
    sgmiller committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    7fd3c00 View commit details
    Browse the repository at this point in the history

  21. Merge branch 'transit-nonce-guard' of github.com:/hashicorp/vault int… 

    …o transit-nonce-guard
    @sgmiller
    sgmiller committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    b85d990 View commit details
    Browse the repository at this point in the history