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.

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

Add hpke backend #25

Merged
merged 2 commits into from
Oct 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased][]

[Unreleased]: https://github.com/trussed-dev/trussed-staging/compare/v0.3.0...HEAD
[Unreleased]: https://github.com/trussed-dev/trussed-staging/compare/v0.3.2...HEAD

-

## [0.3.2][] - 2024-10-18

[0.3.2]: https://github.com/trussed-dev/trussed-staging/compare/v0.3.1...v0.3.2

- Implement `HpkeExtension` ([#25](https://github.com/trussed-dev/trussed-staging/pull/25))

## [0.3.1][] - 2024-08-01

[0.3.1]: https://github.com/trussed-dev/trussed-staging/compare/v0.3.0...v0.3.1

- Implement `FsInfoExtension` ([#27](https://github.com/trussed-dev/trussed-staging/pull/27))

## [0.3.0][] - 2024-03-25

[0.3.0]: https://github.com/trussed-dev/trussed-staging/compare/v0.2.0...v0.3.0
Expand Down
24 changes: 19 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,14 @@
# SPDX-License-Identifier: CC0-1.0

[workspace]
members = ["extensions/chunked", "extensions/fs-info", "extensions/hkdf", "extensions/manage", "extensions/wrap-key-to-file"]
members = [
"extensions/chunked",
"extensions/fs-info",
"extensions/hkdf",
"extensions/hpke",
"extensions/manage",
"extensions/wrap-key-to-file",
]

[workspace.package]
authors = ["Nitrokey GmbH <[email protected]>"]
Expand All @@ -17,7 +24,7 @@ trussed = { version = "0.1.0", features = ["serde-extensions"] }

[package]
name = "trussed-staging"
version = "0.3.0"
version = "0.3.2"
description = "Work in progress trussed features"
authors.workspace = true
edition.workspace = true
Expand All @@ -35,15 +42,20 @@ hkdf = { version = "0.12", optional = true }
rand_core = { version = "0.6.4", default-features = false }
sha2 = { version = "0.10", default-features = false, optional = true }
littlefs2 = "0.4.0"
salty = { version = "0.3.0", default-features = false }
digest = { version = "0.10.7", default-features = false }
hex-literal = { version = "0.4.0", optional = true }
aead = { version = "0.5.2", optional = true, default-features = false }

trussed-chunked = { version = "0.1.0", optional = true }
trussed-hkdf = { version = "0.2.0", optional = true }
trussed-hpke = { version = "0.1.0", optional = true }
trussed-manage = { version = "0.1.0", optional = true }
trussed-wrap-key-to-file = { version = "0.1.0", optional = true }
trussed-fs-info = { version = "0.1.0", optional = true }

[dev-dependencies]
hex-literal = "0.3.4"
hex-literal = "0.4.0"
hmac = "0.12.0"
trussed = { workspace = true, features = ["virt"] }

Expand All @@ -52,8 +64,9 @@ default = []

chunked = ["trussed-chunked", "chacha20poly1305/stream"]
hkdf = ["trussed-hkdf", "dep:hkdf", "dep:sha2"]
hpke = ["trussed-hpke", "dep:hkdf", "dep:sha2", "dep:hex-literal", "dep:aead", "dep:chacha20poly1305"]
manage = ["trussed-manage"]
wrap-key-to-file = ["chacha20poly1305", "trussed-wrap-key-to-file"]
wrap-key-to-file = ["dep:chacha20poly1305", "trussed-wrap-key-to-file"]
fs-info = ["trussed-fs-info"]

virt = ["std", "trussed/virt"]
Expand All @@ -68,11 +81,12 @@ log-warn = []
log-error = []

[patch.crates-io]
trussed = { git = "https://github.com/trussed-dev/trussed.git", rev = "a055e4f79a10122c8c0c882161442e6e02f0c5c6" }
trussed = { git = "https://github.com/nitrokey/trussed.git", rev = "540ad725ef44f0d6d3d2da7dd6ec0bacffaeb5bf" }
littlefs2 = { git = "https://github.com/trussed-dev/littlefs2.git", rev = "960e57d9fc0d209308c8e15dc26252bbe1ff6ba8" }

trussed-chunked = { path = "extensions/chunked" }
trussed-hkdf = { path = "extensions/hkdf" }
trussed-hpke = { path = "extensions/hpke" }
trussed-manage = { path = "extensions/manage" }
trussed-wrap-key-to-file = { path = "extensions/wrap-key-to-file" }
trussed-fs-info= { path = "extensions/fs-info" }
22 changes: 22 additions & 0 deletions extensions/fs-info/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<!--
Copyright (C) Nitrokey GmbH
SPDX-License-Identifier: CC0-1.0
-->

# Changelog
All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased][]

[Unreleased]: https://github.com/trussed-dev/trussed-staging/compare/fs-info-v0.1.0...HEAD

-

## [0.1.0][] - 2024-10-18

[0.1.0]: https://github.com/Nitrokey/trussed-staging/releases/tag/fs-info-v0.1.0

Initial release of the `FsInfoExtension`.
22 changes: 22 additions & 0 deletions extensions/hpke/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<!--
Copyright (C) Nitrokey GmbH
SPDX-License-Identifier: CC0-1.0
-->

# Changelog
All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased][]

[Unreleased]: https://github.com/trussed-dev/trussed-staging/compare/hpke-v0.1.0...HEAD

-

## [0.1.0][] - 2024-10-18

[0.1.0]: https://github.com/Nitrokey/trussed-staging/releases/tag/hpke-v0.1.0

Initial release of the `HpkeExtension`.
15 changes: 15 additions & 0 deletions extensions/hpke/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Copyright (C) Nitrokey GmbH
# SPDX-License-Identifier: CC0-1.0

[package]
name = "trussed-hpke"
version = "0.1.0"
authors.workspace = true
edition.workspace = true
repository.workspace = true
license.workspace = true

[dependencies]
serde.workspace = true
trussed.workspace = true
serde-byte-array = "0.1.2"
Loading