Skip to content

Replace panic with Secp256k1 variant in HpkeError #9

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

Draft
DanGould wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Replace panic with Secp256k1 variant in HpkeError #9

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
19 changes: 16 additions & 3 deletions payjoin/src/core/hpke.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,7 @@ fn pad_plaintext(msg: &mut Vec<u8>, padded_length: usize) -> Result<&[u8], HpkeE
pub enum HpkeError {
InvalidPublicKey,
Hpke(hpke::HpkeError),
Secp256k1(secp256k1::Error),
InvalidKeyLength,
PayloadTooLarge { actual: usize, max: usize },
PayloadTooShort,
Expand All @@ -286,10 +287,8 @@ impl From<hpke::HpkeError> for HpkeError {
impl From<secp256k1::Error> for HpkeError {
fn from(value: secp256k1::Error) -> Self {
match value {
// As of writing, this is the only relevant variant that could arise here.
// This may need to be updated if relevant variants are added to secp256k1
secp256k1::Error::InvalidPublicKey => Self::InvalidPublicKey,
_ => panic!("Unsupported variant of secp256k1::Error"),
other => Self::Secp256k1(other),
}
}
}
Expand All @@ -300,6 +299,7 @@ impl fmt::Display for HpkeError {

match &self {
Hpke(e) => e.fmt(f),
Secp256k1(e) => e.fmt(f),
InvalidKeyLength => write!(f, "Invalid Length"),
PayloadTooLarge { actual, max } => {
write!(
Expand All @@ -319,6 +319,7 @@ impl error::Error for HpkeError {

match &self {
Hpke(e) => Some(e),
Secp256k1(e) => Some(e),
PayloadTooLarge { .. } => None,
InvalidKeyLength | PayloadTooShort => None,
InvalidPublicKey => None,
Expand Down Expand Up @@ -492,6 +493,18 @@ mod test {
);
}

#[test]
fn secp256k1_error_conversion_does_not_panic() {
let invalid_pk: HpkeError = secp256k1::Error::InvalidPublicKey.into();
assert_eq!(invalid_pk, HpkeError::InvalidPublicKey);

let invalid_sk: HpkeError = secp256k1::Error::InvalidSecretKey.into();
assert_eq!(invalid_sk, HpkeError::Secp256k1(secp256k1::Error::InvalidSecretKey));

let invalid_sig: HpkeError = secp256k1::Error::InvalidSignature.into();
assert_eq!(invalid_sig, HpkeError::Secp256k1(secp256k1::Error::InvalidSignature));
}

/// Test that the encrypted payloads are uniform.
///
/// This randomized test will generate a false negative with negligible probability
Expand Down
Loading