openpgp: Add Cert::merge_public and Cert::merge_public_and_secret.

  - Secret key material is not authenticated by OpenPGP, so care must
    be taken when merging certificates.

  - Rename Cert::merge to Cert::merge_public_and_secret.

  - Add new function Cert::merge_public.  This function can be used to
    merge certificates from untrusted sources as it ignores secret key
    material that cannot be authenticated by OpenPGP.

  - Fixes #584.

1 files changed, 1 insertions, 1 deletions

diff --git a/sqv/src/sqv.rs b/sqv/src/sqv.rs
index 45106812..f84cef9e 100644
--- a/sqv/src/sqv.rs
+++ b/sqv/src/sqv.rs
@@ -102,7 +102,7 @@ impl<'a> VerificationHelper for VHelper<'a> {
                     certs.push(a);
                 } else if certs[certs.len() - 1].fingerprint() == a.fingerprint() {
                     // Merge `a` into the last element.
-                    match certs.pop().expect("non-empty vec").merge(a) {
+                    match certs.pop().expect("non-empty vec").merge_public(a) {
                         Ok(cert) => certs.push(cert),
                         Err(err) => errs.push(err),
                     }