-
Notifications
You must be signed in to change notification settings - Fork 1.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Migrate SPKI parsing from OpenSSL to Rust (#10121)
- Loading branch information
Showing
15 changed files
with
332 additions
and
84 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| // This file is dual licensed under the terms of the Apache License, Version | ||
| // 2.0, and the BSD License. See the LICENSE file in the root of this repository | ||
| // for complete details. | ||
|
|
||
| use std::env; | ||
|
|
||
| fn main() { | ||
| if env::var("DEP_OPENSSL_LIBRESSL_VERSION_NUMBER").is_ok() { | ||
| println!("cargo:rustc-cfg=CRYPTOGRAPHY_IS_LIBRESSL"); | ||
| } | ||
|
|
||
| if env::var("DEP_OPENSSL_BORINGSSL").is_ok() { | ||
| println!("cargo:rustc-cfg=CRYPTOGRAPHY_IS_BORINGSSL"); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,142 @@ | ||
| // This file is dual licensed under the terms of the Apache License, Version | ||
| // 2.0, and the BSD License. See the LICENSE file in the root of this repository | ||
| // for complete details. | ||
|
|
||
| use cryptography_x509::common::{AlgorithmParameters, EcParameters, SubjectPublicKeyInfo}; | ||
|
|
||
| use crate::{KeyParsingError, KeyParsingResult}; | ||
|
|
||
| pub fn parse_public_key( | ||
| data: &[u8], | ||
| ) -> KeyParsingResult<openssl::pkey::PKey<openssl::pkey::Public>> { | ||
| let k = asn1::parse_single::<SubjectPublicKeyInfo>(data)?; | ||
|
|
||
| match k.algorithm.params { | ||
| AlgorithmParameters::Ec(ec_params) => match ec_params { | ||
| EcParameters::NamedCurve(curve_oid) => { | ||
| let curve_nid = match curve_oid { | ||
| cryptography_x509::oid::EC_SECP192R1 => openssl::nid::Nid::X9_62_PRIME192V1, | ||
| cryptography_x509::oid::EC_SECP224R1 => openssl::nid::Nid::SECP224R1, | ||
| cryptography_x509::oid::EC_SECP256R1 => openssl::nid::Nid::X9_62_PRIME256V1, | ||
| cryptography_x509::oid::EC_SECP384R1 => openssl::nid::Nid::SECP384R1, | ||
| cryptography_x509::oid::EC_SECP521R1 => openssl::nid::Nid::SECP521R1, | ||
|
|
||
| cryptography_x509::oid::EC_SECP256K1 => openssl::nid::Nid::SECP256K1, | ||
|
|
||
| cryptography_x509::oid::EC_SECT233R1 => openssl::nid::Nid::SECT233R1, | ||
| cryptography_x509::oid::EC_SECT283R1 => openssl::nid::Nid::SECT283R1, | ||
| cryptography_x509::oid::EC_SECT409R1 => openssl::nid::Nid::SECT409R1, | ||
| cryptography_x509::oid::EC_SECT571R1 => openssl::nid::Nid::SECT571R1, | ||
|
|
||
| cryptography_x509::oid::EC_SECT163R2 => openssl::nid::Nid::SECT163R2, | ||
|
|
||
| cryptography_x509::oid::EC_SECT163K1 => openssl::nid::Nid::SECT163K1, | ||
| cryptography_x509::oid::EC_SECT233K1 => openssl::nid::Nid::SECT233K1, | ||
| cryptography_x509::oid::EC_SECT283K1 => openssl::nid::Nid::SECT283K1, | ||
| cryptography_x509::oid::EC_SECT409K1 => openssl::nid::Nid::SECT409K1, | ||
| cryptography_x509::oid::EC_SECT571K1 => openssl::nid::Nid::SECT571K1, | ||
|
|
||
| #[cfg(not(CRYPTOGRAPHY_IS_BORINGSSL))] | ||
| cryptography_x509::oid::EC_BRAINPOOLP256R1 => { | ||
| openssl::nid::Nid::BRAINPOOL_P256R1 | ||
| } | ||
| #[cfg(not(CRYPTOGRAPHY_IS_BORINGSSL))] | ||
| cryptography_x509::oid::EC_BRAINPOOLP384R1 => { | ||
| openssl::nid::Nid::BRAINPOOL_P384R1 | ||
| } | ||
| #[cfg(not(CRYPTOGRAPHY_IS_BORINGSSL))] | ||
| cryptography_x509::oid::EC_BRAINPOOLP512R1 => { | ||
| openssl::nid::Nid::BRAINPOOL_P512R1 | ||
| } | ||
|
|
||
| _ => return Err(KeyParsingError::UnsupportedEllipticCurve(curve_oid)), | ||
| }; | ||
|
|
||
| let group = openssl::ec::EcGroup::from_curve_name(curve_nid) | ||
| .map_err(|_| KeyParsingError::UnsupportedEllipticCurve(curve_oid))?; | ||
| let mut bn_ctx = openssl::bn::BigNumContext::new()?; | ||
| let ec_point = openssl::ec::EcPoint::from_bytes( | ||
| &group, | ||
| k.subject_public_key.as_bytes(), | ||
| &mut bn_ctx, | ||
| ) | ||
| .map_err(|_| KeyParsingError::InvalidKey)?; | ||
| let ec_key = openssl::ec::EcKey::from_public_key(&group, &ec_point)?; | ||
| Ok(openssl::pkey::PKey::from_ec_key(ec_key)?) | ||
| } | ||
| EcParameters::ImplicitCurve(_) | EcParameters::SpecifiedCurve(_) => { | ||
| Err(KeyParsingError::ExplicitCurveUnsupported) | ||
| } | ||
| }, | ||
| AlgorithmParameters::Ed25519 => Ok(openssl::pkey::PKey::public_key_from_raw_bytes( | ||
| k.subject_public_key.as_bytes(), | ||
| openssl::pkey::Id::ED25519, | ||
| )?), | ||
| #[cfg(all(not(CRYPTOGRAPHY_IS_LIBRESSL), not(CRYPTOGRAPHY_IS_BORINGSSL)))] | ||
| AlgorithmParameters::Ed448 => Ok(openssl::pkey::PKey::public_key_from_raw_bytes( | ||
| k.subject_public_key.as_bytes(), | ||
| openssl::pkey::Id::ED448, | ||
| )?), | ||
| AlgorithmParameters::X25519 => Ok(openssl::pkey::PKey::public_key_from_raw_bytes( | ||
| k.subject_public_key.as_bytes(), | ||
| openssl::pkey::Id::X25519, | ||
| )?), | ||
| #[cfg(all(not(CRYPTOGRAPHY_IS_LIBRESSL), not(CRYPTOGRAPHY_IS_BORINGSSL)))] | ||
| AlgorithmParameters::X448 => Ok(openssl::pkey::PKey::public_key_from_raw_bytes( | ||
| k.subject_public_key.as_bytes(), | ||
| openssl::pkey::Id::X448, | ||
| )?), | ||
| AlgorithmParameters::Rsa(_) | AlgorithmParameters::RsaPss(_) => { | ||
| // RSA-PSS keys are treated the same as bare RSA keys. | ||
| crate::rsa::parse_pkcs1_public_key(k.subject_public_key.as_bytes()) | ||
| } | ||
| AlgorithmParameters::Dsa(dsa_params) => { | ||
| let p = openssl::bn::BigNum::from_slice(dsa_params.p.as_bytes())?; | ||
| let q = openssl::bn::BigNum::from_slice(dsa_params.q.as_bytes())?; | ||
| let g = openssl::bn::BigNum::from_slice(dsa_params.g.as_bytes())?; | ||
|
|
||
| let pub_key_int = | ||
| asn1::parse_single::<asn1::BigUint<'_>>(k.subject_public_key.as_bytes())?; | ||
| let pub_key = openssl::bn::BigNum::from_slice(pub_key_int.as_bytes())?; | ||
|
|
||
| let dsa = openssl::dsa::Dsa::from_public_components(p, q, g, pub_key)?; | ||
| Ok(openssl::pkey::PKey::from_dsa(dsa)?) | ||
| } | ||
| #[cfg(not(CRYPTOGRAPHY_IS_BORINGSSL))] | ||
| AlgorithmParameters::Dh(dh_params) => { | ||
| let p = openssl::bn::BigNum::from_slice(dh_params.p.as_bytes())?; | ||
| let q = openssl::bn::BigNum::from_slice(dh_params.q.as_bytes())?; | ||
| let g = openssl::bn::BigNum::from_slice(dh_params.g.as_bytes())?; | ||
| let dh = openssl::dh::Dh::from_pqg(p, Some(q), g)?; | ||
|
|
||
| let pub_key_int = | ||
| asn1::parse_single::<asn1::BigUint<'_>>(k.subject_public_key.as_bytes())?; | ||
| let pub_key = openssl::bn::BigNum::from_slice(pub_key_int.as_bytes())?; | ||
| let dh = dh.set_public_key(pub_key)?; | ||
|
|
||
| cfg_if::cfg_if! { | ||
| if #[cfg(CRYPTOGRAPHY_IS_LIBRESSL)] { | ||
| Ok(openssl::pkey::PKey::from_dh(dh)?) | ||
| } else { | ||
| Ok(openssl::pkey::PKey::from_dhx(dh)?) | ||
| } | ||
| } | ||
| } | ||
| #[cfg(not(CRYPTOGRAPHY_IS_BORINGSSL))] | ||
| AlgorithmParameters::DhKeyAgreement(dh_params) => { | ||
| let p = openssl::bn::BigNum::from_slice(dh_params.p.as_bytes())?; | ||
| let g = openssl::bn::BigNum::from_slice(dh_params.g.as_bytes())?; | ||
| let dh = openssl::dh::Dh::from_pqg(p, None, g)?; | ||
|
|
||
| let pub_key_int = | ||
| asn1::parse_single::<asn1::BigUint<'_>>(k.subject_public_key.as_bytes())?; | ||
| let pub_key = openssl::bn::BigNum::from_slice(pub_key_int.as_bytes())?; | ||
| let dh = dh.set_public_key(pub_key)?; | ||
|
|
||
| Ok(openssl::pkey::PKey::from_dh(dh)?) | ||
| } | ||
| _ => Err(KeyParsingError::UnsupportedKeyType( | ||
| k.algorithm.oid().clone(), | ||
| )), | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.