der: Document and SecretDocument types

.github/workflows/pkcs8.yml

@@ -42,7 +42,7 @@ jobs:
           target: ${{ matrix.target }}
           override: true
       - uses: RustCrypto/actions/cargo-hack-install@master
-      - run: cargo hack build --target ${{ matrix.target }} --feature-powerset --exclude-features std,rand
+      - run: cargo hack build --target ${{ matrix.target }} --feature-powerset --exclude-features getrandom,std,rand
 
   minimal-versions:
     uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master

der/Cargo.toml

@@ -21,6 +21,7 @@ der_derive = { version = "=0.6.0-pre.3", optional = true, path = "derive" }
 flagset = { version = "0.4.3", optional = true }
 pem-rfc7468 = { version = "0.5", optional = true, path = "../pem-rfc7468" }
 time = { version = "0.3.4", optional = true, default-features = false }
+zeroize = { version = "1.5", optional = true, default-features = false, features = ["alloc"] }
 
 [dev-dependencies]
 hex-literal = "0.3.3"
@@ -30,7 +31,7 @@ proptest = "1"
 alloc = []
 derive = ["der_derive"]
 oid = ["const-oid"]
-pem = ["alloc", "pem-rfc7468/alloc"]
+pem = ["alloc", "pem-rfc7468/alloc", "zeroize"]
 std = ["alloc"]
 
 [package.metadata.docs.rs]

der/src/decode.rs

@@ -2,6 +2,12 @@
 
 use crate::{Decoder, FixedTag, Header, Result};
 
+#[cfg(feature = "pem")]
+use {
+    crate::pem::{self, PemLabel},
+    zeroize::Zeroize,
+};
+
 #[cfg(doc)]
 use crate::{Length, Tag};
 
@@ -50,6 +56,31 @@ pub trait DecodeOwned: for<'a> Decode<'a> {}
 
 impl<T> DecodeOwned for T where T: for<'a> Decode<'a> {}
 
+/// PEM decoding trait.
+///
+/// This trait is automatically impl'd for any type which impls both
+/// [`DecodeOwned`] and [`PemLabel`].
+#[cfg(feature = "pem")]
+#[cfg_attr(docsrs, doc(cfg(feature = "pem")))]
+pub trait DecodePem: DecodeOwned + PemLabel {
+    /// Try to decode this type from PEM.
+    fn from_pem(pem: &str) -> Result<Self>;
+}
+
+#[cfg(feature = "pem")]
+#[cfg_attr(docsrs, doc(cfg(feature = "pem")))]
+impl<T: DecodeOwned + PemLabel> DecodePem for T {
+    fn from_pem(pem: &str) -> Result<Self> {
+        // TODO(tarcieri): support for decoding directly from PEM (instead of two-pass)
+        let (label, mut der_bytes) = pem::decode_vec(pem.as_bytes())?;
+        Self::validate_pem_label(label)?;
+
+        let result = T::from_der(&der_bytes);
+        der_bytes.zeroize();
+        result
+    }
+}
+
 /// Decode the value part of a Tag-Length-Value encoded field, sans the [`Tag`]
 /// and [`Length`].
 pub trait DecodeValue<'a>: Sized {