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.

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

ecdsa: add DER support to SignatureWithOid #786

Merged
merged 1 commit into from
Jan 17, 2024
Merged
Changes from all commits
Commits
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
61 changes: 60 additions & 1 deletion ecdsa/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -595,6 +595,27 @@ where
Self::new_with_digest::<D>(Signature::<C>::from_slice(slice)?)
}

/// Parse a signature from ASN.1 DER and associate the given digest's OID with it.
#[cfg(feature = "der")]
pub fn from_der_with_digest<D>(der_bytes: &[u8]) -> Result<Self>
where
D: AssociatedOid + Digest,
der::MaxSize<C>: ArraySize,
<FieldBytesSize<C> as Add>::Output: Add<der::MaxOverhead> + ArraySize,
{
Self::new_with_digest::<D>(Signature::<C>::from_der(der_bytes)?)
}

/// Parse a signature from ASN.1 DER and associate the given OID with it.
#[cfg(feature = "der")]
pub fn from_der_with_oid(der_bytes: &[u8], oid: ObjectIdentifier) -> Result<Self>
where
der::MaxSize<C>: ArraySize,
<FieldBytesSize<C> as Add>::Output: Add<der::MaxOverhead> + ArraySize,
{
Self::new(Signature::<C>::from_der(der_bytes)?, oid)
}

/// Get the fixed-width ECDSA signature.
pub fn signature(&self) -> &Signature<C> {
&self.signature
Expand All @@ -605,13 +626,27 @@ where
self.oid
}

/// Serialize this signature as bytes.
/// Serialize this signature as fixed-width bytes.
pub fn to_bytes(&self) -> SignatureBytes<C>
where
SignatureSize<C>: ArraySize,
{
self.signature.to_bytes()
}

/// Serialize this signature as ASN.1 DER.
///
/// Note that this includes only the `r` and `s` signature components, and not the OID.
///
/// See [`der::Signature`] documentation for more information.
#[cfg(feature = "der")]
pub fn to_der(&self) -> der::Signature<C>
where
der::MaxSize<C>: ArraySize,
<FieldBytesSize<C> as Add>::Output: Add<der::MaxOverhead> + ArraySize,
{
self.signature.clone().into()
}
}

#[cfg(feature = "digest")]
Expand Down Expand Up @@ -644,6 +679,30 @@ where
}
}

#[cfg(all(feature = "der", feature = "digest"))]
impl<C> From<SignatureWithOid<C>> for der::Signature<C>
where
C: PrimeCurve,
der::MaxSize<C>: ArraySize,
<FieldBytesSize<C> as Add>::Output: Add<der::MaxOverhead> + ArraySize,
{
fn from(sig: SignatureWithOid<C>) -> der::Signature<C> {
sig.to_der()
}
}

#[cfg(all(feature = "der", feature = "digest"))]
impl<C> From<&SignatureWithOid<C>> for der::Signature<C>
where
C: PrimeCurve,
der::MaxSize<C>: ArraySize,
<FieldBytesSize<C> as Add>::Output: Add<der::MaxOverhead> + ArraySize,
{
fn from(sig: &SignatureWithOid<C>) -> der::Signature<C> {
sig.to_der()
}
}

/// NOTE: this implementation assumes the default digest for the given elliptic
/// curve as defined by [`hazmat::DigestPrimitive`].
///
Expand Down