Skip to content

Commit da591df

Browse files
committed
fixup! fixup! checkquote: support more curves and hashes
1 parent e8790da commit da591df

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

tss-esapi/src/utils/quote.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ pub fn checkquote(
323323
($curve: ty) => {
324324
if parameters.ecc_curve() == <$curve>::TPM_CURVE {
325325
let Signature::EcDsa(sig) = signature else {
326-
return Ok(false);
326+
return Err(Error::WrapperError(WrapperErrorKind::UnsupportedParam));
327327
};
328328
if !verify_ecdsa::<$curve>(&public, &bytes, &sig, sig.hashing_algorithm())?
329329
{
@@ -351,7 +351,7 @@ pub fn checkquote(
351351
#[cfg(feature = "rsa")]
352352
(Public::Rsa { .. }, sig @ Signature::RsaSsa(pkcs_sig)) => {
353353
let Ok(sig) = pkcs1v15::Signature::try_from(sig.clone()) else {
354-
return Ok(false);
354+
return Err(Error::WrapperError(WrapperErrorKind::UnsupportedParam));
355355
};
356356

357357
if !verify_rsa_pkcs1v15(public, &bytes, &sig, pkcs_sig.hashing_algorithm())? {
@@ -362,7 +362,7 @@ pub fn checkquote(
362362
#[cfg(feature = "rsa")]
363363
(Public::Rsa { .. }, sig @ Signature::RsaPss(pkcs_sig)) => {
364364
let Ok(sig) = pss::Signature::try_from(sig.clone()) else {
365-
return Ok(false);
365+
return Err(Error::WrapperError(WrapperErrorKind::UnsupportedParam));
366366
};
367367

368368
if !verify_rsa_pss(public, &bytes, &sig, pkcs_sig.hashing_algorithm())? {
@@ -371,7 +371,7 @@ pub fn checkquote(
371371
hash_alg = Some(pkcs_sig.hashing_algorithm());
372372
}
373373
_ => {
374-
return Ok(false);
374+
return Err(Error::WrapperError(WrapperErrorKind::UnsupportedParam));
375375
}
376376
};
377377

0 commit comments

Comments
 (0)