summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2018-04-09 10:44:44 +0200
committerWerner Koch <wk@gnupg.org>2018-04-09 10:51:28 +0200
commit519e4560e821e4c41432626b241bca7d37143e01 (patch)
treedad66adc1f05d4dee0420cacbcde5ce68a0dd0dc /doc
parentdoc: Document --key-edit:change-usage (diff)
downloadgnupg2-519e4560e821e4c41432626b241bca7d37143e01.tar.xz
gnupg2-519e4560e821e4c41432626b241bca7d37143e01.zip
doc: Add an example for --default-new-key-algo
--
Diffstat (limited to 'doc')
-rw-r--r--doc/examples/vsnfd.prf6
-rw-r--r--doc/gpg.texi13
2 files changed, 14 insertions, 5 deletions
diff --git a/doc/examples/vsnfd.prf b/doc/examples/vsnfd.prf
index 1dc21e0a7..061e06982 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 3c505c94d..6537acd73 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