X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/cfbbd6655346497ab28d50d2b5c34f0c5d9ce5ce..b7a8b5277d37b289361ff0cc881632f527e4d5db:/cleankey.c

diff --git a/cleankey.c b/cleankey.c
index b236fa3..7d0bfe4 100644
--- a/cleankey.c
+++ b/cleankey.c
@@ -1,23 +1,33 @@
 /*
  * cleankey.c - Routines to look for common key problems and clean them up.
  *
- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2004,2012 Jonathan McDowell <noodles@earth.li>
  *
- * Copyright 2004 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
  *
- * $Id: cleankey.c,v 1.1 2004/05/31 14:16:49 noodles Exp $
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * 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.
  */
 
-#include <assert.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 
 #include "cleankey.h"
 #include "keystructs.h"
+#include "log.h"
 #include "mem.h"
 #include "merge.h"
-#include "log.h"
+#include "onak-conf.h"
+#include "sigcheck.h"
 
 /**
  *	dedupuids - Merge duplicate uids on a key.
@@ -33,7 +43,7 @@ int dedupuids(struct openpgp_publickey *key)
 	struct openpgp_signedpacket_list *tmp = NULL;
 	int                               merged = 0;
 
-	assert(key != NULL);
+	log_assert(key != NULL);
 	curuid = key->uids;
 	while (curuid != NULL) {
 		dup = find_signed_packet(curuid->next, curuid->packet);
@@ -50,7 +60,7 @@ int dedupuids(struct openpgp_publickey *key)
 			while (tmp != NULL && tmp->next != dup) {
 				tmp = tmp->next;
 			}
-			assert(tmp != NULL);
+			log_assert(tmp != NULL);
 			tmp->next = dup->next;
 			dup->next = NULL;
 			free_signedpacket_list(dup);
@@ -63,6 +73,65 @@ int dedupuids(struct openpgp_publickey *key)
 	return merged;
 }
 
+/**
+ *	check_sighashes - Check that sig hashes are correct.
+ *	@key - the check to check the sig hashes of.
+ *
+ *	Given an OpenPGP key confirm that all of the sigs on it have the
+ *	appropriate 2 octet hash beginning, as stored as part of the sig.
+ *	This is a simple way to remove junk sigs and, for example, catches
+ *	subkey sig corruption as produced by old pksd implementations.
+ *	Any sig that has an incorrect hash is removed from the key. If the
+ *	hash cannot be checked (eg we don't support that hash type) we err
+ *	on the side of caution and keep it.
+ */
+int clean_sighashes(struct openpgp_publickey *key,
+		struct openpgp_packet *sigdata,
+		struct openpgp_packet_list **sigs)
+{
+	struct openpgp_packet_list *tmpsig;
+	int removed = 0;
+
+	while (*sigs != NULL) {
+		if (check_packet_sighash(key, sigdata, (*sigs)->packet) == 0) {
+			tmpsig = *sigs;
+			*sigs = (*sigs)->next;
+			tmpsig->next = NULL;
+			free_packet_list(tmpsig);
+			removed++;
+		} else {
+			sigs = &(*sigs)->next;
+		}
+	}
+
+	return removed;
+}
+
+int clean_list_sighashes(struct openpgp_publickey *key,
+			struct openpgp_signedpacket_list *siglist)
+{
+	int removed = 0;
+
+	while (siglist != NULL) {
+		removed += clean_sighashes(key, siglist->packet,
+			&siglist->sigs);
+		siglist = siglist->next;
+	}
+
+	return removed;
+}
+
+int clean_key_sighashes(struct openpgp_publickey *key)
+{
+	int removed;
+
+	removed = clean_sighashes(key, NULL, &key->sigs);
+	removed += clean_list_sighashes(key, key->uids);
+	removed += clean_list_sighashes(key, key->subkeys);
+
+	return removed;
+}
+
 /**
  *	cleankeys - Apply all available cleaning options on a list of keys.
  *	@keys: The list of keys to clean.
@@ -73,10 +142,14 @@ int dedupuids(struct openpgp_publickey *key)
  */
 int cleankeys(struct openpgp_publickey *keys)
 {
-	int changed = 0;
+	int changed = 0, count;
 
 	while (keys != NULL) {
-		if (dedupuids(keys) > 0) {
+		count = dedupuids(keys);
+		if (config.check_sighash) {
+			count += clean_key_sighashes(keys);
+		}
+		if (count > 0) {
 			changed++;
 		}
 		keys = keys->next;