X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=cleankey.c;h=3ef76f9167679b61316f03f817fd81816ac7437c;hb=a0d1c99184eeb07a6a7711e168c3db4b8c0937eb;hp=5608ef04926213893794f83756c20b7ad7b9c4e0;hpb=e17ef1fac72bcfeff58e7c88af18eea6f9d6bc85;p=onak.git

diff --git a/cleankey.c b/cleankey.c
index 5608ef0..3ef76f9 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>
@@ -182,26 +181,33 @@ int clean_key_sighashes(struct openpgp_publickey *key)
 
 /**
  *	cleankeys - Apply all available cleaning options on a list of keys.
- *	@keys: The list of keys to clean.
+ *	@policies: The cleaning policies to apply.
  *
- *	Applies all the cleaning options we can (eg duplicate key ids) to a
- *	list of keys. Returns 0 if no changes were made, otherwise the number
- *	of keys cleaned.
+ *	Applies the requested cleaning policies to a list of keys. These are
+ *	specified from the ONAK_CLEAN_* set of flags, or ONAK_CLEAN_ALL to
+ *	apply all available cleaning options. Returns 0 if no changes were
+ *	made, otherwise the number of keys cleaned. Note that some options
+ *	may result in keys being removed entirely from the list.
  */
-int cleankeys(struct openpgp_publickey *keys)
+int cleankeys(struct openpgp_publickey **keys, uint64_t policies)
 {
+	struct openpgp_publickey *curkey;
 	int changed = 0, count;
 
-	while (keys != NULL) {
-		count = dedupuids(keys);
-		count += dedupsubkeys(keys);
-		if (config.check_sighash) {
-			count += clean_key_sighashes(keys);
+	if (keys == NULL)
+		return 0;
+
+	curkey = *keys;
+	while (curkey != NULL) {
+		count = dedupuids(curkey);
+		count += dedupsubkeys(curkey);
+		if (policies & ONAK_CLEAN_CHECK_SIGHASH) {
+			count += clean_key_sighashes(curkey);
 		}
 		if (count > 0) {
 			changed++;
 		}
-		keys = keys->next;
+		curkey = curkey->next;
 	}
 
 	return changed;