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

Prepare release 0.2.1 #13

Merged
merged 2 commits into from
Jun 21, 2024
Merged

Prepare release 0.2.1 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b7babb
Prepare release 0.2.1
sosthene-nitrokey Jun 21, 2024
abf464e
Replace `unwrap` and `expect` calls with `unwrap_or_else(|| panic!())`
sosthene-nitrokey Jun 21, 2024
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
8 changes: 7 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,13 @@ SPDX-License-Identifier: CC0-1.0

[Unreleased]: https://github.com/trussed-dev/trussed-rsa-backend/compare/v0.2.0...HEAD

-
## [v0.2.1][] (2024-06-21)

[v0.2.1]: https://github.com/trussed-dev/trussed-rsa-backend/compare/v0.2.0...v0.2.1

- Fix missing zeros of RSA implementation ([#12][])

[#12]: https://github.com/trussed-dev/trussed-rsa-backend/pull/12

## [v0.2.0][] (2024-03-22)

Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

[package]
name = "trussed-rsa-alloc"
version = "0.2.0"
version = "0.2.1"
edition = "2021"
description = "Trussed backend adding support for the RSA algorithm using an allocator"
authors = ["Nitrokey GmbH <[email protected]>"]
Expand Down
51 changes: 28 additions & 23 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,17 @@ fn derive_key(
let base_key_id = &request.base_key;
let priv_key_der = keystore
.load_key(key::Secrecy::Secret, Some(kind), base_key_id)
.expect("Failed to load an RSA private key with the given ID")
.unwrap_or_else(|_| panic!("Failed to load an RSA private key with the given ID"))
.material;
let priv_key = DecodePrivateKey::from_pkcs8_der(&priv_key_der)
.expect("Failed to deserialize an RSA private key from PKCS#8 DER");
.unwrap_or_else(|_| panic!("Failed to deserialize an RSA private key from PKCS#8 DER"));

// Derive and store public key
let pub_key_der = RsaPublicKey::from(&priv_key)
.to_public_key_der()
.expect("Failed to derive an RSA public key or to serialize it to PKCS#8 DER");
.unwrap_or_else(|_| {
panic!("Failed to derive an RSA public key or to serialize it to PKCS#8 DER")
});

let pub_key_id = keystore.store_key(
request.attributes.persistence,
Expand Down Expand Up @@ -106,7 +108,7 @@ fn deserialize_pkcs_key(
// We store our keys in PKCS#8 DER format
let pub_key_der = pub_key
.to_public_key_der()
.expect("Failed to serialize an RSA public key to PKCS#8 DER");
.unwrap_or_else(|_| panic!("Failed to serialize an RSA public key to PKCS#8 DER"));

let pub_key_id = keystore.store_key(
request.attributes.persistence,
Expand Down Expand Up @@ -139,7 +141,7 @@ fn deserialize_parts_key(
// We store our keys in PKCS#8 DER format
let pub_key_der = pub_key
.to_public_key_der()
.expect("Failed to serialize an RSA public key to PKCS#8 DER");
.unwrap_or_else(|_| panic!("Failed to serialize an RSA public key to PKCS#8 DER"));

let pub_key_id = keystore.store_key(
request.attributes.persistence,
Expand Down Expand Up @@ -178,13 +180,13 @@ fn serialize_key(
// We rely on the fact that we store the keys in the PKCS#8 DER format already
let pub_key_der = keystore
.load_key(key::Secrecy::Public, Some(kind), &key_id)
.expect("Failed to load an RSA public key with the given ID")
.unwrap_or_else(|_| panic!("Failed to load an RSA public key with the given ID"))
.material;

let serialized_key = match request.format {
KeySerialization::RsaParts => {
let key: RsaPublicKey =
DecodePublicKey::from_public_key_der(&pub_key_der).expect("Failed to parse key");
let key: RsaPublicKey = DecodePublicKey::from_public_key_der(&pub_key_der)
.unwrap_or_else(|_| panic!("Failed to parse key"));
let e = &key.e().to_bytes_be();
let n = &key.n().to_bytes_be();
RsaPublicParts { e, n }.serialize().map_err(|_err| {
Expand All @@ -206,12 +208,12 @@ fn generate_key(
bits: usize,
kind: key::Kind,
) -> Result<reply::GenerateKey, Error> {
let priv_key =
RsaPrivateKey::new(keystore.rng(), bits).expect("Failed to generate an RSA 2K private key");
let priv_key = RsaPrivateKey::new(keystore.rng(), bits)
.unwrap_or_else(|_| panic!("Failed to generate an RSA 2K private key"));

let priv_key_der = priv_key
.to_pkcs8_der()
.expect("Failed to serialize an RSA private key to PKCS#8 DER");
.unwrap_or_else(|_| panic!("Failed to serialize an RSA private key to PKCS#8 DER"));

let priv_key_id = keystore.store_key(
request.attributes.persistence,
Expand All @@ -231,11 +233,11 @@ fn sign(

let priv_key_der = keystore
.load_key(key::Secrecy::Secret, Some(kind), &key_id)
.expect("Failed to load an RSA private key with the given ID")
.unwrap_or_else(|_| panic!("Failed to load an RSA private key with the given ID"))
.material;

let priv_key = RsaPrivateKey::from_pkcs8_der(&priv_key_der)
.expect("Failed to deserialize an RSA private key from PKCS#8 DER");
.unwrap_or_else(|_| panic!("Failed to deserialize an RSA private key from PKCS#8 DER"));

// RSA lib takes in a hash value to sign, not raw data.
// We assume we get digest into this function, too.
Expand All @@ -256,7 +258,8 @@ fn sign(
error!("Failed to sign message: {:?}", _err);
Error::InternalError
})?;
let our_signature = Signature::from_slice(&native_signature.to_bytes()).unwrap();
let our_signature =
Signature::from_slice(&native_signature.to_bytes()).unwrap_or_else(|_| panic!());

Ok(reply::Sign {
signature: our_signature,
Expand All @@ -281,11 +284,11 @@ fn verify(

let pub_key_der = keystore
.load_key(key::Secrecy::Public, Some(kind), &key_id)
.expect("Failed to load an RSA private key with the given ID")
.unwrap_or_else(|_| panic!("Failed to load an RSA private key with the given ID"))
.material;

let pub_key = RsaPublicKey::from_public_key_der(&pub_key_der)
.expect("Failed to deserialize an RSA private key from PKCS#8 DER");
.unwrap_or_else(|_| panic!("Failed to deserialize an RSA private key from PKCS#8 DER"));

let verification_ok = pub_key
.verify(
Expand All @@ -310,10 +313,10 @@ fn decrypt(

let priv_key_der = keystore
.load_key(key::Secrecy::Secret, Some(kind), &key_id)
.expect("Failed to load an RSA private key with the given ID")
.unwrap_or_else(|_| panic!("Failed to load an RSA private key with the given ID"))
.material;
let priv_key = RsaPrivateKey::from_pkcs8_der(&priv_key_der)
.expect("Failed to deserialize an RSA private key from PKCS#8 DER");
.unwrap_or_else(|_| panic!("Failed to deserialize an RSA private key from PKCS#8 DER"));

let res = priv_key
.decrypt(Pkcs1v15Encrypt, &request.message)
Expand Down Expand Up @@ -341,10 +344,10 @@ fn rsa_raw<R: RngCore + CryptoRng, const N: usize>(
) -> Result<Bytes<N>, Error> {
let priv_key_der = keystore
.load_key(key::Secrecy::Secret, Some(kind), &key_id)
.expect("Failed to load an RSA private key with the given ID")
.unwrap_or_else(|_| panic!("Failed to load an RSA private key with the given ID"))
.material;
let priv_key = RsaPrivateKey::from_pkcs8_der(&priv_key_der)
.expect("Failed to deserialize an RSA private key from PKCS#8 DER");
.unwrap_or_else(|_| panic!("Failed to deserialize an RSA private key from PKCS#8 DER"));

let c = rsa::BigUint::from_bytes_be(plaintext);
let res = rsa::hazmat::rsa_decrypt(Some(rng), &priv_key, &c).map_err(|_err| {
Expand All @@ -356,8 +359,10 @@ fn rsa_raw<R: RngCore + CryptoRng, const N: usize>(
let expected_len = bits / 8;
assert!(data.len() <= expected_len);
let mut bytes = Bytes::new();
bytes.resize(expected_len - data.len(), 0).unwrap();
bytes.extend_from_slice(data).unwrap();
bytes
.resize(expected_len - data.len(), 0)
.unwrap_or_else(|_| panic!());
bytes.extend_from_slice(data).unwrap_or_else(|_| panic!());
bytes
}

Expand Down Expand Up @@ -417,7 +422,7 @@ fn unsafe_inject_key(

let private_key_der = private_key
.to_pkcs8_der()
.expect("Failed to serialize an RSA 2K private key to PKCS#8 DER");
.unwrap_or_else(|_| panic!("Failed to serialize an RSA 2K private key to PKCS#8 DER"));

let private_key_id = keystore.store_key(
request.attributes.persistence,
Expand Down