[git] GnuPG - branch, STABLE-BRANCH-2-2, updated. gnupg-2.2.5-52-g519e456

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, STABLE-BRANCH-2-2 has been updated
       via  519e4560e821e4c41432626b241bca7d37143e01 (commit)
       via  a4e26f2ee852003707857ab0635b783acb89a2f8 (commit)
      from  1a5d95e7319e7e6f0dd11064a26cbbc371b05214 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 519e4560e821e4c41432626b241bca7d37143e01
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Apr 9 10:44:44 2018 +0200

    doc: Add an example for --default-new-key-algo
    
    --

diff --git a/doc/examples/vsnfd.prf b/doc/examples/vsnfd.prf
index 1dc21e0..061e069 100644
--- a/doc/examples/vsnfd.prf
+++ b/doc/examples/vsnfd.prf
@@ -1,12 +1,16 @@
 # vsnfd.prf - Configure options for the VS-NfD mode           -*- conf -*-
+#
+# The options for each tool are configured in a section ("[TOOL]");
+# see the respective man page for a description of these options and
+# the gpgconf manpage for a description of this file's syntax.
 
 [gpg]
 compliance de-vs
 default-new-key-algo rsa3072/cert,sign+rsa3072/encr
 
 [gpgsm]
-enable-crl-checks
 compliance de-vs
+enable-crl-checks
 
 [gpg-agent]
 enable-extended-key-format
diff --git a/doc/gpg.texi b/doc/gpg.texi
index 3c505c9..6537acd 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -1014,7 +1014,7 @@ signing.
   Encrypt) are set during key creation.  Sometimes it is useful to
   have the opportunity to change them (for example to add
   Authenticate) after they have been created.  Please take care when
-  doing this, the possible usage flags depend on the key algorithm.
+  doing this; the allowed usage flags depend on the key algorithm.
 
   @item cross-certify
   @opindex keyedit:cross-certify
@@ -3338,9 +3338,14 @@ absolute date in the form YYYY-MM-DD. Defaults to "0".
 @item --default-new-key-algo @var{string}
 @opindex default-new-key-algo @var{string}
 This option can be used to change the default algorithms for key
-generation.  Note that the advanced key generation commands can always
-be used to specify a key algorithm directly.  Please consult the
-source code to learn the syntax of @var{string}.
+generation. The @var{string} is similar to the arguments required for
+the command @option{--quick-add-key} but slighly different.  For
+example the current default of @code{"rsa2048/cert,sign+rsa2048/encr"}
+(or @code{"rsa3072"}) can be changed to the value of what we currently
+call future default, which is @code{"ed25519/cert,sign+cv25519/encr"}.
+You need to consult the source code to learn the details.  Note that
+the advanced key generation commands can always be used to specify a
+key algorithm directly.
 
 @item --allow-secret-key-import
 @opindex allow-secret-key-import

commit a4e26f2ee852003707857ab0635b783acb89a2f8
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Apr 9 10:36:02 2018 +0200

    doc: Document --key-edit:change-usage
    
    * g10/keyedit.c (menu_changeusage): Make strings translatable.
    --
    
    GnuPG-bug-id: 3816
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/doc/gpg.texi b/doc/gpg.texi
index d840b85..3c505c9 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -1007,6 +1007,15 @@ signing.
   Make the key as small as possible. This removes all signatures from
   each user ID except for the most recent self-signature.
 
+  @item change-usage
+  @opindex keyedit:change-usage
+  Change the usage flags (capabilities) of the primary key or of
+  subkeys.  These usage flags (e.g. Certify, Sign, Authenticate,
+  Encrypt) are set during key creation.  Sometimes it is useful to
+  have the opportunity to change them (for example to add
+  Authenticate) after they have been created.  Please take care when
+  doing this, the possible usage flags depend on the key algorithm.
+
   @item cross-certify
   @opindex keyedit:cross-certify
   Add cross-certification signatures to signing subkeys that may not
diff --git a/g10/keyedit.c b/g10/keyedit.c
index 4ade5cd..7cd883d 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -4535,10 +4535,10 @@ menu_changeusage (ctrl_t ctrl, kbnode_t keyblock)
       return 0;
     }
   else if (n1)
-    tty_printf ("Changing usage of a subkey.\n");
+    tty_printf (_("Changing usage of a subkey.\n"));
   else
     {
-      tty_printf ("Changing usage of the primary key.\n");
+      tty_printf (_("Changing usage of the primary key.\n"));
       mainkey = 1;
     }
 
@@ -4578,6 +4578,8 @@ menu_changeusage (ctrl_t ctrl, kbnode_t keyblock)
 	      if ((mainkey && main_pk->version < 4)
 		  || (!mainkey && sub_pk->version < 4))
 		{
+                  /* Note: This won't happen because we don't support
+                   * v3 keys anymore.  */
 		  log_info ("You can't change the capabilities of a v3 key\n");
 		  return 0;
 		}
@@ -4602,7 +4604,7 @@ menu_changeusage (ctrl_t ctrl, kbnode_t keyblock)
 	      if (rc)
 		{
 		  log_error ("make_keysig_packet failed: %s\n",
-			     gpg_strerror (rc));
+                             gpg_strerror (rc));
 		  return 0;
 		}
 

-----------------------------------------------------------------------

Summary of changes:
 doc/examples/vsnfd.prf |  6 +++++-
 doc/gpg.texi           | 20 +++++++++++++++++---
 g10/keyedit.c          |  8 +++++---
 3 files changed, 27 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org