1 files changed, 51 insertions, 158 deletions

diff --git a/g10/keyedit.c b/g10/keyedit.c
index 1cb62de8a..3e41681d0 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -1,7 +1,7 @@
 /* keyedit.c - Edit properties of a key
  * Copyright (C) 1998-2010 Free Software Foundation, Inc.
  * Copyright (C) 1998-2017 Werner Koch
- * Copyright (C) 2015, 2016 g10 Code GmbH
+ * Copyright (C) 2015, 2016, 2022 g10 Code GmbH
  *
  * This file is part of GnuPG.
  *
@@ -78,7 +78,8 @@ static gpg_error_t menu_expire (ctrl_t ctrl, kbnode_t pub_keyblock,
 static int menu_changeusage (ctrl_t ctrl, kbnode_t keyblock);
 static int menu_backsign (ctrl_t ctrl, kbnode_t pub_keyblock);
 static int menu_set_primary_uid (ctrl_t ctrl, kbnode_t pub_keyblock);
-static int menu_set_preferences (ctrl_t ctrl, kbnode_t pub_keyblock);
+static int menu_set_preferences (ctrl_t ctrl, kbnode_t pub_keyblock,
+                                 int unattended);
 static int menu_set_keyserver_url (ctrl_t ctrl,
                                    const char *url, kbnode_t pub_keyblock);
 static int menu_set_notation (ctrl_t ctrl,
@@ -2111,7 +2112,7 @@ keyedit_menu (ctrl_t ctrl, const char *username, strlist_t locusr,
                    " for the selected user IDs? (y/N) ")
                  : _("Really update the preferences? (y/N) ")))
 	      {
-		if (menu_set_preferences (ctrl, keyblock))
+		if (menu_set_preferences (ctrl, keyblock, 0))
 		  {
 		    merge_keys_and_selfsig (ctrl, keyblock);
 		    modified = 1;
@@ -2604,6 +2605,45 @@ keyedit_quick_set_primary (ctrl_t ctrl, const char *username,
 }
 
 
+/* Unattended updating of the preference tro the standard preferences.
+ * USERNAME specifies the key.  This is basically the same as
+ *      gpg --edit-key <<userif> updpref save
+ */
+void
+keyedit_quick_update_pref (ctrl_t ctrl, const char *username)
+{
+  gpg_error_t err;
+  KEYDB_HANDLE kdbhd = NULL;
+  kbnode_t keyblock = NULL;
+
+#ifdef HAVE_W32_SYSTEM
+  /* See keyedit_menu for why we need this.  */
+  check_trustdb_stale (ctrl);
+#endif
+
+  err = quick_find_keyblock (ctrl, username, 1, &kdbhd, &keyblock);
+  if (err)
+    goto leave;
+
+  if (menu_set_preferences (ctrl, keyblock, 1))
+    {
+      merge_keys_and_selfsig (ctrl, keyblock);
+      err = keydb_update_keyblock (ctrl, kdbhd, keyblock);
+      if (err)
+        {
+          log_error (_("update failed: %s\n"), gpg_strerror (err));
+          goto leave;
+        }
+    }
+
+ leave:
+  if (err)
+    write_status_error ("keyedit.updpref", err);
+  release_kbnode (keyblock);
+  keydb_release (kdbhd);
+}
+
+
 /* Find a keyblock by fingerprint because only this uniquely
  * identifies a key and may thus be used to select a key for
  * unattended subkey creation os key signing.  */
