Commit d1e91be3 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge branch 'cert-api-improv-bis' into 'main' 

use Ed25519 identity instead of PublicKey in tor-cert::rsa

Closes #512

See merge request tpo/core/arti!643
parents 04f0ce8e 61eb0c4f

crates/tor-cert/src/rsa.rs

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ use digest::Digest; 
#[must_use]

pub struct RsaCrosscert {

    /// The key that is being certified

    subject_key: ll::pk::ed25519::PublicKey,

    subject_key: ll::pk::ed25519::Ed25519Identity,

    /// The expiration time of this certificate, in hours since the

    /// unix epoch.

    exp_hours: u32,
@@ -38,7 +38,7 @@ impl RsaCrosscert { 


    /// Return true if the subject key in this certificate matches `other`

    pub fn subject_key_matches(&self, other: &ll::pk::ed25519::Ed25519Identity) -> bool {

        other == &self.subject_key.into()

        other == &self.subject_key

    }



    /// Decode a slice of bytes into an RSA crosscert.