pem-rfc7468 v0.2.1 (#23)

Author: tarcieri

Cargo.lock

@@ -4,6 +4,20 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 0.2.1 (2021-09-14)
+### Added
+- `decode_label` ([#22])
+- `Error::HeaderDisallowed` ([#13], [#19], [#21])
+
+### Changed
+- Moved to `formats` repo ([#2])
+
+[#2]: https://github.com/RustCrypto/formats/pull/2
+[#13]: https://github.com/RustCrypto/formats/pull/13
+[#19]: https://github.com/RustCrypto/formats/pull/19
+[#21]: https://github.com/RustCrypto/formats/pull/21
+[#22]: https://github.com/RustCrypto/formats/pull/22
+
 ## 0.2.0 (2021-07-26)
 ### Added
 - Support for customizing PEM line endings

pem-rfc7468/CHANGELOG.md

@@ -1,6 +1,6 @@
 [package]
 name = "pem-rfc7468"
-version = "0.2.0" # Also update html_root_url in lib.rs when bumping this
+version = "0.2.1" # Also update html_root_url in lib.rs when bumping this
 description = """
 PEM Encoding (RFC 7468) for PKIX, PKCS, and CMS Structures, implementing a
 strict subset of the original Privacy-Enhanced Mail encoding intended

pem-rfc7468/Cargo.toml

@@ -20,37 +20,6 @@ use crate::{
 use base64ct::{Base64, Encoding};
 use core::{convert::TryFrom, str};
 
-fn decode_encapsulated_text<'i, 'o>(
-    encapsulation: &Encapsulation<'i>,
-    buf: &'o mut [u8],
-    out_len: &mut usize,
-) -> Result<()> {
-    for line in encapsulation.encapsulated_text() {
-        let line = line?;
-
-        match Base64::decode(line, &mut buf[*out_len..]) {
-            Err(error) => {
-                // in the case that we are decoding the first line
-                // and we error, then attribute the error to an unsupported header
-                // if a colon char is present in the line
-                if *out_len == 0 && line.iter().any(|&b| b == grammar::CHAR_COLON) {
-                    return Err(Error::HeaderDisallowed);
-                } else {
-                    return Err(error.into());
-                }
-            }
-            Ok(out) => *out_len += out.len(),
-        }
-    }
-    Ok(())
-}
-/// Decode the encapsulation boundaries of a PEM document according to RFC 7468's "Strict" grammar.
-///
-/// On success, returning the decoded label.
-pub fn decode_label(pem: &[u8]) -> Result<&str> {
-    Ok(Encapsulation::try_from(pem)?.label())
-}
-
 /// Decode a PEM document according to RFC 7468's "Strict" grammar.
 ///
 /// On success, writes the decoded document into the provided buffer, returning
@@ -60,9 +29,7 @@ pub fn decode<'i, 'o>(pem: &'i [u8], buf: &'o mut [u8]) -> Result<(&'i str, &'o
     let encapsulation = Encapsulation::try_from(pem)?;
     let label = encapsulation.label();
     let mut out_len = 0;
-
     decode_encapsulated_text(&encapsulation, buf, &mut out_len)?;
-
     Ok((label, &buf[..out_len]))
 }
 
@@ -86,6 +53,38 @@ pub fn decode_vec(pem: &[u8]) -> Result<(&str, Vec<u8>)> {
     Ok((label, result))
 }
 
+/// Decode the encapsulation boundaries of a PEM document according to RFC 7468's "Strict" grammar.
+///
+/// On success, returning the decoded label.
+pub fn decode_label(pem: &[u8]) -> Result<&str> {
+    Ok(Encapsulation::try_from(pem)?.label())
+}
+
+fn decode_encapsulated_text<'i, 'o>(
+    encapsulation: &Encapsulation<'i>,
+    buf: &'o mut [u8],
+    out_len: &mut usize,
+) -> Result<()> {
+    for line in encapsulation.encapsulated_text() {
+        let line = line?;
+
+        match Base64::decode(line, &mut buf[*out_len..]) {
+            Err(error) => {
+                // in the case that we are decoding the first line
+                // and we error, then attribute the error to an unsupported header
+                // if a colon char is present in the line
+                if *out_len == 0 && line.iter().any(|&b| b == grammar::CHAR_COLON) {
+                    return Err(Error::HeaderDisallowed);
+                } else {
+                    return Err(error.into());
+                }
+            }
+            Ok(out) => *out_len += out.len(),
+        }
+    }
+    Ok(())
+}
+
 /// PEM encapsulation parser.
 ///
 /// This parser performs an initial pass over the data, locating the

pem-rfc7468/src/decoder.rs

@@ -95,7 +95,7 @@
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/RustCrypto/meta/master/logo.svg",
     html_favicon_url = "https://raw.githubusercontent.com/RustCrypto/meta/master/logo.svg",
-    html_root_url = "https://docs.rs/pem-rfc7468/0.1.1"
+    html_root_url = "https://docs.rs/pem-rfc7468/0.2.1"
 )]
 #![forbid(unsafe_code, clippy::unwrap_used)]
 #![warn(missing_docs, rust_2018_idioms, unused_qualifications)]