diff options
author | Kai Michaelis <kai@sequoia-pgp.org> | 2018-11-22 15:59:07 +0100 |
---|---|---|
committer | Kai Michaelis <kai@sequoia-pgp.org> | 2018-11-22 16:00:48 +0100 |
commit | d17090a6ffce19ab0fb786a7e3bfb72c47256531 (patch) | |
tree | 7eab9ac9f03e3ea9aa008a1d95ded21303562866 /openpgp/src | |
parent | a9191cb0b6c457a7a7d2350ebf60d72a56e0caef (diff) |
openpgp: make TPK::merge more forgiving
Diffstat (limited to 'openpgp/src')
-rw-r--r-- | openpgp/src/tpk/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/openpgp/src/tpk/mod.rs b/openpgp/src/tpk/mod.rs index 843401d5..e02afd67 100644 --- a/openpgp/src/tpk/mod.rs +++ b/openpgp/src/tpk/mod.rs @@ -2203,7 +2203,7 @@ impl TPK { /// If `other` is a different key, then nothing is merged into /// `self`, but `self` is still canonicalized. pub fn merge(mut self, mut other: TPK) -> Result<Self> { - if self.primary != other.primary { + if self.primary.fingerprint() != other.primary.fingerprint() { // The primary key is not the same. There is nothing to // do. return Err(Error::InvalidArgument( |