james/yubikey.rs
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Extract OID strings as constants

Browse Source
This commit is contained in:
Jack Grigg
2019-12-01 18:42:12 +00:00
parent 3a283aca40
commit cd704c28d7
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/certificate.rs
+11 -6
View File
@@ -49,6 +49,12 @@ use std::fmt;
use x509_parser::{parse_x509_der, x509::SubjectPublicKeyInfo}; use x509_parser::{parse_x509_der, x509::SubjectPublicKeyInfo};
use zeroize::Zeroizing; use zeroize::Zeroizing;
// TODO: Make these der_parser::oid::Oid constants when it has const fn support.
const OID_RSA_ENCRYPTION: &str = "1.2.840.113549.1.1.1";
const OID_EC_PUBLIC_KEY: &str = "1.2.840.10045.2.1";
const OID_NIST_P256: &str = "1.2.840.10045.3.1.7";
const OID_NIST_P384: &str = "1.3.132.0.34";
/// An encoded point on the Nist P-256 curve. /// An encoded point on the Nist P-256 curve.
#[derive(Clone, Eq, PartialEq)] #[derive(Clone, Eq, PartialEq)]
pub enum EcP256Point { pub enum EcP256Point {
@@ -97,8 +103,7 @@ impl fmt::Debug for PublicKeyInfo {
impl PublicKeyInfo { impl PublicKeyInfo {
fn parse(subject_pki: &SubjectPublicKeyInfo<'_>) -> Result<Self, Error> { fn parse(subject_pki: &SubjectPublicKeyInfo<'_>) -> Result<Self, Error> {
match subject_pki.algorithm.algorithm.to_string().as_str() { match subject_pki.algorithm.algorithm.to_string().as_str() {
// RSA encryption OID_RSA_ENCRYPTION => {
"1.2.840.113549.1.1.1" => {
let pubkey = read_pki::rsa_pubkey(subject_pki.subject_public_key.data)?; let pubkey = read_pki::rsa_pubkey(subject_pki.subject_public_key.data)?;
Ok(PublicKeyInfo::Rsa { Ok(PublicKeyInfo::Rsa {
@@ -110,8 +115,7 @@ impl PublicKeyInfo {
pubkey, pubkey,
}) })
} }
// EC Public Key OID_EC_PUBLIC_KEY => {
"1.2.840.10045.2.1" => {
let key_bytes = &subject_pki.subject_public_key.data; let key_bytes = &subject_pki.subject_public_key.data;
match read_pki::ec_parameters(&subject_pki.algorithm.parameters)? { match read_pki::ec_parameters(&subject_pki.algorithm.parameters)? {
AlgorithmId::EccP256 => match key_bytes.len() { AlgorithmId::EccP256 => match key_bytes.len() {
@@ -332,6 +336,7 @@ mod read_pki {
use nom::{combinator, IResult}; use nom::{combinator, IResult};
use rsa::{BigUint, RSAPublicKey}; use rsa::{BigUint, RSAPublicKey};
use super::{OID_NIST_P256, OID_NIST_P384};
use crate::{error::Error, key::AlgorithmId}; use crate::{error::Error, key::AlgorithmId};
/// From [RFC 8017](https://tools.ietf.org/html/rfc8017#appendix-A.1.1): /// From [RFC 8017](https://tools.ietf.org/html/rfc8017#appendix-A.1.1):
@@ -389,8 +394,8 @@ mod read_pki {
}?; }?;
match curve_oid.to_string().as_str() { match curve_oid.to_string().as_str() {
"1.2.840.10045.3.1.7" => Ok(AlgorithmId::EccP256), OID_NIST_P256 => Ok(AlgorithmId::EccP256),
"1.3.132.0.34" => Ok(AlgorithmId::EccP384), OID_NIST_P384 => Ok(AlgorithmId::EccP384),
_ => Err(Error::AlgorithmError), _ => Err(Error::AlgorithmError),
} }
} }