Skip to content

Integrate hpke-rs in workspace#1505

Merged
jschneider-bensch merged 386 commits into
mainfrom
jonas/integrate-hpke-rs
Jul 9, 2026
Merged

Integrate hpke-rs in workspace#1505
jschneider-bensch merged 386 commits into
mainfrom
jonas/integrate-hpke-rs

Conversation

@jschneider-bensch

@jschneider-bensch jschneider-bensch commented Jul 8, 2026 •
edited
Loading

Copy link
Copy Markdown
Collaborator

This PR pulls hpke-rs into the libcrux workspace under crates/protocols/hpke. It should preserve the git history of hpke-rs, while the version tags have been renamed to include an hpke-rs- prefix (e.g. v0.6.0 in the original repo is renamed to hpke-rs-v0.0.6 here).

I also moved CI workflows and updated their default working directories. I'm not sure I fixed up all things in the coverage and GH pages setups already though, so I've disabled those workflows for now.

[skip changelog]

franziskuskiefer and others added 30 commits November 19, 2023 10:32
@franziskuskiefer
bump tls_codec to 0.4.0-pre.2 (#46)
b6d6e1b
@franziskuskiefer
bump tls_codec to 0.4.0-pre.2
1992998
@franziskuskiefer
disable publishing evercrypt provider
67e0e44
@franziskuskiefer
bump tls_codec to 0.4.0-pre.4
ee80ca4
@franziskuskiefer
v0.1.2
3bd14bd
@japaric
switch from rand to rand_core
f4568ce 
the traits used here are rand_core re-exports
@japaric
rm unused serde_json dependency
58aaddf
@japaric
rm unused tls_codec dependency
6d043ea
@japaric
rm RwLock
64b6497 
there does not seem to be a need for interior mutability

the HpkeRustCrypto is already Send and Sync (provided that the
deterministic-prng feature is disabled) so RwLock is not adding much
value
@japaric
use core::fmt instead of std::fmt
a3ea3b1
@japaric
switch from rand to rand_core
116c6bd 
the traits / types used here are rand_core re-exports
@japaric
disable unused (default) features in dependencies
41a8b31 
some of these default feature sets pull a dependency on libstd
@franziskuskiefer
Merge pull request #47 from japaric/crypto-deps
50463d5 
hpks-rs-crypto: simplify Cargo.toml
@franziskuskiefer
Merge branch 'main' into rust-crypto-no-std
d3b0d52
@franziskuskiefer
Merge pull request #48 from japaric/rust-crypto-no-std
545caa6 
no-std-ify hpke-rs-rust-crypto
@japaric
hpke-rs-crypto: make serde opt-in
70a6797
@japaric
rm getrandom dep
5e3f3c7 
this dep enables the "js" Cargo feature but that should not be done in
libraries
@japaric
rm Hpke's internal RwLock
053eb58
@japaric
use core:: API instead of std:: re-exports
bb5755b
@japaric
switch from the std prelude to the core prelude
dcd6545 
in preparation for no-std support
@japaric
add an opt-out "std" Cargo feature
3687aeb
@japaric
rm unused serde_json feature
6e76bd9
@franziskuskiefer
Merge pull request #49 from japaric/opt-in-serde
db34854 
hpke-rs-crypto: make serde opt-in
@franziskuskiefer
Merge branch 'main' into rm-getrandom-js
8c129c7
@japaric
use core::{fmt,convert} instead of the std re-export
ff99123
@japaric
put Error impl behind a std feature
6cf4660
@japaric
import collections from alloc
16dba5c
@japaric
enable std feature when running benchmarks
a969932
@japaric
switch from the core prelude to the std prelude
3569324 
in preparation for no-std support
@franziskuskiefer
Merge pull request #50 from japaric/crypto-no-std
4a8cf19 
no-std-ify hpke-rs-crypto
jschneider-bensch
jschneider-bensch commented Jul 8, 2026
View reviewed changes
Comment thread Cargo.toml
@jschneider-bensch
jschneider-bensch marked this pull request as ready for review July 8, 2026 12:10
@jschneider-bensch jschneider-bensch mentioned this pull request Jul 8, 2026
Merged
@franziskuskiefer franziskuskiefer mentioned this pull request Jul 8, 2026
Open
3 tasks
@franziskuskiefer

franziskuskiefer commented Jul 8, 2026

Copy link
Copy Markdown
Contributor

Thanks! I'll do a full pass on this later. I opened celabshq/hpke-rs#165 to track the move and make sure everything goes smoothly.

@jschneider-bensch jschneider-bensch mentioned this pull request Jul 8, 2026
Closed
franziskuskiefer
franziskuskiefer previously requested changes Jul 8, 2026
View reviewed changes

@franziskuskiefer franziskuskiefer left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, I think this generlaly looks good. Just a few small things.

I didn't look at details of the code and expect it to just being moved.

Let's track the gh pages and coverage (and other follow ups) on an issue to see what to do about them.

Comment thread crates/protocols/hpke/libcrux_provider/Readme.md Outdated
Comment thread Cargo.toml
Comment thread crates/protocols/hpke/rust_crypto_provider/Readme.md
Comment thread CHANGELOG.md Outdated
Comment thread .github/workflows/hpke-rust.yml Outdated
Comment thread .github/workflows/hpke-rust.yml Outdated
Comment thread .github/workflows/hpke-rust.yml Outdated
@github-actions
github-actions Bot dismissed franziskuskiefer’s stale review July 9, 2026 08:26

Review re-requested

franziskuskiefer
franziskuskiefer approved these changes Jul 9, 2026
View reviewed changes

@franziskuskiefer franziskuskiefer left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, let's get this in and update the hpke-rs issue to redirect everything here.

@jschneider-bensch
jschneider-bensch added this pull request to the merge queue Jul 9, 2026
Merged via the queue into main with commit 59d428e Jul 9, 2026
124 checks passed
@jschneider-bensch
jschneider-bensch deleted the jonas/integrate-hpke-rs branch July 9, 2026 10:50
@franziskuskiefer franziskuskiefer mentioned this pull request Jul 10, 2026
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@franziskuskiefer franziskuskiefer franziskuskiefer approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.