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

Upstream main into main #25

Merged
merged 47 commits into from
May 12, 2024
Merged

Upstream main into main #25

merged 47 commits into from
May 12, 2024

Commits on Apr 3, 2024

  1. Clippy fix for CI

    @raphaelrobert
    raphaelrobert committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    701dbef View commit details
    Browse the repository at this point in the history

  2. Merge pull request openmls#1540 from openmls/raphael/clippy-fix 

    Clippy fix for CI
    @raphaelrobert
    raphaelrobert authored Apr 3, 2024
    Configuration menu
    Copy the full SHA
    38106f5 View commit details
    Browse the repository at this point in the history

  3. Further improve credentials (openmls#1539) 

    * Further improve credentials

* Make clippy happy

* Address review comments
    @raphaelrobert
    raphaelrobert authored Apr 3, 2024
    Configuration menu
    Copy the full SHA
    fe58308 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2024

  1. return leaf node for public staged commit states (openmls#1541)

    @kkohbrok
    kkohbrok authored Apr 4, 2024
    Configuration menu
    Copy the full SHA
    a06f628 View commit details
    Browse the repository at this point in the history

  2. Introduce frankenstein framework (openmls#1537) 

    * Introduce frankenstein framework

* Remove inaccurate comment

* Add fancy derefs

* More derefs
    @raphaelrobert
    raphaelrobert authored Apr 4, 2024
    Configuration menu
    Copy the full SHA
    6ee540a View commit details
    Browse the repository at this point in the history

  3. Remove cipher suite and version from Secret (openmls#1545) 

    * Remove cipher suite and version from Secret

* Address review comments
    @raphaelrobert
    raphaelrobert authored Apr 4, 2024
    Configuration menu
    Copy the full SHA
    033f4e6 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2024

  1. Add experimental XWing-based PQ-secure ciphersuite (openmls#1546)

    @kkohbrok
    kkohbrok authored Apr 5, 2024
    Configuration menu
    Copy the full SHA
    182261c View commit details
    Browse the repository at this point in the history

  2. Remove CryptoConfig (openmls#1548)

    @raphaelrobert
    raphaelrobert authored Apr 5, 2024
    Configuration menu
    Copy the full SHA
    8f76bd7 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2024

  1. build: bump peaceiris/actions-gh-pages from 3 to 4 (openmls#1551) 

    Bumps [peaceiris/actions-gh-pages](https://github.com/peaceiris/actions-gh-pages) from 3 to 4.
- [Release notes](https://github.com/peaceiris/actions-gh-pages/releases)
- [Changelog](https://github.com/peaceiris/actions-gh-pages/blob/main/CHANGELOG.md)
- [Commits](peaceiris/actions-gh-pages@v3...v4)

---
updated-dependencies:
- dependency-name: peaceiris/actions-gh-pages
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    @dependabot
    dependabot[bot] authored Apr 8, 2024
    Configuration menu
    Copy the full SHA
    24d68a5 View commit details
    Browse the repository at this point in the history

  2. build: bump peaceiris/actions-mdbook from 1 to 2 (openmls#1552) 

    Bumps [peaceiris/actions-mdbook](https://github.com/peaceiris/actions-mdbook) from 1 to 2.
- [Release notes](https://github.com/peaceiris/actions-mdbook/releases)
- [Changelog](https://github.com/peaceiris/actions-mdbook/blob/main/CHANGELOG.md)
- [Commits](peaceiris/actions-mdbook@v1...v2)

---
updated-dependencies:
- dependency-name: peaceiris/actions-mdbook
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: raphaelrobert <raphaelrobert@users.noreply.github.com>
    @dependabot @raphaelrobert
    dependabot[bot] and raphaelrobert authored Apr 8, 2024
    Configuration menu
    Copy the full SHA
    639349a View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2024

  1. fixup build after openmls#1548

    @franziskuskiefer
    franziskuskiefer committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    1ad514a View commit details
    Browse the repository at this point in the history

  2. Disable MLS++ interop on CI (openmls#1555) 

    Due to a recent vcpkg failure (in turn due to a bug in CMake), this PR disables interop testing with MLS++ on CI.

Co-authored-by: raphaelrobert <raphaelrobert@users.noreply.github.com>
    @kkohbrok @raphaelrobert
    kkohbrok and raphaelrobert authored Apr 9, 2024
    Configuration menu
    Copy the full SHA
    7e11185 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into franziskus/fixup-build

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

  4. Merge pull request openmls#1553 from openmls/franziskus/fixup-build 

    fixup build after openmls#1548
    @franziskuskiefer
    franziskuskiefer authored Apr 9, 2024
    Configuration menu
    Copy the full SHA
    fd76664 View commit details
    Browse the repository at this point in the history

  5. Enable handling of other/unknown proposals (openmls#1542) 

    This PR allows OpenMLS to handle unknown/other proposals analogous to how extensions are handled.
    @kkohbrok
    kkohbrok authored Apr 9, 2024
    Configuration menu
    Copy the full SHA
    bdcd0c4 View commit details
    Browse the repository at this point in the history

  6. Expose ext_sender_index function in MlsGroup (openmls#1557)

    @kkohbrok
    kkohbrok authored Apr 9, 2024
    Configuration menu
    Copy the full SHA
    fc34dcc View commit details
    Browse the repository at this point in the history

  7. expose propose_group_context_extensions and add a function (openmls#1554 

    )
    @franziskuskiefer
    franziskuskiefer authored Apr 9, 2024
    Configuration menu
    Copy the full SHA
    dd7b9f1 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2024

  1. Some DS improvements (openmls#1524)

    @kkohbrok
    kkohbrok authored Apr 10, 2024
    Configuration menu
    Copy the full SHA
    b50f887 View commit details
    Browse the repository at this point in the history

  2. Remove PartialEq and Clone constraits for errors in traits (openm… 

    …ls#1559)
    @kkohbrok
    kkohbrok authored Apr 10, 2024
    Configuration menu
    Copy the full SHA
    820e84b View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2024

  1. Add test for updating Unknown Group Context Extension (openmls#1560) 

    * Added test for updating unknown group context extensions data

---------

Co-authored-by: cameronvoell <cameronvoell@users.noreply.github.com>
    @cameronvoell
    cameronvoell and cameronvoell authored Apr 12, 2024
    Configuration menu
    Copy the full SHA
    00b0950 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2024

  1. Revert "Disable MLS++ interop on CI (openmls#1555)" 

    This reverts commit 7e11185.
    @kkohbrok @franziskuskiefer
    kkohbrok authored and franziskuskiefer committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    e2cba32 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2024

  1. New storage APIs (openmls#1565) 

    Co-authored-by: Jan Winkelmann (keks) <jan@cryspen.com>
    @franziskuskiefer @keks
    franziskuskiefer and keks authored Apr 26, 2024
    Configuration menu
    Copy the full SHA
    f7335a7 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' of https://github.com/openmls/openmls into openml… 

    …s-main
    @nplasterer
    nplasterer committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    0791f9d View commit details
    Browse the repository at this point in the history

  3. everything is a provider now

    @nplasterer
    nplasterer committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    8ecba62 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2024

  1. Add more frankenstein types

    @raphaelrobert
    raphaelrobert committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    15f86e3 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2024

  1. fix up a few merge conflicts

    @nplasterer
    nplasterer committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    abc4b43 View commit details
    Browse the repository at this point in the history

  2. run format

    @nplasterer
    nplasterer committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    d758ad2 View commit details
    Browse the repository at this point in the history

  3. address a few small commit issues

    @nplasterer
    nplasterer committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    82f6b47 View commit details
    Browse the repository at this point in the history

  4. fix the clippy issues

    @nplasterer
    nplasterer committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    f3e6248 View commit details
    Browse the repository at this point in the history

  5. fmt

    @nplasterer
    nplasterer committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    acdea30 View commit details
    Browse the repository at this point in the history

Commits on May 1, 2024

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

    Co-authored-by: Cameron Voell <1103838+cameronvoell@users.noreply.github.com>
    @nplasterer @cameronvoell
    nplasterer and cameronvoell authored May 1, 2024
    Configuration menu
    Copy the full SHA
    fbfd309 View commit details
    Browse the repository at this point in the history

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

    Co-authored-by: Cameron Voell <1103838+cameronvoell@users.noreply.github.com>
    @nplasterer @cameronvoell
    nplasterer and cameronvoell authored May 1, 2024
    Configuration menu
    Copy the full SHA
    e6a2553 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2024

  1. Doc updates for storage (openmls#1570) 

    Co-authored-by: Konrad Kohbrok <konrad.kohbrok@datashrine.de>
    @franziskuskiefer @kkohbrok
    franziskuskiefer and kkohbrok authored May 2, 2024
    Configuration menu
    Copy the full SHA
    bd8a901 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2024

  1. Removing unused code (openmls#1572)

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

Commits on May 6, 2024

  1. Merge branch 'main' into raphael/more-frankenstein

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

  2. Merge pull request openmls#1571 from openmls/raphael/more-frankenstein 

    Add more frankenstein types
    @franziskuskiefer
    franziskuskiefer authored May 6, 2024
    Configuration menu
    Copy the full SHA
    3cf662a View commit details
    Browse the repository at this point in the history

Commits on May 7, 2024

  1. Test framework and enabling libcrux tests (openmls#1573)

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

Commits on May 8, 2024

  1. make storageId public

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

  2. Merge branch 'openmls-main' of https://github.com/xmtp/openmls into o… 

    …penmls-main
    @nplasterer
    nplasterer committed May 8, 2024
    Configuration menu
    Copy the full SHA
    8511443 View commit details
    Browse the repository at this point in the history

  3. add from method

    @nplasterer
    nplasterer committed May 8, 2024
    Configuration menu
    Copy the full SHA
    79aed1a View commit details
    Browse the repository at this point in the history

Commits on May 10, 2024

  1. add the proposal reference

    @nplasterer
    nplasterer committed May 10, 2024
    Configuration menu
    Copy the full SHA
    6bc9d88 View commit details
    Browse the repository at this point in the history

  2. aad bytewrapper

    @nplasterer
    nplasterer committed May 10, 2024
    Configuration menu
    Copy the full SHA
    6ba1a80 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/main' into openmls-main

    @nplasterer
    nplasterer committed May 10, 2024
    Configuration menu
    Copy the full SHA
    5897d4a View commit details
    Browse the repository at this point in the history

  4. more updates on bytewrapper

    @nplasterer
    nplasterer committed May 10, 2024
    Configuration menu
    Copy the full SHA
    25e4935 View commit details
    Browse the repository at this point in the history

Commits on May 12, 2024

  1. remove the byte wrapper stuff

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

  2. fix up clippy issues

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

  3. fix up format issues

    @nplasterer
    nplasterer committed May 12, 2024
    Configuration menu
    Copy the full SHA
    38744b3 View commit details
    Browse the repository at this point in the history