vincenzopalazzo
/
arti
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cargo fix --edition-idioms

This commit is contained in:
Nick Mathewson 2020-09-09 18:59:04 -04:00
parent 34843f1fde
commit e95dec2437
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tor-llcrypto/src/util.rs
View File

@ -16,17 +16,17 @@ pub fn x509_extract_rsa_subject_kludge(der: &[u8]) -> Option<crate::pk::rsa::Pub
let blocks = simple_asn1::from_der(der).ok()?;
let block = Asn1(blocks.get(0)?);
// TBSCertificate
let tbs_cert: Asn1 = block.into_seq()?.get(0)?.into();
let tbs_cert: Asn1<'_> = block.into_seq()?.get(0)?.into();
// SubjectPublicKeyInfo
let spki: Asn1 = tbs_cert.into_seq()?.get(6)?.into();
let spki: Asn1<'_> = tbs_cert.into_seq()?.get(6)?.into();
let spki_members = spki.into_seq()?;
// Is it an RSA key?
let algid: Asn1 = spki_members.get(0)?.into();
let oid: Asn1 = algid.into_seq()?.get(0)?.into();
let algid: Asn1<'_> = spki_members.get(0)?.into();
let oid: Asn1<'_> = algid.into_seq()?.get(0)?.into();
oid.must_be_rsa_oid()?;
// try to get the RSA key.
let key: Asn1 = spki_members.get(1)?.into();
let key: Asn1<'_> = spki_members.get(1)?.into();
crate::pk::rsa::PublicKey::from_der(key.to_bitstr()?)
}

2
tor-proto/src/chancell.rs
View File

@ -36,7 +36,7 @@ impl Into<u32> for CircID {
}
}
impl std::fmt::Display for CircID {
fn fmt(&self, f: &mut std::fmt::Formatter) -> Result<(), std::fmt::Error> {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> Result<(), std::fmt::Error> {
self.0.fmt(f)
}
}