address fmt issues

This commit is contained in:
Carl Wallace
2019-12-01 15:12:05 -05:00
parent 2087e53109
commit b9d6057d4e
+14 -5
View File
@@ -45,10 +45,10 @@ use ecdsa::{
}; };
use log::error; use log::error;
use rsa::{PublicKey, RSAPublicKey}; use rsa::{PublicKey, RSAPublicKey};
use sha2::{Digest, Sha256};
use std::fmt; 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;
use sha2::{Sha256, Digest};
// TODO: Make these der_parser::oid::Oid constants when it has const fn support. // 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_RSA_ENCRYPTION: &str = "1.2.840.113549.1.1.1";
@@ -422,12 +422,21 @@ pub fn print_cert_info(yubikey: &mut YubiKey, slot: SlotId) -> Result<(), Error>
println!("Slot {:x}: ", slot_id); println!("Slot {:x}: ", slot_id);
match parse_x509_der(&buf) { match parse_x509_der(&buf) {
Ok((_rem, cert)) => { Ok((_rem, cert)) => {
println!("\tAlgorithm: {}", cert.tbs_certificate.subject_pki.algorithm.algorithm); println!(
"\tAlgorithm: {}",
cert.tbs_certificate.subject_pki.algorithm.algorithm
);
println!("\tSubject: {}", cert.tbs_certificate.subject); println!("\tSubject: {}", cert.tbs_certificate.subject);
println!("\tIssuer: {}", cert.tbs_certificate.issuer); println!("\tIssuer: {}", cert.tbs_certificate.issuer);
println!("\tFingerprint: {:X}", fingerprint); println!("\tFingerprint: {:X}", fingerprint);
println!("\tNot Before: {}", cert.tbs_certificate.validity.not_before.asctime()); println!(
println!("\tNot After: {}", cert.tbs_certificate.validity.not_after.asctime()); "\tNot Before: {}",
cert.tbs_certificate.validity.not_before.asctime()
);
println!(
"\tNot After: {}",
cert.tbs_certificate.validity.not_after.asctime()
);
} }
_ => { _ => {
println!("Failed to parse certificate"); println!("Failed to parse certificate");
@@ -437,4 +446,4 @@ pub fn print_cert_info(yubikey: &mut YubiKey, slot: SlotId) -> Result<(), Error>
} }
Ok(()) Ok(())
} }