diff options
| author | Neal H. Walfield <neal@pep.foundation> | 2020-04-28 09:11:58 +0200 |
|---|---|---|
| committer | Neal H. Walfield <neal@pep.foundation> | 2020-04-28 09:26:50 +0200 |
| commit | cd05b15f1cd0517fa9ad4129fdaed3e0a3f21169 (patch) | |
| tree | f8fe34c46768e527144407ecdc101e5ba10d8adc /openpgp/src/policy.rs | |
| parent | 22a777c7c5db1d35642bfb9d2ab44b4833937956 (diff) | |
openpgp: Rework Cert::revoke_in_place.
- Rename `Cert::revoke_in_place` to `Cert::revoke`.
- Return the revocation certificate; don't merge it.
- Fixes #485.
Diffstat (limited to 'openpgp/src/policy.rs')
| -rw-r--r-- | openpgp/src/policy.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/openpgp/src/policy.rs b/openpgp/src/policy.rs index 0de62f51..046dfbf6 100644 --- a/openpgp/src/policy.rs +++ b/openpgp/src/policy.rs @@ -1390,10 +1390,11 @@ mod test { // Create a revoked version. let mut keypair = cert.primary_key().key().clone() .parts_into_secret()?.into_keypair()?; - let cert_revoked = cert.clone().revoke_in_place( + let rev = cert.revoke( &mut keypair, ReasonForRevocation::KeyCompromised, b"It was the maid :/")?; + let cert_revoked = cert.clone().merge_packets(vec![ rev.into() ])?; match cert_revoked.revocation_status(&DEFAULT, None) { RevocationStatus::Revoked(sigs) => { |