Skip to content

rework TryFrom converting signatures to accept a ref #573

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

Merged
merged 1 commit into from
May 10, 2025
Merged

rework TryFrom converting signatures to accept a ref #573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions tss-esapi/src/abstraction/no_tpm/quote.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ where
SignatureSize<C>: ArrayLength<u8>,
FieldBytesSize<C>: ModulusSize,
{
let Ok(signature) = ecdsa::Signature::<C>::try_from(signature.clone()) else {
let Ok(signature) = ecdsa::Signature::<C>::try_from(signature) else {
return Ok(false);
};
let Ok(public) = elliptic_curve::PublicKey::<C>::try_from(public) else {
Expand Down Expand Up @@ -342,7 +342,7 @@ pub fn checkquote(
}
#[cfg(feature = "rsa")]
(Public::Rsa { .. }, sig @ Signature::RsaSsa(pkcs_sig)) => {
let Ok(sig) = pkcs1v15::Signature::try_from(sig.clone()) else {
let Ok(sig) = pkcs1v15::Signature::try_from(sig) else {
return Err(Error::WrapperError(WrapperErrorKind::UnsupportedParam));
};

Expand All @@ -353,7 +353,7 @@ pub fn checkquote(
}
#[cfg(feature = "rsa")]
(Public::Rsa { .. }, sig @ Signature::RsaPss(pkcs_sig)) => {
let Ok(sig) = pss::Signature::try_from(sig.clone()) else {
let Ok(sig) = pss::Signature::try_from(sig) else {
return Err(Error::WrapperError(WrapperErrorKind::UnsupportedParam));
};

Expand Down
39 changes: 27 additions & 12 deletions tss-esapi/src/abstraction/signatures.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
// Copyright 2024 Contributors to the Parsec project.
// SPDX-License-Identifier: Apache-2.0

use crate::{structures::EccSignature, Error, Result, WrapperErrorKind};
use crate::{
structures::{EccSignature, Signature},
Error, Result, WrapperErrorKind,
};

use std::convert::TryFrom;

Expand All @@ -11,17 +14,14 @@ use elliptic_curve::{
FieldBytes, FieldBytesSize, PrimeCurve,
};

#[cfg(feature = "rsa")]
use crate::structures::Signature;

impl<C> TryFrom<EccSignature> for ecdsa::Signature<C>
impl<C> TryFrom<&EccSignature> for ecdsa::Signature<C>
where
C: PrimeCurve,
SignatureSize<C>: ArrayLength<u8>,
{
type Error = Error;

fn try_from(signature: EccSignature) -> Result<Self> {
fn try_from(signature: &EccSignature) -> Result<Self> {
Copy link
Collaborator

Choose a reason for hiding this comment

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

I guess this is fine because FieldBytes does not seem to be able to contain references. The only thing I would change would perhaps to use

FieldBytes::<C>::clone_from_slice()

let r = signature.signature_r().as_slice();
let s = signature.signature_s().as_slice();

Expand All @@ -33,21 +33,36 @@ where
}

let signature = ecdsa::Signature::from_scalars(
FieldBytes::<C>::from_slice(r).clone(),
FieldBytes::<C>::from_slice(s).clone(),
FieldBytes::<C>::clone_from_slice(r),
FieldBytes::<C>::clone_from_slice(s),
)
.map_err(|_| Error::local_error(WrapperErrorKind::InvalidParam))?;
Ok(signature)
}
}

impl<C> TryFrom<&Signature> for ecdsa::Signature<C>
where
C: PrimeCurve,
SignatureSize<C>: ArrayLength<u8>,
{
type Error = Error;

fn try_from(signature: &Signature) -> Result<Self> {
let Signature::EcDsa(signature) = signature else {
return Err(Error::local_error(WrapperErrorKind::InvalidParam));
};
Self::try_from(signature)
}
}

// Note: this does not implement `TryFrom<RsaSignature>` because `RsaSignature` does not carry the
// information whether the signatures was generated using PKCS#1v1.5 or PSS.
#[cfg(feature = "rsa")]
impl TryFrom<Signature> for rsa::pkcs1v15::Signature {
impl TryFrom<&Signature> for rsa::pkcs1v15::Signature {
type Error = Error;

fn try_from(signature: Signature) -> Result<Self> {
fn try_from(signature: &Signature) -> Result<Self> {
let Signature::RsaSsa(signature) = signature else {
return Err(Error::local_error(WrapperErrorKind::InvalidParam));
};
Expand All @@ -60,10 +75,10 @@ impl TryFrom<Signature> for rsa::pkcs1v15::Signature {
// Note: this does not implement `TryFrom<RsaSignature>` because `RsaSignature` does not carry the
// information whether the signatures was generated using PKCS#1v1.5 or PSS.
#[cfg(feature = "rsa")]
impl TryFrom<Signature> for rsa::pss::Signature {
impl TryFrom<&Signature> for rsa::pss::Signature {
type Error = Error;

fn try_from(signature: Signature) -> Result<Self> {
fn try_from(signature: &Signature) -> Result<Self> {
let Signature::RsaPss(signature) = signature else {
return Err(Error::local_error(WrapperErrorKind::InvalidParam));
};
Expand Down
6 changes: 3 additions & 3 deletions tss-esapi/src/abstraction/signer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ where
)));
};

let signature = Signature::try_from(signature).map_err(SigError::from_source)?;
let signature = Signature::try_from(&signature).map_err(SigError::from_source)?;

Ok(signature)
}
Expand Down Expand Up @@ -453,7 +453,7 @@ mod rsa {
let signature = self.context.sign(digest).map_err(SigError::from_source)?;

let signature =
pkcs1v15::Signature::try_from(signature).map_err(SigError::from_source)?;
pkcs1v15::Signature::try_from(&signature).map_err(SigError::from_source)?;

Ok(signature)
}
Expand Down Expand Up @@ -581,7 +581,7 @@ mod rsa {

let signature = self.context.sign(digest).map_err(SigError::from_source)?;

let signature = pss::Signature::try_from(signature).map_err(SigError::from_source)?;
let signature = pss::Signature::try_from(&signature).map_err(SigError::from_source)?;

Ok(signature)
}
Expand Down