@@ -3316,146 +3356,12 @@ tty_print_notations (int indent, PKT_signature * sig)
 static void
 show_prefs (PKT_user_id * uid, PKT_signature * selfsig, int verbose)
 {
-  const prefitem_t fake = { 0, 0 };
-  const prefitem_t *prefs;
-  int i;
-
   if (!uid)
     return;
 
-  if (uid->prefs)
-    prefs = uid->prefs;
-  else if (verbose)
-    prefs = &fake;
-  else
-    return;
-
   if (verbose)
     {
-      int any, des_seen = 0, sha1_seen = 0, uncomp_seen = 0;
-
-      tty_printf ("     ");
-      tty_printf (_("Cipher: "));
-      for (i = any = 0; prefs[i].type; i++)
-	{
-	  if (prefs[i].type == PREFTYPE_SYM)
-	    {
-	      if (any)
-		tty_printf (", ");
-	      any = 1;
-	      /* We don't want to display strings for experimental algos */
-	      if (!openpgp_cipher_test_algo (prefs[i].value)
-		  && prefs[i].value < 100)
-		tty_printf ("%s", openpgp_cipher_algo_name (prefs[i].value));
-	      else
-		tty_printf ("[%d]", prefs[i].value);
-	      if (prefs[i].value == CIPHER_ALGO_3DES)
-		des_seen = 1;
-	    }
-	}
-      if (!des_seen)
-	{
-	  if (any)
-	    tty_printf (", ");
-	  tty_printf ("%s", openpgp_cipher_algo_name (CIPHER_ALGO_3DES));
-	}
-      tty_printf ("\n     ");
-      tty_printf (_("AEAD: "));
-      for (i = any = 0; prefs[i].type; i++)
-	{
-	  if (prefs[i].type == PREFTYPE_AEAD)
-	    {
-	      if (any)
-		tty_printf (", ");
-	      any = 1;
-	      /* We don't want to display strings for experimental algos */
-	      if (!openpgp_aead_test_algo (prefs[i].value)
-		  && prefs[i].value < 100)
-		tty_printf ("%s", openpgp_aead_algo_name (prefs[i].value));
-	      else
-		tty_printf ("[%d]", prefs[i].value);
-	    }
-	}
-      tty_printf ("\n     ");
-      tty_printf (_("Digest: "));
-      for (i = any = 0; prefs[i].type; i++)
-	{
-	  if (prefs[i].type == PREFTYPE_HASH)
-	    {
-	      if (any)
-		tty_printf (", ");
-	      any = 1;
-	      /* We don't want to display strings for experimental algos */
-	      if (!gcry_md_test_algo (prefs[i].value) && prefs[i].value < 100)
-		tty_printf ("%s", gcry_md_algo_name (prefs[i].value));
-	      else
-		tty_printf ("[%d]", prefs[i].value);
-	      if (prefs[i].value == DIGEST_ALGO_SHA1)
-		sha1_seen = 1;
-	    }
-	}
-      if (!sha1_seen)
-	{
-	  if (any)
-	    tty_printf (", ");
-	  tty_printf ("%s", gcry_md_algo_name (DIGEST_ALGO_SHA1));
-	}
-      tty_printf ("\n     ");
-      tty_printf (_("Compression: "));
-      for (i = any = 0; prefs[i].type; i++)
-	{
-	  if (prefs[i].type == PREFTYPE_ZIP)
-	    {
-	      const char *s = compress_algo_to_string (prefs[i].value);
-
-	      if (any)
-		tty_printf (", ");
-	      any = 1;
-	      /* We don't want to display strings for experimental algos */
-	      if (s && prefs[i].value < 100)
-		tty_printf ("%s", s);
-	      else
-		tty_printf ("[%d]", prefs[i].value);
-	      if (prefs[i].value == COMPRESS_ALGO_NONE)
-		uncomp_seen = 1;
-	    }
-	}
-      if (!uncomp_seen)
-	{
-	  if (any)
-	    tty_printf (", ");
-	  else
-	    {
-	      tty_printf ("%s", compress_algo_to_string (COMPRESS_ALGO_ZIP));
-	      tty_printf (", ");
-	    }
-	  tty_printf ("%s", compress_algo_to_string (COMPRESS_ALGO_NONE));
-	}
-      if (uid->flags.mdc || uid->flags.aead || !uid->flags.ks_modify)
-	{
-	  tty_printf ("\n     ");
-	  tty_printf (_("Features: "));
-	  any = 0;
-	  if (uid->flags.mdc)
-	    {
-	      tty_printf ("MDC");
-	      any = 1;
-	    }
-	  if (!uid->flags.aead)
-	    {
-	      if (any)
-		tty_printf (", ");
-	      tty_printf ("AEAD");
-	    }
-	  if (!uid->flags.ks_modify)
-	    {
-	      if (any)
-		tty_printf (", ");
-	      tty_printf (_("Keyserver no-modify"));
-	    }
-	}
-      tty_printf ("\n");
-
+      show_preferences (uid, 4, -1, 1);
       if (selfsig)
 	{
 	  const byte *pref_ks;
@@ -3481,22 +3387,7 @@ show_prefs (PKT_user_id * uid, PKT_signature * selfsig, int verbose)
     }
   else
     {
-      tty_printf ("    ");
-      for (i = 0; prefs[i].type; i++)
-	{
-	  tty_printf (" %c%d", prefs[i].type == PREFTYPE_SYM ? 'S' :
-		      prefs[i].type == PREFTYPE_AEAD ? 'A' :
-		      prefs[i].type == PREFTYPE_HASH ? 'H' :
-		      prefs[i].type == PREFTYPE_ZIP ? 'Z' : '?',
-		      prefs[i].value);
-	}
-      if (uid->flags.mdc)
-	tty_printf (" [mdc]");
-      if (uid->flags.aead)
-	tty_printf (" [aead]");
-      if (!uid->flags.ks_modify)
-	tty_printf (" [no-ks-modify]");
-      tty_printf ("\n");
+      show_preferences (uid, 4, -1, 0);
     }
 }
 
@@ -5212,10 +5103,11 @@ menu_set_primary_uid (ctrl_t ctrl, kbnode_t pub_keyblock)
 
 
 /*
- * Set preferences to new values for the selected user IDs
+ * Set preferences to new values for the selected user IDs.
+ * --quick-update-pred calls this with UNATTENDED set.
  */
 static int
-menu_set_preferences (ctrl_t ctrl, kbnode_t pub_keyblock)
+menu_set_preferences (ctrl_t ctrl, kbnode_t pub_keyblock, int unattended)
 {
   PKT_public_key *main_pk;
   PKT_user_id *uid;
@@ -5224,9 +5116,10 @@ menu_set_preferences (ctrl_t ctrl, kbnode_t pub_keyblock)
   int selected, select_all;
   int modified = 0;
 
-  no_primary_warning (pub_keyblock);
+  if (!unattended)
+    no_primary_warning (pub_keyblock);
 
-  select_all = !count_selected_uids (pub_keyblock);
+  select_all = unattended? 1 : !count_selected_uids (pub_keyblock);
 
   /* Now we can actually change the self signature(s) */
   main_pk = NULL;