X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=cleankey.c;h=afe5a06a82b7cb2aacf53c18e4d06cfebc03f7e0;hb=5719b2b50c87d77e4ed1cc054f000845fc9aa8cc;hp=7d0bfe4b8cb16315926399f395f58b2142061aad;hpb=4c8bebffd4bc105ebaa09256b7a57f4a6201bd52;p=onak.git

diff --git a/cleankey.c b/cleankey.c
index 7d0bfe4..afe5a06 100644
--- a/cleankey.c
+++ b/cleankey.c
@@ -13,8 +13,7 @@
  * more details.
  *
  * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include <stdbool.h>
@@ -22,6 +21,7 @@
 #include <stdlib.h>
 
 #include "cleankey.h"
+#include "keyid.h"
 #include "keystructs.h"
 #include "log.h"
 #include "mem.h"
@@ -73,6 +73,53 @@ int dedupuids(struct openpgp_publickey *key)
 	return merged;
 }
 
+/**
+ *	dedupsubkeys - Merge duplicate subkeys on a key.
+ *	@key: The key to de-dup subkeys on.
+ *
+ *	This function attempts to merge duplicate subkeys on a key. It returns
+ *	0 if the key is unchanged, otherwise the number of dups merged.
+ */
+int dedupsubkeys(struct openpgp_publickey *key)
+{
+	struct openpgp_signedpacket_list *cursubkey = NULL;
+	struct openpgp_signedpacket_list *dup = NULL;
+	struct openpgp_signedpacket_list *tmp = NULL;
+	int                               merged = 0;
+	uint64_t                          subkeyid;
+
+	log_assert(key != NULL);
+	cursubkey = key->subkeys;
+	while (cursubkey != NULL) {
+		dup = find_signed_packet(cursubkey->next, cursubkey->packet);
+		while (dup != NULL) {
+			get_packetid(cursubkey->packet, &subkeyid);
+			logthing(LOGTHING_INFO,
+				"Found duplicate subkey: 0x%016" PRIX64,
+				subkeyid);
+			merged++;
+			merge_packet_sigs(cursubkey, dup);
+			/*
+			 * Remove the duplicate uid.
+			 */
+			tmp = cursubkey;
+			while (tmp != NULL && tmp->next != dup) {
+				tmp = tmp->next;
+			}
+			log_assert(tmp != NULL);
+			tmp->next = dup->next;
+			dup->next = NULL;
+			free_signedpacket_list(dup);
+
+			dup = find_signed_packet(cursubkey->next,
+				cursubkey->packet);
+		}
+		cursubkey = cursubkey->next;
+	}
+
+	return merged;
+}
+
 /**
  *	check_sighashes - Check that sig hashes are correct.
  *	@key - the check to check the sig hashes of.
@@ -146,6 +193,7 @@ int cleankeys(struct openpgp_publickey *keys)
 
 	while (keys != NULL) {
 		count = dedupuids(keys);
+		count += dedupsubkeys(keys);
 		if (config.check_sighash) {
 			count += clean_key_sighashes(keys);
 		}