diff --git a/Cargo.lock b/Cargo.lock index b7d6de9..8b5e9a4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -16,7 +16,7 @@ checksum = "7dfdb4953a096c551ce9ace855a604d702e6e62d77fac690575ae347571717f5" [[package]] name = "rustls-pemfile" -version = "2.1.2" +version = "2.1.3" dependencies = [ "base64", "bencher", @@ -25,6 +25,6 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.3.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "048a63e5b3ac996d78d402940b5fa47973d2d080c6c6fffa1d0f19c4445310b7" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" diff --git a/Cargo.toml b/Cargo.toml index e017150..2131acc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rustls-pemfile" -version = "2.1.2" +version = "2.1.3" edition = "2018" license = "Apache-2.0 OR ISC OR MIT" readme = "README.md" @@ -11,7 +11,7 @@ categories = ["network-programming", "cryptography"] [dependencies] base64 = { version = "0.22", default-features = false, features = ["alloc"] } -pki-types = { package = "rustls-pki-types", version = "1.3" } +pki-types = { package = "rustls-pki-types", version = "1.7" } [dev-dependencies] bencher = "0.1.5" diff --git a/src/lib.rs b/src/lib.rs index 6471dd0..e19b839 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -69,7 +69,7 @@ use pki_types::PrivateKeyDer; #[cfg(feature = "std")] use pki_types::{ CertificateDer, CertificateRevocationListDer, CertificateSigningRequestDer, PrivatePkcs1KeyDer, - PrivatePkcs8KeyDer, PrivateSec1KeyDer, + PrivatePkcs8KeyDer, PrivateSec1KeyDer, SubjectPublicKeyInfoDer, }; #[cfg(feature = "std")] @@ -104,7 +104,10 @@ pub fn private_key(rd: &mut dyn io::BufRead) -> Result return Ok(Some(key.into())), Item::Pkcs8Key(key) => return Ok(Some(key.into())), Item::Sec1Key(key) => return Ok(Some(key.into())), - Item::X509Certificate(_) | Item::Crl(_) | Item::Csr(_) => continue, + Item::X509Certificate(_) + | Item::SubjectPublicKeyInfo(_) + | Item::Crl(_) + | Item::Csr(_) => continue, } } @@ -126,6 +129,7 @@ pub fn csr( | Item::Pkcs8Key(_) | Item::Sec1Key(_) | Item::X509Certificate(_) + | Item::SubjectPublicKeyInfo(_) | Item::Crl(_) => continue, } } @@ -192,3 +196,18 @@ pub fn ec_private_keys( _ => None, }) } + +/// Return an iterator over SPKI-encoded keys from `rd`. +/// +/// Filters out any PEM sections that are not SPKI-encoded public keys and yields errors if a +/// problem occurs while trying to extract a SPKI-encoded public key. +#[cfg(feature = "std")] +pub fn public_keys( + rd: &mut dyn io::BufRead, +) -> impl Iterator, io::Error>> + '_ { + iter::from_fn(move || read_one(rd).transpose()).filter_map(|item| match item { + Ok(Item::SubjectPublicKeyInfo(key)) => Some(Ok(key)), + Err(err) => Some(Err(err)), + _ => None, + }) +} diff --git a/src/pemfile.rs b/src/pemfile.rs index 3fb8c7e..96c3c6b 100644 --- a/src/pemfile.rs +++ b/src/pemfile.rs @@ -10,7 +10,7 @@ use std::io::{self, ErrorKind}; use pki_types::{ CertificateDer, CertificateRevocationListDer, CertificateSigningRequestDer, PrivatePkcs1KeyDer, - PrivatePkcs8KeyDer, PrivateSec1KeyDer, + PrivatePkcs8KeyDer, PrivateSec1KeyDer, SubjectPublicKeyInfoDer, }; /// The contents of a single recognised block in a PEM file. @@ -22,6 +22,11 @@ pub enum Item { /// Appears as "CERTIFICATE" in PEM files. X509Certificate(CertificateDer<'static>), + /// A DER-encoded Subject Public Key Info; as specified in RFC 7468. + /// + /// Appears as "PUBLIC KEY" in PEM files. + SubjectPublicKeyInfo(SubjectPublicKeyInfoDer<'static>), + /// A DER-encoded plaintext RSA private key; as specified in PKCS #1/RFC 3447 /// /// Appears as "RSA PRIVATE KEY" in PEM files. @@ -196,6 +201,7 @@ fn read_one_impl( let item = match section_type.as_slice() { b"CERTIFICATE" => Some(Item::X509Certificate(der.into())), + b"PUBLIC KEY" => Some(Item::SubjectPublicKeyInfo(der.into())), b"RSA PRIVATE KEY" => Some(Item::Pkcs1Key(der.into())), b"PRIVATE KEY" => Some(Item::Pkcs8Key(der.into())), b"EC PRIVATE KEY" => Some(Item::Sec1Key(der.into())), diff --git a/tests/data/spki.pem b/tests/data/spki.pem new file mode 100644 index 0000000..314a0f2 --- /dev/null +++ b/tests/data/spki.pem @@ -0,0 +1,14 @@ +-----BEGIN PUBLIC KEY----- +MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAqIh8FTj9DIgI8DAoCBh+ +6UXOfaWkvNaGZx2GwXl4WDAa/ZSE5/8ofg/6V59bmk9yry57UR4F+blscBvE4g3U +dTvWJOBRD900l21vwpDLKzZguyGOCmKwJu3vCnAQKzBRXW5sDgvO67GeU6kpaic9 +LYPYnYaoxCRTYTZu0wy72rW5G0Fe8Gg/duJmUH7vqGIZupTTVzIBMbFVPBMJqprT +MStDhaUL0JiAz0ZgTeNLRIBZWV9mY4PG3rZtbV0BZGR1ipAq9xfgqJcURCcKl/ZT +UMtzvgk8s5hYkIJX0ZL3qsfdM4BMgIFhHq/GisQKbbu9kWldBrxQylOwa6r0m3Jv +KJX2ViDSORndaCz2sppmVx5HDHnj+Bw381yawphnpumP3BJK4iof//uYKvfdc4RC +y2EXL8PYPsT5DMB0jaBt92ytR5sLhn8Sl9Hk0buN4IjrYPISrdhS45xQXUqxcp9O +9hcU+rSaQyZ45cj+VlWhKq8MDvGvaAONBFSEh01mnUwoJObsAZNVFVtuOkwAli0F +kGouMycQY1BGscpdC516Nya361Hk/ICyby2Y0BJrrVGaSM6poXH9yEjglzAdtSDb +Cvhn/zlAI5ltm4Nv2qTgYBDns5JRGVhBym6RbbZ1C/KfCgn0hOxiw3N7AN4d0K5n +LI6p7U9RnNVbWgbqsuoxBtkCAwEAAQ== +-----END PUBLIC KEY----- diff --git a/tests/data/zen2.pem b/tests/data/zen2.pem index abff47f..222bd87 100644 --- a/tests/data/zen2.pem +++ b/tests/data/zen2.pem @@ -205,4 +205,32 @@ fxfwqBTecp4MBmRbH76PLKjekhL/LTWJnvVTzBLFo9PLIUIyTiZjAkEAuODuDzIP LUuD0YV85m8BXM+OoPbyNmH9UmwPP0iFigbPz2IdYeSWU6Kxs6b5J7KdULwKgVeY k9zbpTrkZyMjXw== -----END PRIVATE KEY----- +-----BEGIN PUBLIC KEY----- +MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAqIh8FTj9DIgI8DAoCBh+ +6UXOfaWkvNaGZx2GwXl4WDAa/ZSE5/8ofg/6V59bmk9yry57UR4F+blscBvE4g3U +dTvWJOBRD900l21vwpDLKzZguyGOCmKwJu3vCnAQKzBRXW5sDgvO67GeU6kpaic9 +LYPYnYaoxCRTYTZu0wy72rW5G0Fe8Gg/duJmUH7vqGIZupTTVzIBMbFVPBMJqprT +MStDhaUL0JiAz0ZgTeNLRIBZWV9mY4PG3rZtbV0BZGR1ipAq9xfgqJcURCcKl/ZT +UMtzvgk8s5hYkIJX0ZL3qsfdM4BMgIFhHq/GisQKbbu9kWldBrxQylOwa6r0m3Jv +KJX2ViDSORndaCz2sppmVx5HDHnj+Bw381yawphnpumP3BJK4iof//uYKvfdc4RC +y2EXL8PYPsT5DMB0jaBt92ytR5sLhn8Sl9Hk0buN4IjrYPISrdhS45xQXUqxcp9O +9hcU+rSaQyZ45cj+VlWhKq8MDvGvaAONBFSEh01mnUwoJObsAZNVFVtuOkwAli0F +kGouMycQY1BGscpdC516Nya361Hk/ICyby2Y0BJrrVGaSM6poXH9yEjglzAdtSDb +Cvhn/zlAI5ltm4Nv2qTgYBDns5JRGVhBym6RbbZ1C/KfCgn0hOxiw3N7AN4d0K5n +LI6p7U9RnNVbWgbqsuoxBtkCAwEAAQ== +-----END PUBLIC KEY----- +-----BEGIN PUBLIC KEY----- +MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAqIh8FTj9DIgI8DAoCBh+ +6UXOfaWkvNaGZx2GwXl4WDAa/ZSE5/8ofg/6V59bmk9yry57UR4F+blscBvE4g3U +dTvWJOBRD900l21vwpDLKzZguyGOCmKwJu3vCnAQKzBRXW5sDgvO67GeU6kpaic9 +LYPYnYaoxCRTYTZu0wy72rW5G0Fe8Gg/duJmUH7vqGIZupTTVzIBMbFVPBMJqprT +MStDhaUL0JiAz0ZgTeNLRIBZWV9mY4PG3rZtbV0BZGR1ipAq9xfgqJcURCcKl/ZT +UMtzvgk8s5hYkIJX0ZL3qsfdM4BMgIFhHq/GisQKbbu9kWldBrxQylOwa6r0m3Jv +KJX2ViDSORndaCz2sppmVx5HDHnj+Bw381yawphnpumP3BJK4iof//uYKvfdc4RC +y2EXL8PYPsT5DMB0jaBt92ytR5sLhn8Sl9Hk0buN4IjrYPISrdhS45xQXUqxcp9O +9hcU+rSaQyZ45cj+VlWhKq8MDvGvaAONBFSEh01mnUwoJObsAZNVFVtuOkwAli0F +kGouMycQY1BGscpdC516Nya361Hk/ICyby2Y0BJrrVGaSM6poXH9yEjglzAdtSDb +Cvhn/zlAI5ltm4Nv2qTgYBDns5JRGVhBym6RbbZ1C/KfCgn0hOxiw3N7AN4d0K5n +LI6p7U9RnNVbWgbqsuoxBtkCAwEAAQ== +-----END PUBLIC KEY----- ... that's all folks! diff --git a/tests/integration.rs b/tests/integration.rs index d9620ff..f69ef33 100644 --- a/tests/integration.rs +++ b/tests/integration.rs @@ -26,6 +26,39 @@ fn private_key() { assert!(rustls_pemfile::private_key(&mut reader).unwrap().is_none()); } +#[test] +fn public_keys() { + let data = include_bytes!("data/spki.pem"); + let mut reader = BufReader::new(&data[..]); + assert_eq!( + rustls_pemfile::public_keys(&mut reader) + .collect::, _>>() + .unwrap() + .len(), + 1 + ); + + let data = include_bytes!("data/zen2.pem"); + let mut reader = BufReader::new(&data[..]); + assert_eq!( + rustls_pemfile::public_keys(&mut reader) + .collect::, _>>() + .unwrap() + .len(), + 2 + ); + + let data = include_bytes!("data/certificate.chain.pem"); + let mut reader = BufReader::new(&data[..]); + assert_eq!( + rustls_pemfile::public_keys(&mut reader) + .collect::, _>>() + .unwrap() + .len(), + 0 + ); +} + #[test] fn test_csr() { let data = include_bytes!("data/csr.pem"); @@ -115,7 +148,7 @@ fn smoketest_iterate() { count += 1; } - assert_eq!(count, 16); + assert_eq!(count, 18); } #[test]