Allow importing of known keys (needed when re-importing keys after si…

…gning them) Partial fix for issue #315
jstedfast · Jul 19, 2017 · a126065 · a126065
1 parent eac4b21
commit a126065
Showing 1 changed file with 4 additions and 14 deletions.
diff --git a/MimeKit/Cryptography/OpenPgpContext.cs b/MimeKit/Cryptography/OpenPgpContext.cs
@@ -1940,9 +1940,6 @@ public void Import (PgpPublicKeyRing keyring)
 			if (keyring == null)
 				throw new ArgumentNullException (nameof (keyring));
 
-			if (PublicKeyRingBundle.Contains (keyring.GetPublicKey ().KeyId))
-				return;
-
 			PublicKeyRingBundle = PgpPublicKeyRingBundle.AddPublicKeyRing (PublicKeyRingBundle, keyring);
 			SavePublicKeyRingBundle ();
 		}
@@ -1965,10 +1962,8 @@ public void Import (PgpPublicKeyRingBundle bundle)
 			int publicKeysAdded = 0;
 
 			foreach (PgpPublicKeyRing pubring in bundle.GetKeyRings ()) {
-				if (!PublicKeyRingBundle.Contains (pubring.GetPublicKey ().KeyId)) {
-					PublicKeyRingBundle = PgpPublicKeyRingBundle.AddPublicKeyRing (PublicKeyRingBundle, pubring);
-					publicKeysAdded++;
-				}
+				PublicKeyRingBundle = PgpPublicKeyRingBundle.AddPublicKeyRing (PublicKeyRingBundle, pubring);
+				publicKeysAdded++;
 			}
 
 			if (publicKeysAdded > 0)
@@ -2014,9 +2009,6 @@ public void Import (PgpSecretKeyRing keyring)
 			if (keyring == null)
 				throw new ArgumentNullException (nameof (keyring));
 
-			if (SecretKeyRingBundle.Contains (keyring.GetSecretKey ().KeyId))
-				return;
-
 			SecretKeyRingBundle = PgpSecretKeyRingBundle.AddSecretKeyRing (SecretKeyRingBundle, keyring);
 			SaveSecretKeyRingBundle ();
 		}
@@ -2039,10 +2031,8 @@ public void Import (PgpSecretKeyRingBundle bundle)
 			int secretKeysAdded = 0;
 
 			foreach (PgpSecretKeyRing secring in bundle.GetKeyRings ()) {
-				if (!SecretKeyRingBundle.Contains (secring.GetSecretKey ().KeyId)) {
-					SecretKeyRingBundle = PgpSecretKeyRingBundle.AddSecretKeyRing (SecretKeyRingBundle, secring);
-					secretKeysAdded++;
-				}
+				SecretKeyRingBundle = PgpSecretKeyRingBundle.AddSecretKeyRing (SecretKeyRingBundle, secring);
+				secretKeysAdded++;
 			}
 
 			if (secretKeysAdded > 0)