openpgp: Sort the self-sigs before sorting the bindings.

  - The ordering of bindings may use information stored in the current
    self-sig, which the code assumes is the last signature.

1 files changed, 4 insertions, 14 deletions

diff --git a/openpgp/src/tpk/mod.rs b/openpgp/src/tpk/mod.rs
index c250cb48..93be265e 100644
--- a/openpgp/src/tpk/mod.rs
+++ b/openpgp/src/tpk/mod.rs
@@ -775,14 +775,14 @@ impl<C> ComponentBindings<C>
             }
         });
 
-        // Now, resort the bindings.  When sorting by bindings, we also
-        // consider the information on the current self signature.
-        self.sort_unstable();
-
         // And sort the certificates.
         for b in self.bindings.iter_mut() {
             b.sort_and_dedup();
         }
+
+        // Now, resort the bindings.  When sorting by bindings, we also
+        // consider the information on the current self signature.
+        self.sort_unstable();
     }
 }
 
@@ -1477,16 +1477,6 @@ impl TPK {
         self.bad.sort_by(sig_cmp);
         self.bad.dedup();
 
-        for binding in &mut self.userids.iter_mut() {
-            binding.sort_and_dedup();
-        }
-        for binding in &mut self.user_attributes.iter_mut() {
-            binding.sort_and_dedup();
-        }
-        for binding in &mut self.subkeys.iter_mut() {
-            binding.sort_and_dedup();
-        }
-
         self.userids.sort_and_dedup(UserID::cmp, |_, _| {});
         self.user_attributes.sort_and_dedup(UserAttribute::cmp, |_, _| {});
         // XXX: If we have two keys with the same public parts and