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

Pull upstream to expose PSKs #30

Merged
merged 33 commits into from
Jun 7, 2024
Merged

Pull upstream to expose PSKs #30

merged 33 commits into from
Jun 7, 2024

Commits on May 16, 2024

  1. bring in update context proposal work for mutable metadata

    @nplasterer
    nplasterer committed May 16, 2024
    Configuration menu
    Copy the full SHA
    4fdd47d View commit details
    Browse the repository at this point in the history

  2. fix format issue

    @nplasterer
    nplasterer committed May 16, 2024
    Configuration menu
    Copy the full SHA
    2de4fe1 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into np/update-context-proposals

    @nplasterer
    nplasterer authored May 16, 2024
    Configuration menu
    Copy the full SHA
    50101ea View commit details
    Browse the repository at this point in the history

Commits on May 17, 2024

  1. Don't store encryption key separately 

    This is unnecessary and was missed in openmls#1565.
    @franziskuskiefer
    franziskuskiefer committed May 17, 2024
    Configuration menu
    Copy the full SHA
    dd9c9dd View commit details
    Browse the repository at this point in the history

  2. docs: not storing some values causes failures when loading the group

    @franziskuskiefer
    franziskuskiefer committed May 17, 2024
    Configuration menu
    Copy the full SHA
    7fbfd83 View commit details
    Browse the repository at this point in the history

  3. benchmarks for ml-kem

    @franziskuskiefer
    franziskuskiefer committed May 17, 2024
    Configuration menu
    Copy the full SHA
    d5905aa View commit details
    Browse the repository at this point in the history

  4. dont make the crate public

    @nplasterer
    nplasterer committed May 17, 2024
    Configuration menu
    Copy the full SHA
    32f344b View commit details
    Browse the repository at this point in the history

  5. Merge branch 'np/update-context-proposals' of https://github.com/npla… 

    …sterer/openmls into np/update-context-proposals
    @nplasterer
    nplasterer committed May 17, 2024
    Configuration menu
    Copy the full SHA
    770ac98 View commit details
    Browse the repository at this point in the history

Commits on May 20, 2024

  1. Merge pull request openmls#1582 from openmls/franziskus/benchmarks-ml… 

    …-kem2

benchmarks for ml-kem
    @franziskuskiefer
    franziskuskiefer authored May 20, 2024
    Configuration menu
    Copy the full SHA
    ab84c81 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into franziskus/more-storage-docs

    @franziskuskiefer
    franziskuskiefer authored May 20, 2024
    Configuration menu
    Copy the full SHA
    9fb2714 View commit details
    Browse the repository at this point in the history

  3. Merge pull request openmls#1581 from openmls/franziskus/more-storage-… 

    …docs

Storage docs and small fix
    @franziskuskiefer
    franziskuskiefer authored May 20, 2024
    Configuration menu
    Copy the full SHA
    ba50744 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2024

  1. check that staged commit has gce proposal applied

    @franziskuskiefer
    franziskuskiefer committed May 22, 2024
    Configuration menu
    Copy the full SHA
    5523a06 View commit details
    Browse the repository at this point in the history

  2. add logging to all tests

    @franziskuskiefer
    franziskuskiefer committed May 22, 2024
    Configuration menu
    Copy the full SHA
    9ae58bc View commit details
    Browse the repository at this point in the history

  3. Merge pull request openmls#1583 from openmls/franziskus/gce-staged-co… 

    …mmit-test

Update gce staged commit test
    @franziskuskiefer
    franziskuskiefer authored May 22, 2024
    Configuration menu
    Copy the full SHA
    89c4b9d View commit details
    Browse the repository at this point in the history

  4. add changelog for new storage API

    @franziskuskiefer
    franziskuskiefer committed May 22, 2024
    Configuration menu
    Copy the full SHA
    4952fcb View commit details
    Browse the repository at this point in the history

Commits on May 23, 2024

  1. Merge pull request openmls#1584 from openmls/franziskus/changelog-sto… 

    …rage

add changelog for new storage API
    @franziskuskiefer
    franziskuskiefer authored May 23, 2024
    Configuration menu
    Copy the full SHA
    439c24d View commit details
    Browse the repository at this point in the history

  2. adds comment description for update_group_context_extensions

    @cameronvoell
    cameronvoell committed May 23, 2024
    Configuration menu
    Copy the full SHA
    2e587c1 View commit details
    Browse the repository at this point in the history

Commits on May 27, 2024

  1. Merge branch 'main' into np/update-context-proposals

    @franziskuskiefer
    franziskuskiefer authored May 27, 2024
    Configuration menu
    Copy the full SHA
    2741e2b View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2024

  1. API for processed welcome 

    Fixes openmls#1585
    @franziskuskiefer
    franziskuskiefer committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    9d2f018 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2024

  1. updated comments taking inspiration from add_members

    @cameronvoell
    cameronvoell committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    96fef7a View commit details
    Browse the repository at this point in the history

  2. added test for update_group_context_extensions function

    @cameronvoell
    cameronvoell committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    fe15de6 View commit details
    Browse the repository at this point in the history

  3. silence clippy

    @franziskuskiefer
    franziskuskiefer committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    0eae551 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1 from cameronvoell/cv/update-context-proposals-test 

    Adds comment and new test for update_group_context_extensions
    @nplasterer
    nplasterer authored Jun 5, 2024
    Configuration menu
    Copy the full SHA
    9d9a552 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2024

  1. make the number of psks public

    @nplasterer
    nplasterer committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    5174c31 View commit details
    Browse the repository at this point in the history

  2. Update openmls/src/group/mls_group/proposal.rs

    @franziskuskiefer
    franziskuskiefer authored Jun 6, 2024
    Configuration menu
    Copy the full SHA
    edcc80b View commit details
    Browse the repository at this point in the history

  3. Update openmls/src/group/mls_group/proposal.rs

    @franziskuskiefer
    franziskuskiefer authored Jun 6, 2024
    Configuration menu
    Copy the full SHA
    fac0094 View commit details
    Browse the repository at this point in the history

  4. also expose PSKs from welcome

    @franziskuskiefer
    franziskuskiefer committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    703fb76 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2024

  1. Merge remote-tracking branch 'upstream/1585-api-to-parse-welcome-|-pa… 

    …rsedwelcome' into np/make-psk-number-public
    @nplasterer
    nplasterer committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    45c5637 View commit details
    Browse the repository at this point in the history

  2. dont make the crate public

    @nplasterer
    nplasterer committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    2fa5d2d View commit details
    Browse the repository at this point in the history

  3. Attempted fix for test runner (openmls#1587)

    @raphaelrobert
    raphaelrobert authored Jun 7, 2024
    Configuration menu
    Copy the full SHA
    718959c View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into np/update-context-proposals

    @franziskuskiefer
    franziskuskiefer authored Jun 7, 2024
    Configuration menu
    Copy the full SHA
    ab88304 View commit details
    Browse the repository at this point in the history

  5. Merge pull request openmls#1580 from nplasterer/np/update-context-pro… 

    …posals

Add `update_group_context_extensions` to commit to a gce inline proposal.
    @franziskuskiefer
    franziskuskiefer authored Jun 7, 2024
    Configuration menu
    Copy the full SHA
    556bc70 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'upstream/main' into np/make-psk-number-… 

    …public
    @nplasterer
    nplasterer committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    8a86797 View commit details
    Browse the repository at this point in the history