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

elliptic-curve: include curve OID in SEC1 private keys #1707

Merged
merged 1 commit into from
Oct 22, 2024
Merged

elliptic-curve: include curve OID in SEC1 private keys #1707

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
24 changes: 15 additions & 9 deletions elliptic-curve/src/secret_key.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ use {
sec1::{EncodedPoint, ModulusSize, ValidatePublicKey},
FieldBytesSize,
},
sec1::der,
sec1::der::{self, oid::AssociatedOid},
};

#[cfg(all(feature = "alloc", feature = "arithmetic", feature = "sec1"))]
Expand Down Expand Up @@ -184,7 +184,7 @@ where
#[cfg(feature = "sec1")]
pub fn from_sec1_der(der_bytes: &[u8]) -> Result<Self>
where
C: Curve + ValidatePublicKey,
C: AssociatedOid + Curve + ValidatePublicKey,
FieldBytesSize<C>: ModulusSize,
{
sec1::EcPrivateKey::try_from(der_bytes)?
Expand All @@ -196,17 +196,18 @@ where
#[cfg(all(feature = "alloc", feature = "arithmetic", feature = "sec1"))]
pub fn to_sec1_der(&self) -> der::Result<Zeroizing<Vec<u8>>>
where
C: CurveArithmetic,
C: AssociatedOid + CurveArithmetic,
AffinePoint<C>: FromEncodedPoint<C> + ToEncodedPoint<C>,
FieldBytesSize<C>: ModulusSize,
{
let private_key_bytes = Zeroizing::new(self.to_bytes());
let public_key_bytes = self.public_key().to_encoded_point(false);
let parameters = sec1::EcParameters::NamedCurve(C::OID);

let ec_private_key = Zeroizing::new(
sec1::EcPrivateKey {
private_key: &private_key_bytes,
parameters: None,
parameters: Some(parameters),
public_key: Some(public_key_bytes.as_bytes()),
}
.to_der()?,
Expand All @@ -225,7 +226,7 @@ where
#[cfg(feature = "pem")]
pub fn from_sec1_pem(s: &str) -> Result<Self>
where
C: Curve + ValidatePublicKey,
C: AssociatedOid + Curve + ValidatePublicKey,
FieldBytesSize<C>: ModulusSize,
{
let (label, der_bytes) = pem::decode_vec(s.as_bytes()).map_err(|_| Error)?;
Expand All @@ -244,7 +245,7 @@ where
#[cfg(feature = "pem")]
pub fn to_sec1_pem(&self, line_ending: pem::LineEnding) -> Result<Zeroizing<String>>
where
C: CurveArithmetic,
C: AssociatedOid + CurveArithmetic,
AffinePoint<C>: FromEncodedPoint<C> + ToEncodedPoint<C>,
FieldBytesSize<C>: ModulusSize,
{
Expand Down Expand Up @@ -344,16 +345,21 @@ where
#[cfg(feature = "sec1")]
impl<C> TryFrom<sec1::EcPrivateKey<'_>> for SecretKey<C>
where
C: Curve + ValidatePublicKey,
C: AssociatedOid + Curve + ValidatePublicKey,
FieldBytesSize<C>: ModulusSize,
{
type Error = der::Error;

fn try_from(sec1_private_key: sec1::EcPrivateKey<'_>) -> der::Result<Self> {
if let Some(sec1::EcParameters::NamedCurve(curve_oid)) = sec1_private_key.parameters {
if C::OID != curve_oid {
return Err(der::Tag::ObjectIdentifier.value_error());
}
}

let secret_key = Self::from_slice(sec1_private_key.private_key)
.map_err(|_| der::Tag::Sequence.value_error())?;
.map_err(|_| der::Tag::OctetString.value_error())?;

// TODO(tarcieri): validate `sec1_private_key.params`?
if let Some(pk_bytes) = sec1_private_key.public_key {
let pk = EncodedPoint::<C>::from_bytes(pk_bytes)
.map_err(|_| der::Tag::BitString.value_error())?;
Expand Down
20 changes: 16 additions & 4 deletions elliptic-curve/src/secret_key/pkcs8.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@ use {
AffinePoint, CurveArithmetic,
},
pkcs8::{
der::{self, asn1::OctetStringRef},
der::{self, asn1::OctetStringRef, Encode},
EncodePrivateKey,
},
zeroize::Zeroizing,
};

// Imports for actual PEM support
Expand Down Expand Up @@ -54,8 +55,7 @@ where
.algorithm
.assert_oids(ALGORITHM_OID, C::OID)?;

let ec_private_key = EcPrivateKey::from_der(private_key_info.private_key.as_bytes())?;
Ok(Self::try_from(ec_private_key)?)
Ok(EcPrivateKey::from_der(private_key_info.private_key.as_bytes())?.try_into()?)
}
}

Expand All @@ -72,7 +72,19 @@ where
parameters: Some((&C::OID).into()),
};

let ec_private_key = self.to_sec1_der()?;
let private_key_bytes = Zeroizing::new(self.to_bytes());
let public_key_bytes = self.public_key().to_encoded_point(false);

// TODO(tarcieri): unify with `to_sec1_der()` by building an owned `EcPrivateKey`
let ec_private_key = Zeroizing::new(
EcPrivateKey {
private_key: &private_key_bytes,
parameters: None,
public_key: Some(public_key_bytes.as_bytes()),
}
.to_der()?,
);

let pkcs8_key = pkcs8::PrivateKeyInfoRef::new(
algorithm_identifier,
OctetStringRef::new(&ec_private_key)?,
Expand Down