diff options
author | Heiko <heiko@schaefer.name> | 2021-04-29 18:45:30 +0200 |
---|---|---|
committer | Heiko <heiko@schaefer.name> | 2021-04-29 18:45:30 +0200 |
commit | 5c8e3a9ba9ab5afb6cb4dae3a83ca38c0f28e32c (patch) | |
tree | 9cae146c2d20557e134995f57c54a3a88d526d2c | |
parent | e0b6191821d7508b029bd0f4219e0ffe89b9e317 (diff) | |
download | openpgp-ca-5c8e3a9ba9ab5afb6cb4dae3a83ca38c0f28e32c.tar.gz |
fn rename: cert_check_certifications() -> check_mutual_certifications().
-rw-r--r-- | src/ca.rs | 8 | ||||
-rw-r--r-- | src/cert.rs | 2 | ||||
-rw-r--r-- | tests/test_oca.rs | 5 |
3 files changed, 8 insertions, 7 deletions
@@ -200,11 +200,11 @@ impl OpenpgpCa { /// - the CA key has a trust-signature from the Cert /// /// Returns a map 'cert -> (sig_from_ca, tsig_on_ca)' - pub fn cert_check_certifications( + pub fn check_mutual_certifications( &self, cert: &models::Cert, ) -> Result<(Vec<UserID>, bool)> { - cert::cert_check_certifications(self, cert) + cert::check_mutual_certifications(self, cert) } /// Check if this Cert has been certified by the CA Key, returns all @@ -369,7 +369,7 @@ impl OpenpgpCa { for user in &users { for cert in self.get_certs_by_user(&user)? { let (sig_from_ca, tsig_on_ca) = - self.cert_check_certifications(&cert)?; + self.check_mutual_certifications(&cert)?; let ok = if !sig_from_ca.is_empty() { true @@ -447,7 +447,7 @@ impl OpenpgpCa { for cert in self.get_certs_by_user(&user)? { let (sig_by_ca, tsig_on_ca) = - self.cert_check_certifications(&cert)?; + self.check_mutual_certifications(&cert)?; println!("OpenPGP key {}", cert.fingerprint); println!(" for user '{}'", name); diff --git a/src/cert.rs b/src/cert.rs index 19f2fab..5c037cc 100644 --- a/src/cert.rs +++ b/src/cert.rs @@ -257,7 +257,7 @@ pub fn certs_expired( Ok(res) } -pub fn cert_check_certifications( +pub fn check_mutual_certifications( oca: &OpenpgpCa, cert: &models::Cert, ) -> Result<(Vec<UserID>, bool)> { diff --git a/tests/test_oca.rs b/tests/test_oca.rs index 71a09e4..5718094 100644 --- a/tests/test_oca.rs +++ b/tests/test_oca.rs @@ -585,7 +585,7 @@ fn test_ca_signatures() -> Result<()> { assert_eq!(certs.len(), 1); let (sig_from_ca, tsig_on_ca) = - ca.cert_check_certifications(&certs[0])?; + ca.check_mutual_certifications(&certs[0])?; match name.as_str() { "Alice" => { @@ -703,7 +703,8 @@ fn test_import_signed_cert() -> Result<()> { let certs = ca.user_certs_get_all()?; assert_eq!(certs.len(), 1); - let (sig_from_ca, tsig_on_ca) = ca.cert_check_certifications(&certs[0])?; + let (sig_from_ca, tsig_on_ca) = + ca.check_mutual_certifications(&certs[0])?; let name = ca.cert_get_name(&certs[0])?; match name.as_str() { |