diff --git a/ed25519/src/pkcs8.rs b/ed25519/src/pkcs8.rs index 686f1cd2..92039aec 100644 --- a/ed25519/src/pkcs8.rs +++ b/ed25519/src/pkcs8.rs @@ -14,7 +14,9 @@ //! Please lock to a specific minor version of the `ed25519` crate to avoid //! breaking changes when using this module. -pub use pkcs8::{spki, DecodePrivateKey, DecodePublicKey, Error, PrivateKeyInfo, Result}; +pub use pkcs8::{ + spki, DecodePrivateKey, DecodePublicKey, Error, ObjectIdentifier, PrivateKeyInfo, Result, +}; #[cfg(feature = "alloc")] pub use pkcs8::{spki::EncodePublicKey, EncodePrivateKey}; @@ -23,7 +25,6 @@ pub use pkcs8::{spki::EncodePublicKey, EncodePrivateKey}; pub use pkcs8::der::{asn1::BitStringRef, Document, SecretDocument}; use core::fmt; -use pkcs8::ObjectIdentifier; #[cfg(feature = "pem")] use { diff --git a/ed25519/tests/pkcs8.rs b/ed25519/tests/pkcs8.rs index c44388be..72913118 100644 --- a/ed25519/tests/pkcs8.rs +++ b/ed25519/tests/pkcs8.rs @@ -22,7 +22,7 @@ fn decode_pkcs8_v1() { let keypair = KeypairBytes::from_pkcs8_der(PKCS8_V1_DER).unwrap(); // Extracted with: - // $ openssl asn1parse -inform der -in tests/examples/p256-priv.der + // $ openssl asn1parse -inform der -in tests/examples/pkcs8-v1.der assert_eq!( keypair.secret_key, &hex!("D4EE72DBF913584AD5B6D8F1F769F8AD3AFE7C28CBF1D4FBE097A88F44755842")[..] @@ -36,7 +36,7 @@ fn decode_pkcs8_v2() { let keypair = KeypairBytes::from_pkcs8_der(PKCS8_V2_DER).unwrap(); // Extracted with: - // $ openssl asn1parse -inform der -in tests/examples/p256-priv.der + // $ openssl asn1parse -inform der -in tests/examples/pkcs8-v2.der assert_eq!( keypair.secret_key, &hex!("D4EE72DBF913584AD5B6D8F1F769F8AD3AFE7C28CBF1D4FBE097A88F44755842")[..] @@ -53,7 +53,7 @@ fn decode_public_key() { let public_key = PublicKeyBytes::from_public_key_der(PUBLIC_KEY_DER).unwrap(); // Extracted with: - // $ openssl pkey -inform der -in pkcs8-v1.der -pubout -text + // $ openssl pkey -inform der -in tests/examples/pkcs8-v1.der -pubout -text assert_eq!( public_key.as_ref(), &hex!("19BF44096984CDFE8541BAC167DC3B96C85086AA30B6B6CB0C5C38AD703166E1")