From c6a57a2115aa4b173a58f2656b93db364da3fd68 Mon Sep 17 00:00:00 2001 From: Tony Arcieri Date: Sun, 14 Nov 2021 12:38:17 -0700 Subject: [PATCH] pkcs8: don't re-export `der::pem` It can be easily accessed as `pkcs8::der::pem` --- pkcs8/src/document/encrypted_private_key.rs | 2 +- pkcs8/src/document/private_key.rs | 2 +- pkcs8/src/lib.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkcs8/src/document/encrypted_private_key.rs b/pkcs8/src/document/encrypted_private_key.rs index 9761ecb69..5d239216f 100644 --- a/pkcs8/src/document/encrypted_private_key.rs +++ b/pkcs8/src/document/encrypted_private_key.rs @@ -10,7 +10,7 @@ use zeroize::{Zeroize, Zeroizing}; use crate::PrivateKeyDocument; #[cfg(feature = "pem")] -use {crate::pem, core::str::FromStr}; +use {core::str::FromStr, der::pem}; /// Encrypted PKCS#8 private key document. /// diff --git a/pkcs8/src/document/private_key.rs b/pkcs8/src/document/private_key.rs index 7f6bce5d4..b49ae55f1 100644 --- a/pkcs8/src/document/private_key.rs +++ b/pkcs8/src/document/private_key.rs @@ -15,9 +15,9 @@ use { #[cfg(feature = "pem")] use { - crate::{pem, LineEnding}, alloc::string::String, core::str::FromStr, + der::pem::{self, LineEnding}, }; #[cfg(feature = "std")] diff --git a/pkcs8/src/lib.rs b/pkcs8/src/lib.rs index 21151604c..dffe37103 100644 --- a/pkcs8/src/lib.rs +++ b/pkcs8/src/lib.rs @@ -107,7 +107,7 @@ pub use { #[cfg(feature = "pem")] #[cfg_attr(docsrs, doc(cfg(feature = "pem")))] -pub use der::pem::{self, LineEnding}; +pub use der::pem::LineEnding; #[cfg(feature = "pkcs5")] pub use {crate::encrypted_private_key_info::EncryptedPrivateKeyInfo, pkcs5};