Merge pull request #209 from Nitrokey/bump-rsa

Bump rsa backend version and prepare release
Nitrokey · Jun 21, 2024 · bab6648 · bab6648
2 parents 5bb9b86 + c8be726
commit bab6648
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,7 +7,13 @@ SPDX-License-Identifier: CC0-1.0
 
 ## Unreleased
 
--
+## [v1.4.1][] (2024-03-22)
+
+[v1.4.1]: https://github.com/Nitrokey/opcard-rs/releases/tag/v1.4.1
+
+- Bump RSA backend version ([#209][])
+
+[#209]: https://github.com/Nitrokey/opcard-rs/pull/209
 
 ## [v1.4.0][] (2024-03-22)
 

diff --git a/Cargo.toml b/Cargo.toml
@@ -3,7 +3,7 @@
 
 [package]
 name = "opcard"
-version = "1.4.0"
+version = "1.4.1"
 authors = ["Nitrokey GmbH <[email protected]>"]
 edition = "2021"
 description = "OpenPGP smart card implementation"
@@ -32,7 +32,7 @@ serde = { version = "1.0", default-features = false }
 subtle = { version = "2.4.1", default-features = false }
 trussed = "0.1.0"
 trussed-chunked = "0.1.0"
-trussed-rsa-alloc = { version = "0.1.0", optional = true }
+trussed-rsa-alloc = { version = "0.2.0", optional = true }
 trussed-wrap-key-to-file = "0.1.0"
 serde_repr = "0.1"
 hex-literal = "0.4.1"
@@ -56,7 +56,7 @@ regex = "1.6.0"
 stoppable_thread = "0.2.1"
 test-log = "0.2.10"
 trussed = { version = "0.1.0", features = ["virt"] }
-trussed-rsa-alloc = { version = "0.1.0", features = ["virt"] }
+trussed-rsa-alloc = { version = "0.2.0", features = ["virt"] }
 rand = "0.8.5"
 ron = "0.8"
 serde_cbor = "0.11"
@@ -98,7 +98,7 @@ trussed = { git = "https://github.com/Nitrokey/trussed" , tag = "v0.1.0-nitrokey
 trussed-auth = { git = "https://github.com/trussed-dev/trussed-auth.git", tag = "v0.3.0"}
 trussed-chunked = { git = "https://github.com/trussed-dev/trussed-staging.git", tag = "chunked-v0.1.0" }
 trussed-manage = { git = "https://github.com/trussed-dev/trussed-staging.git", tag = "manage-v0.1.0" }
-trussed-rsa-alloc = { git = "https://github.com/trussed-dev/trussed-rsa-backend.git", rev = "9732a9a3e98af72112286afdc9b7174c66c2869a" }
+trussed-rsa-alloc = { git = "https://github.com/trussed-dev/trussed-rsa-backend.git", tag = "v0.2.0" }
 trussed-staging = { git = "https://github.com/trussed-dev/trussed-staging.git", tag = "v0.2.0" }
 trussed-wrap-key-to-file = { git = "https://github.com/trussed-dev/trussed-staging.git", tag = "wrap-key-to-file-v0.1.0" }
 apdu-dispatch = { git = "https://github.com/Nitrokey/apdu-dispatch", tag = "v0.1.2-nitrokey.2" }

diff --git a/src/card.rs b/src/card.rs
@@ -337,6 +337,12 @@ impl<'a, const R: usize, T: Client> LoadedContext<'a, R, T> {
     }
 }
 
+use trussed_wrap_key_to_file::WrapKeyToFileClient;
+
+/// Super trait with all trussed extensions required by opcard
+pub trait Client: trussed::Client + AuthClient + WrapKeyToFileClient + ChunkedClient {}
+impl<C: trussed::Client + WrapKeyToFileClient + AuthClient + ChunkedClient> Client for C {}
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -355,9 +361,3 @@ mod tests {
         assert!(RsaKeySizes::Rsa2048 < RsaKeySizes::Rsa4096);
     }
 }
-
-use trussed_wrap_key_to_file::WrapKeyToFileClient;
-
-/// Super trait with all trussed extensions required by opcard
-pub trait Client: trussed::Client + AuthClient + WrapKeyToFileClient + ChunkedClient {}
-impl<C: trussed::Client + WrapKeyToFileClient + AuthClient + ChunkedClient> Client for C {}