Skip to content

Commit 5e9b14d

Browse files
committed
WIP: sec1: adopt pkcs8 API changes
Signed-off-by: Arthur Gautier <[email protected]>
1 parent 5c7ed62 commit 5e9b14d

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

sec1/src/traits.rs

+5-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use {crate::LineEnding, alloc::string::String, der::pem::PemLabel};
1111
#[cfg(feature = "pkcs8")]
1212
use {
1313
crate::{EcPrivateKey, ALGORITHM_OID},
14-
der::Decode,
14+
der::{asn1::OctetStringRef, Decode},
1515
};
1616

1717
#[cfg(feature = "std")]
@@ -100,6 +100,8 @@ where
100100
parameters: params_oid.as_ref().map(Into::into),
101101
};
102102

103+
let private_key = OctetStringRef::new(private_key)?;
104+
103105
Ok(Self::try_from(pkcs8::PrivateKeyInfo {
104106
algorithm,
105107
private_key,
@@ -115,7 +117,8 @@ impl<T: pkcs8::EncodePrivateKey> EncodeEcPrivateKey for T {
115117
let pkcs8_key = pkcs8::PrivateKeyInfo::from_der(doc.as_bytes())?;
116118
pkcs8_key.algorithm.assert_algorithm_oid(ALGORITHM_OID)?;
117119

118-
let mut pkcs1_key = EcPrivateKey::from_der(pkcs8_key.private_key)?;
120+
// TODO: untested
121+
let mut pkcs1_key = EcPrivateKey::from_der(pkcs8_key.private_key.as_bytes())?;
119122
pkcs1_key.parameters = Some(pkcs8_key.algorithm.parameters_oid()?.into());
120123
pkcs1_key.try_into()
121124
}

0 commit comments

Comments
 (0)