diff options
author | Justus Winter <justus@sequoia-pgp.org> | 2021-02-19 14:03:02 +0100 |
---|---|---|
committer | Justus Winter <justus@sequoia-pgp.org> | 2021-02-19 14:03:02 +0100 |
commit | 48bfaf48284a856976035cc392a28510c19feac0 (patch) | |
tree | 6229b7fb0e6b233bcb8d7bb4b5f1b17f64e76a1d | |
parent | 2567736e3c06aea0aba200c9e6516c4dc360f0d3 (diff) |
openpgp: Simplify code.
-rw-r--r-- | openpgp/src/cert/revoke.rs | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/openpgp/src/cert/revoke.rs b/openpgp/src/cert/revoke.rs index c0f321db..7cc5ca60 100644 --- a/openpgp/src/cert/revoke.rs +++ b/openpgp/src/cert/revoke.rs @@ -454,11 +454,9 @@ impl SubkeyRevocationBuilder { where H: Into<Option<HashAlgorithm>>, P: key::KeyParts, { - let hash_algo = hash_algo.into().unwrap_or(HashAlgorithm::SHA512); + self.builder = self.builder + .set_hash_algo(hash_algo.into().unwrap_or(HashAlgorithm::SHA512)); - if let Some(algo) = hash_algo.into() { - self.builder = self.builder.set_hash_algo(algo); - } key.bind(signer, cert, self.builder) } } @@ -692,11 +690,9 @@ impl UserIDRevocationBuilder { -> Result<Signature> where H: Into<Option<HashAlgorithm>> { - let hash_algo = hash_algo.into().unwrap_or(HashAlgorithm::SHA512); + self.builder = self.builder + .set_hash_algo(hash_algo.into().unwrap_or(HashAlgorithm::SHA512)); - if let Some(algo) = hash_algo.into() { - self.builder = self.builder.set_hash_algo(algo); - } userid.bind(signer, cert, self.builder) } } @@ -944,11 +940,9 @@ impl UserAttributeRevocationBuilder { -> Result<Signature> where H: Into<Option<HashAlgorithm>> { - let hash_algo = hash_algo.into().unwrap_or(HashAlgorithm::SHA512); + self.builder = self.builder + .set_hash_algo(hash_algo.into().unwrap_or(HashAlgorithm::SHA512)); - if let Some(algo) = hash_algo.into() { - self.builder = self.builder.set_hash_algo(algo); - } ua.bind(signer, cert, self.builder) } } |