From dc50161c51d5b479a54d3dc912574f9ed208892a Mon Sep 17 00:00:00 2001
From: Justus Winter <justus@sequoia-pgp.org>
Date: Fri, 27 Nov 2020 13:22:37 +0100
Subject: 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.
---
 net/src/wkd.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'net')

diff --git a/net/src/wkd.rs b/net/src/wkd.rs
index c2a47d71..50f4d25e 100644
--- a/net/src/wkd.rs
+++ b/net/src/wkd.rs
@@ -385,7 +385,7 @@ impl KeyRing {
     fn insert(&mut self, cert: Cert) -> Result<()> {
         let fp = cert.fingerprint();
         if let Some(existing) = self.0.get_mut(&fp) {
-            *existing = existing.clone().merge(cert)?;
+            *existing = existing.clone().merge_public(cert)?;
         } else {
             self.0.insert(fp, cert);
         }
-- 
cgit v1.2.3